diff --git a/.github/workflows/test-code.yml b/.github/workflows/test-code.yml
index ede53f13b..328023639 100644
--- a/.github/workflows/test-code.yml
+++ b/.github/workflows/test-code.yml
@@ -27,12 +27,12 @@ jobs:
       - name: Setup nightly Rust toolchain
         uses:  dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2024-04-18
+          toolchain: nightly-2024-05-30
           components: rustfmt, clippy
           target: wasm32-unknown-unknown
 
       - name: Setup nightly Rust as default
-        run: rustup default nightly-2024-04-18
+        run: rustup default nightly-2024-05-30
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v1
@@ -42,20 +42,20 @@ jobs:
       - name: Test
         uses: actions-rs/cargo@v1
         with:
-          toolchain: nightly-2024-04-18
+          toolchain: nightly-2024-05-30
           command: test
 
       - name: Clippy -- Main
         uses: actions-rs/cargo@v1
         with:
-          toolchain: nightly-2024-04-18
+          toolchain: nightly-2024-05-30
           command: clippy
           args: --all-features -- -W clippy::all -A clippy::style -A forgetting_copy_types -A forgetting_references
 
       - name: Clippy -- All Targets (except integration)
         uses: actions-rs/cargo@v1
         with:
-          toolchain: nightly-2024-04-18
+          toolchain: nightly-2024-05-30
           command: clippy
           # We are a bit more forgiving when it comes to the code in tests and only check for correctness
           args: --workspace --all-features --all-targets --exclude runtime-integration-tests -- -A clippy::all -W clippy::correctness -A forgetting_copy_types -A forgetting_references
@@ -63,7 +63,7 @@ jobs:
       - name: Clippy -- Integration
         uses: actions-rs/cargo@v1
         with:
-          toolchain: nightly-2024-04-18
+          toolchain: nightly-2024-05-30
           command: clippy
           # We are a bit more forgiving when it comes to the code in tests and only check for correctness
           args: --package runtime-integration-tests --all-features --all-targets -- -A clippy::all -W clippy::correctness -A forgetting_copy_types -A forgetting_references
diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 0c1a2ba4e..c46b39f9b 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -20,23 +20,12 @@
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions needed for {{pallet}}.
-pub trait WeightInfo {
-	{{#each benchmarks as |benchmark|}}
-	fn {{benchmark.name~}}
-	(
-		{{~#each benchmark.components as |c| ~}}
-		{{c.name}}: u32, {{/each~}}
-	) -> Weight;
-	{{/each}}
-}
-
 /// Weights for {{pallet}} using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 {{#if (eq pallet "frame_system")}}
 impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 {{else}}
-impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> {{pallet}}::WeightInfo for SubstrateWeight<T> {
 {{/if}}
 	{{#each benchmarks as |benchmark|}}
 	{{#each benchmark.comments as |comment|}}
@@ -76,46 +65,4 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			{{/each}}
 	}
 	{{/each}}
-}
-
-// For backwards compatibility and tests
-impl WeightInfo for () {
-	{{#each benchmarks as |benchmark|}}
-	{{#each benchmark.comments as |comment|}}
-	/// {{comment}}
-	{{/each}}
-	{{#each benchmark.component_ranges as |range|}}
-	/// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
-	{{/each}}
-	fn {{benchmark.name~}}
-	(
-		{{~#each benchmark.components as |c| ~}}
-		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
-	) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
-		//  Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
-		// Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds.
-		Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
-			{{#each benchmark.component_weight as |cw|}}
-			// Standard Error: {{underscore cw.error}}
-			.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
-			{{/each}}
-			{{#if (ne benchmark.base_reads "0")}}
-			.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}}_u64))
-			{{/if}}
-			{{#each benchmark.component_reads as |cr|}}
-			.saturating_add(RocksDbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
-			{{/each}}
-			{{#if (ne benchmark.base_writes "0")}}
-			.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}}_u64))
-			{{/if}}
-			{{#each benchmark.component_writes as |cw|}}
-			.saturating_add(RocksDbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
-			{{/each}}
-			{{#each benchmark.component_calculated_proof_size as |cp|}}
-			.saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
-			{{/each}}
-	}
-	{{/each}}
 }
\ No newline at end of file
diff --git a/.maintain/run_all_benchmarks.sh b/.maintain/run_all_benchmarks.sh
new file mode 100755
index 000000000..b812d271a
--- /dev/null
+++ b/.maintain/run_all_benchmarks.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+script_dir=$(dirname "$(realpath "$0")")
+
+
+runtimes=("pendulum" "amplitude" "foucoco")
+
+
+for runtime_name in "${runtimes[@]}"; do
+  cd $script_dir
+  cd ../runtime/$runtime_name/src/weights
+  weight_dir=`pwd`
+
+  cd $script_dir
+
+  if [ ! -d "$weight_dir" ]; then
+    echo "Directory $weight_dir does not exist for runtime $runtime_name!"
+    echo "Weights directory should exist and contain previously calculated weights"
+    continue
+  fi
+
+  echo "Processing runtime: $runtime_name"
+
+  for file in "$weight_dir"/*; do
+
+    filename=$(basename -- "$file")
+    filename_without_ext="${filename%.*}"
+
+
+    if [[ "$filename_without_ext" == "parachain_staking" ]]; then
+      echo "Skipping file: $filename_without_ext"
+      continue
+    fi
+
+    echo "Running benchmark for pallet: $filename_without_ext in runtime $runtime_name"
+
+    # Run the benchmark command for each file, ignore errors from files
+    # not corresponding to any pallets.
+    # Failed benchmarks will not be detected.
+    ../target/production/pendulum-node benchmark pallet \
+      --chain $runtime_name \
+      --wasm-execution=compiled \
+      --pallet "$filename_without_ext" \
+      --extrinsic "*" \
+      --steps 50 \
+      --repeat 20 \
+      --output "../runtime/$runtime_name/src/weights/$filename" \
+      --template "frame-weight-template.hbs" \
+      || true
+
+  done
+done
diff --git a/Cargo.lock b/Cargo.lock
index ff27769df..68d5a18af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,11 +14,11 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.17.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
 dependencies = [
- "gimli 0.26.2",
+ "gimli 0.27.3",
 ]
 
 [[package]]
@@ -36,25 +36,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "aead"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
-dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "aead"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
-dependencies = [
- "generic-array 0.14.7",
- "rand_core 0.6.4",
-]
-
 [[package]]
 name = "aead"
 version = "0.5.2"
@@ -65,29 +46,6 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
-[[package]]
-name = "aes"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
-dependencies = [
- "aes-soft",
- "aesni",
- "cipher 0.2.5",
-]
-
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if",
- "cipher 0.3.0",
- "cpufeatures",
- "opaque-debug 0.3.1",
-]
-
 [[package]]
 name = "aes"
 version = "0.8.4"
@@ -95,58 +53,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
- "cipher 0.4.4",
+ "cipher",
  "cpufeatures",
 ]
 
-[[package]]
-name = "aes-gcm"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6"
-dependencies = [
- "aead 0.4.3",
- "aes 0.7.5",
- "cipher 0.3.0",
- "ctr 0.8.0",
- "ghash 0.4.4",
- "subtle",
-]
-
 [[package]]
 name = "aes-gcm"
 version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
 dependencies = [
- "aead 0.5.2",
- "aes 0.8.4",
- "cipher 0.4.4",
- "ctr 0.9.2",
- "ghash 0.5.1",
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
  "subtle",
 ]
 
-[[package]]
-name = "aes-soft"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
-dependencies = [
- "cipher 0.2.5",
- "opaque-debug 0.3.1",
-]
-
-[[package]]
-name = "aesni"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
-dependencies = [
- "cipher 0.2.5",
- "opaque-debug 0.3.1",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -180,6 +104,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+
 [[package]]
 name = "always-assert"
 version = "0.1.3"
@@ -228,7 +158,7 @@ dependencies = [
  "orml-asset-registry",
  "orml-currencies",
  "orml-currencies-allowance-extension",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "orml-xcm-support",
  "orml-xtokens",
@@ -259,7 +189,7 @@ dependencies = [
  "parachain-staking",
  "parity-scale-codec",
  "paste",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "pooled-rewards",
  "price-chain-extension",
@@ -281,9 +211,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
  "spacewalk-primitives",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "staking",
  "stellar-relay",
  "substrate-wasm-builder",
@@ -291,9 +225,6 @@ dependencies = [
  "treasury-buyout-extension",
  "vault-registry",
  "vesting-manager",
- "xcm",
- "xcm-builder",
- "xcm-executor",
  "zenlink-protocol",
  "zenlink-protocol-runtime-api",
 ]
@@ -387,16 +318,190 @@ dependencies = [
 ]
 
 [[package]]
-name = "arc-swap"
-version = "1.7.1"
+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 = "ark-bls12-381"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
+dependencies = [
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+ "itertools 0.10.5",
+ "num-traits",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ed-on-bls12-381-bandersnatch"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
 
 [[package]]
-name = "array-bytes"
-version = "4.2.0"
+name = "ark-ff"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
+dependencies = [
+ "ark-ff-asm",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "digest 0.10.7",
+ "itertools 0.10.5",
+ "num-bigint",
+ "num-traits",
+ "paste",
+ "rustc_version 0.4.0",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
+dependencies = [
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "ark-scale"
+version = "0.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51bd73bb6ddb72630987d37fa963e99196896c0d0ea81b7c894567e74a2f83af"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "parity-scale-codec",
+ "scale-info",
+]
+
+[[package]]
+name = "ark-secret-scalar"
+version = "0.0.2"
+source = "git+https://github.com/w3f//ring-vrf?rev=3ddc20#3ddc2051066c4b3f0eadd0ba5700df12500d9754"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "ark-transcript",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
+dependencies = [
+ "ark-serialize-derive",
+ "ark-std",
+ "digest 0.10.7",
+ "num-bigint",
+]
+
+[[package]]
+name = "ark-serialize-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
+checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
+dependencies = [
+ "num-traits",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "ark-transcript"
+version = "0.0.2"
+source = "git+https://github.com/w3f//ring-vrf?rev=3ddc20#3ddc2051066c4b3f0eadd0ba5700df12500d9754"
+dependencies = [
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+ "sha3",
+]
 
 [[package]]
 name = "array-bytes"
@@ -410,6 +515,15 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
+[[package]]
+name = "arrayvec"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
+dependencies = [
+ "nodrop",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.5.2"
@@ -422,29 +536,13 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
-[[package]]
-name = "asn1-rs"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33"
-dependencies = [
- "asn1-rs-derive 0.1.0",
- "asn1-rs-impl",
- "displaydoc",
- "nom",
- "num-traits",
- "rusticata-macros",
- "thiserror",
- "time",
-]
-
 [[package]]
 name = "asn1-rs"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
 dependencies = [
- "asn1-rs-derive 0.4.0",
+ "asn1-rs-derive",
  "asn1-rs-impl",
  "displaydoc",
  "nom",
@@ -454,18 +552,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "asn1-rs-derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "synstructure",
-]
-
 [[package]]
 name = "asn1-rs-derive"
 version = "0.4.0"
@@ -489,12 +575,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "asn1_der"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247"
-
 [[package]]
 name = "assert_matches"
 version = "1.5.0"
@@ -502,24 +582,240 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
 [[package]]
-name = "assets-common"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+name = "asset-hub-kusama-runtime"
+version = "0.9.420"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "assets-common",
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-session-benchmarking",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
+ "cumulus-primitives-utility",
+ "frame-benchmarking",
+ "frame-executive",
  "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "hex-literal 0.4.1",
+ "kusama-runtime-constants",
  "log",
+ "pallet-asset-conversion",
+ "pallet-asset-conversion-tx-payment",
+ "pallet-assets",
+ "pallet-aura",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-collator-selection",
+ "pallet-multisig",
+ "pallet-nft-fractionalization",
+ "pallet-nfts",
+ "pallet-nfts-runtime-api",
+ "pallet-proxy",
+ "pallet-session",
+ "pallet-state-trie-migration",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-uniques",
+ "pallet-utility",
  "pallet-xcm",
+ "pallet-xcm-benchmarks",
+ "parachain-info",
  "parachains-common",
  "parity-scale-codec",
+ "polkadot-core-primitives",
+ "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
+ "primitive-types",
  "scale-info",
+ "smallvec",
  "sp-api",
- "sp-std",
- "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-storage",
+ "sp-transaction-pool",
+ "sp-version",
+ "sp-weights",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "substrate-wasm-builder",
+]
+
+[[package]]
+name = "asset-hub-polkadot-runtime"
+version = "0.9.420"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "assets-common",
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-session-benchmarking",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-utility",
+ "frame-benchmarking",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "log",
+ "pallet-asset-tx-payment",
+ "pallet-assets",
+ "pallet-aura",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-collator-selection",
+ "pallet-multisig",
+ "pallet-nfts",
+ "pallet-nfts-runtime-api",
+ "pallet-proxy",
+ "pallet-session",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-uniques",
+ "pallet-utility",
+ "pallet-xcm",
+ "pallet-xcm-benchmarks",
+ "parachain-info",
+ "parachains-common",
+ "parity-scale-codec",
+ "polkadot-core-primitives",
+ "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
+ "polkadot-runtime-constants",
+ "scale-info",
+ "smallvec",
+ "sp-api",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-storage",
+ "sp-transaction-pool",
+ "sp-version",
+ "sp-weights",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "substrate-wasm-builder",
+]
+
+[[package]]
+name = "asset-hub-westend-runtime"
+version = "0.9.420"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "assets-common",
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-session-benchmarking",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-utility",
+ "frame-benchmarking",
+ "frame-executive",
+ "frame-metadata-hash-extension",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "log",
+ "pallet-asset-conversion",
+ "pallet-asset-conversion-tx-payment",
+ "pallet-assets",
+ "pallet-aura",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-collator-selection",
+ "pallet-multisig",
+ "pallet-nft-fractionalization",
+ "pallet-nfts",
+ "pallet-nfts-runtime-api",
+ "pallet-proxy",
+ "pallet-session",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-uniques",
+ "pallet-utility",
+ "pallet-xcm",
+ "pallet-xcm-benchmarks",
+ "parachain-info",
+ "parachains-common",
+ "parity-scale-codec",
+ "polkadot-core-primitives",
+ "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
+ "primitive-types",
+ "scale-info",
+ "smallvec",
+ "sp-api",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-storage",
+ "sp-transaction-pool",
+ "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "substrate-wasm-builder",
+ "westend-runtime-constants",
+]
+
+[[package]]
+name = "assets-common"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "cumulus-primitives-core",
+ "frame-support",
+ "impl-trait-for-tuples",
+ "log",
+ "pallet-asset-conversion",
+ "pallet-asset-tx-payment",
+ "pallet-xcm",
+ "parachains-common",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "substrate-wasm-builder",
+]
 
 [[package]]
 name = "async-channel"
@@ -532,6 +828,63 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy 0.5.2",
+ "futures-core",
+ "pin-project-lite 0.2.14",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand 2.1.0",
+ "futures-lite 2.3.0",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
+dependencies = [
+ "async-lock 2.8.0",
+ "autocfg",
+ "blocking",
+ "futures-lite 1.13.0",
+]
+
+[[package]]
+name = "async-io"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
+dependencies = [
+ "async-lock 2.8.0",
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-lite 1.13.0",
+ "log",
+ "parking",
+ "polling 2.8.0",
+ "rustix 0.37.27",
+ "slab",
+ "socket2 0.4.10",
+ "waker-fn",
+]
+
 [[package]]
 name = "async-io"
 version = "2.3.2"
@@ -542,9 +895,9 @@ dependencies = [
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite",
+ "futures-lite 2.3.0",
  "parking",
- "polling",
+ "polling 3.7.0",
  "rustix 0.38.34",
  "slab",
  "tracing",
@@ -567,10 +920,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
 dependencies = [
  "event-listener 4.0.3",
- "event-listener-strategy",
+ "event-listener-strategy 0.4.0",
  "pin-project-lite 0.2.14",
 ]
 
+[[package]]
+name = "async-net"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f"
+dependencies = [
+ "async-io 1.13.0",
+ "blocking",
+ "futures-lite 1.13.0",
+]
+
+[[package]]
+name = "async-process"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
+dependencies = [
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
+ "async-signal",
+ "blocking",
+ "cfg-if",
+ "event-listener 3.1.0",
+ "futures-lite 1.13.0",
+ "rustix 0.38.34",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "async-recursion"
 version = "1.1.1"
@@ -582,6 +963,30 @@ dependencies = [
  "syn 2.0.65",
 ]
 
+[[package]]
+name = "async-signal"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
+dependencies = [
+ "async-io 2.3.2",
+ "async-lock 3.3.0",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix 0.38.34",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
 [[package]]
 name = "async-trait"
 version = "0.1.80"
@@ -606,6 +1011,12 @@ dependencies = [
  "pin-project-lite 0.2.14",
 ]
 
+[[package]]
+name = "atomic-take"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3"
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -644,18 +1055,33 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "bandersnatch_vrfs"
+version = "0.0.4"
+source = "git+https://github.com/w3f//ring-vrf?rev=3ddc20#3ddc2051066c4b3f0eadd0ba5700df12500d9754"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "dleq_vrf",
+ "fflonk",
+ "merlin 3.0.0",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "ring 0.1.0",
+ "sha2 0.10.8",
+ "zeroize",
+]
+
 [[package]]
 name = "base-x"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
 
-[[package]]
-name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
 [[package]]
 name = "base16ct"
 version = "0.2.0"
@@ -698,15 +1124,15 @@ dependencies = [
 [[package]]
 name = "bifrost-farming"
 version = "0.8.0"
-source = "git+https://github.com/pendulum-chain/bifrost?branch=upgrade-v0.9.42#37bd182449576ce641d0b3132eaa82ddba5bb05a"
+source = "git+https://github.com/bifrost-finance/bifrost?rev=46ba3689c2fe1011cce0d752cb479e0e522e2e76#46ba3689c2fe1011cce0d752cb479e0e522e2e76"
 dependencies = [
+ "bifrost-primitives",
  "bifrost-ve-minting",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "log",
- "node-primitives",
  "orml-traits",
  "pallet-balances",
  "parity-scale-codec",
@@ -718,13 +1144,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "bifrost-farming-rpc-api"
+name = "bifrost-farming-rpc"
 version = "0.8.0"
-source = "git+https://github.com/pendulum-chain/bifrost?branch=upgrade-v0.9.42#37bd182449576ce641d0b3132eaa82ddba5bb05a"
+source = "git+https://github.com/bifrost-finance/bifrost?rev=46ba3689c2fe1011cce0d752cb479e0e522e2e76#46ba3689c2fe1011cce0d752cb479e0e522e2e76"
 dependencies = [
  "bifrost-farming-rpc-runtime-api",
+ "bifrost-primitives",
  "jsonrpsee",
- "node-primitives",
  "parity-scale-codec",
  "serde",
  "sp-api",
@@ -737,39 +1163,57 @@ dependencies = [
 [[package]]
 name = "bifrost-farming-rpc-runtime-api"
 version = "0.8.0"
-source = "git+https://github.com/pendulum-chain/bifrost?branch=upgrade-v0.9.42#37bd182449576ce641d0b3132eaa82ddba5bb05a"
+source = "git+https://github.com/bifrost-finance/bifrost?rev=46ba3689c2fe1011cce0d752cb479e0e522e2e76#46ba3689c2fe1011cce0d752cb479e0e522e2e76"
 dependencies = [
- "node-primitives",
+ "bifrost-primitives",
  "parity-scale-codec",
  "sp-api",
  "sp-std",
 ]
 
 [[package]]
-name = "bifrost-ve-minting"
+name = "bifrost-primitives"
 version = "0.8.0"
-source = "git+https://github.com/pendulum-chain/bifrost?branch=upgrade-v0.9.42#37bd182449576ce641d0b3132eaa82ddba5bb05a"
+source = "git+https://github.com/bifrost-finance/bifrost?rev=46ba3689c2fe1011cce0d752cb479e0e522e2e76#46ba3689c2fe1011cce0d752cb479e0e522e2e76"
 dependencies = [
- "cumulus-primitives-core",
+ "bstringify",
  "frame-support",
- "frame-system",
- "hex-literal 0.3.4",
- "log",
- "node-primitives",
- "orml-traits",
- "pallet-balances",
+ "orml-oracle 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4)",
  "parity-scale-codec",
  "scale-info",
+ "serde",
  "sp-core",
  "sp-runtime",
  "sp-std",
- "xcm",
+ "staging-xcm",
+ "zenlink-protocol",
+]
+
+[[package]]
+name = "bifrost-ve-minting"
+version = "0.8.0"
+source = "git+https://github.com/bifrost-finance/bifrost?rev=46ba3689c2fe1011cce0d752cb479e0e522e2e76#46ba3689c2fe1011cce0d752cb479e0e522e2e76"
+dependencies = [
+ "bifrost-primitives",
+ "cumulus-primitives-core",
+ "frame-support",
+ "frame-system",
+ "hex-literal 0.4.1",
+ "log",
+ "orml-traits",
+ "pallet-balances",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+ "staging-xcm",
 ]
 
 [[package]]
 name = "binary-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "hash-db",
  "log",
@@ -786,9 +1230,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.64.0"
+version = "0.65.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
 dependencies = [
  "bitflags 1.3.2",
  "cexpr",
@@ -796,14 +1240,30 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
+ "prettyplease 0.2.20",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 1.0.109",
+ "syn 2.0.65",
+]
+
+[[package]]
+name = "bip39"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
+dependencies = [
+ "bitcoin_hashes",
 ]
 
+[[package]]
+name = "bitcoin_hashes"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -837,6 +1297,16 @@ dependencies = [
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "blake2-rfc"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
+dependencies = [
+ "arrayvec 0.4.12",
+ "constant_time_eq 0.1.5",
+]
+
 [[package]]
 name = "blake2b_simd"
 version = "1.0.2"
@@ -845,7 +1315,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
  "arrayvec 0.7.4",
- "constant_time_eq",
+ "constant_time_eq 0.3.0",
 ]
 
 [[package]]
@@ -856,7 +1326,7 @@ checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae"
 dependencies = [
  "arrayref",
  "arrayvec 0.7.4",
- "constant_time_eq",
+ "constant_time_eq 0.3.0",
 ]
 
 [[package]]
@@ -869,7 +1339,7 @@ dependencies = [
  "arrayvec 0.7.4",
  "cc",
  "cfg-if",
- "constant_time_eq",
+ "constant_time_eq 0.3.0",
 ]
 
 [[package]]
@@ -878,7 +1348,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
- "block-padding 0.1.5",
+ "block-padding",
  "byte-tools",
  "byteorder",
  "generic-array 0.12.4",
@@ -903,49 +1373,489 @@ dependencies = [
 ]
 
 [[package]]
-name = "block-modes"
-version = "0.7.0"
+name = "block-padding"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0"
+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
 dependencies = [
- "block-padding 0.2.1",
- "cipher 0.2.5",
+ "byte-tools",
 ]
 
 [[package]]
-name = "block-padding"
-version = "0.1.5"
+name = "blocking"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
 dependencies = [
- "byte-tools",
+ "async-channel 2.3.1",
+ "async-task",
+ "futures-io",
+ "futures-lite 2.3.0",
+ "piper",
+]
+
+[[package]]
+name = "bounded-collections"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd"
+dependencies = [
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+]
+
+[[package]]
+name = "bounded-vec"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68534a48cbf63a4b1323c433cf21238c9ec23711e0df13b08c33e5c2082663ce"
+dependencies = [
+ "thiserror",
+]
+
+[[package]]
+name = "bp-bridge-hub-cumulus"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-messages",
+ "bp-polkadot-core",
+ "bp-runtime",
+ "frame-support",
+ "frame-system",
+ "polkadot-primitives",
+ "sp-api",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-bridge-hub-rococo"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-bridge-hub-cumulus",
+ "bp-messages",
+ "bp-runtime",
+ "frame-support",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-bridge-hub-wococo"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-bridge-hub-cumulus",
+ "bp-messages",
+ "bp-runtime",
+ "frame-support",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-header-chain"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-runtime",
+ "finality-grandpa",
+ "frame-support",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-consensus-grandpa",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-messages"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-header-chain",
+ "bp-runtime",
+ "frame-support",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-parachains"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-header-chain",
+ "bp-polkadot-core",
+ "bp-runtime",
+ "frame-support",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-polkadot-core"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-messages",
+ "bp-runtime",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "parity-util-mem",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-relayers"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-messages",
+ "bp-runtime",
+ "frame-support",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-rococo"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-header-chain",
+ "bp-polkadot-core",
+ "bp-runtime",
+ "frame-support",
+ "sp-api",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-runtime"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "hash-db",
+ "impl-trait-for-tuples",
+ "log",
+ "num-traits",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-std",
+ "sp-trie",
+ "trie-db",
+]
+
+[[package]]
+name = "bp-test-utils"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-header-chain",
+ "bp-parachains",
+ "bp-polkadot-core",
+ "bp-runtime",
+ "ed25519-dalek 1.0.1",
+ "finality-grandpa",
+ "parity-scale-codec",
+ "sp-application-crypto",
+ "sp-consensus-grandpa",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+ "sp-trie",
+]
+
+[[package]]
+name = "bp-wococo"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-header-chain",
+ "bp-polkadot-core",
+ "bp-rococo",
+ "bp-runtime",
+ "frame-support",
+ "sp-api",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-xcm-bridge-hub-router"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-runtime",
+]
+
+[[package]]
+name = "bridge-hub-kusama-runtime"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-session-benchmarking",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-utility",
+ "frame-benchmarking",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "hex-literal 0.4.1",
+ "kusama-runtime-constants",
+ "log",
+ "pallet-aura",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-collator-selection",
+ "pallet-multisig",
+ "pallet-session",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-utility",
+ "pallet-xcm",
+ "pallet-xcm-benchmarks",
+ "parachain-info",
+ "parachains-common",
+ "parity-scale-codec",
+ "polkadot-core-primitives",
+ "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
+ "scale-info",
+ "serde",
+ "smallvec",
+ "sp-api",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-storage",
+ "sp-transaction-pool",
+ "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "substrate-wasm-builder",
+]
+
+[[package]]
+name = "bridge-hub-polkadot-runtime"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-session-benchmarking",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-utility",
+ "frame-benchmarking",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "hex-literal 0.4.1",
+ "log",
+ "pallet-aura",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-collator-selection",
+ "pallet-multisig",
+ "pallet-session",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-utility",
+ "pallet-xcm",
+ "pallet-xcm-benchmarks",
+ "parachain-info",
+ "parachains-common",
+ "parity-scale-codec",
+ "polkadot-core-primitives",
+ "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
+ "polkadot-runtime-constants",
+ "scale-info",
+ "serde",
+ "smallvec",
+ "sp-api",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-storage",
+ "sp-transaction-pool",
+ "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
-[[package]]
-name = "bounded-collections"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd"
-dependencies = [
+name = "bridge-hub-rococo-runtime"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-bridge-hub-rococo",
+ "bp-bridge-hub-wococo",
+ "bp-header-chain",
+ "bp-messages",
+ "bp-parachains",
+ "bp-polkadot-core",
+ "bp-relayers",
+ "bp-rococo",
+ "bp-runtime",
+ "bp-wococo",
+ "bridge-runtime-common",
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-session-benchmarking",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-utility",
+ "frame-benchmarking",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "hex-literal 0.4.1",
  "log",
+ "pallet-aura",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-bridge-grandpa",
+ "pallet-bridge-messages",
+ "pallet-bridge-parachains",
+ "pallet-bridge-relayers",
+ "pallet-collator-selection",
+ "pallet-multisig",
+ "pallet-session",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-utility",
+ "pallet-xcm",
+ "pallet-xcm-benchmarks",
+ "parachain-info",
+ "parachains-common",
  "parity-scale-codec",
+ "polkadot-core-primitives",
+ "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
+ "rococo-runtime-constants",
  "scale-info",
  "serde",
+ "smallvec",
+ "sp-api",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-storage",
+ "sp-transaction-pool",
+ "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
-name = "bounded-vec"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68534a48cbf63a4b1323c433cf21238c9ec23711e0df13b08c33e5c2082663ce"
-dependencies = [
- "thiserror",
+name = "bridge-runtime-common"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-header-chain",
+ "bp-messages",
+ "bp-parachains",
+ "bp-polkadot-core",
+ "bp-relayers",
+ "bp-runtime",
+ "bp-xcm-bridge-hub-router",
+ "frame-support",
+ "frame-system",
+ "hash-db",
+ "log",
+ "pallet-bridge-grandpa",
+ "pallet-bridge-messages",
+ "pallet-bridge-parachains",
+ "pallet-bridge-relayers",
+ "pallet-transaction-payment",
+ "pallet-utility",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-trie",
+ "staging-xcm",
+ "staging-xcm-builder",
 ]
 
 [[package]]
@@ -954,6 +1864,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 
+[[package]]
+name = "bs58"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "bstr"
 version = "1.9.1"
@@ -1069,17 +1988,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "ccm"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7"
-dependencies = [
- "aead 0.3.2",
- "cipher 0.2.5",
- "subtle",
-]
-
 [[package]]
 name = "cexpr"
 version = "0.6.0"
@@ -1091,9 +1999,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.10.3"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
 dependencies = [
  "smallvec",
 ]
@@ -1117,7 +2025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
 dependencies = [
  "cfg-if",
- "cipher 0.4.4",
+ "cipher",
  "cpufeatures",
 ]
 
@@ -1127,9 +2035,9 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
 dependencies = [
- "aead 0.5.2",
+ "aead",
  "chacha20",
- "cipher 0.4.4",
+ "cipher",
  "poly1305",
  "zeroize",
 ]
@@ -1164,35 +2072,17 @@ dependencies = [
 
 [[package]]
 name = "cid"
-version = "0.8.6"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2"
+checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143"
 dependencies = [
  "core2",
  "multibase",
- "multihash 0.16.3",
+ "multihash",
  "serde",
  "unsigned-varint",
 ]
 
-[[package]]
-name = "cipher"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
-dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array 0.14.7",
-]
-
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -1266,13 +2156,15 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "clients-info"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
  "scale-info",
+ "serde",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
@@ -1301,6 +2193,76 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "collectives-polkadot-runtime"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-session-benchmarking",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-utility",
+ "frame-benchmarking",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "hex-literal 0.4.1",
+ "log",
+ "pallet-alliance",
+ "pallet-aura",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-collator-selection",
+ "pallet-collective",
+ "pallet-core-fellowship",
+ "pallet-multisig",
+ "pallet-preimage",
+ "pallet-proxy",
+ "pallet-ranked-collective",
+ "pallet-referenda",
+ "pallet-salary",
+ "pallet-scheduler",
+ "pallet-session",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-utility",
+ "pallet-xcm",
+ "parachain-info",
+ "parachains-common",
+ "parity-scale-codec",
+ "polkadot-core-primitives",
+ "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
+ "polkadot-runtime-constants",
+ "scale-info",
+ "smallvec",
+ "sp-api",
+ "sp-arithmetic",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-storage",
+ "sp-transaction-pool",
+ "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "substrate-wasm-builder",
+]
+
 [[package]]
 name = "colorchoice"
 version = "1.0.1"
@@ -1309,15 +2271,36 @@ checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "comfy-table"
-version = "6.2.0"
+version = "7.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba"
+checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
 dependencies = [
- "strum",
- "strum_macros",
+ "strum 0.26.3",
+ "strum_macros 0.26.4",
  "unicode-width",
 ]
 
+[[package]]
+name = "common"
+version = "0.1.0"
+source = "git+https://github.com/burdges/ring-proof?branch=patch-1#05a756076cb20f981a52afea3a620168de49f95f"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "fflonk",
+ "merlin 3.0.0",
+ "rand_chacha 0.3.1",
+]
+
+[[package]]
+name = "common-path"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
+
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -1346,6 +2329,32 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.15",
+ "once_cell",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.3.0"
@@ -1413,28 +2422,27 @@ dependencies = [
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc42ba2e232e5b20ff7dc299a812d53337dadce9a7e39a238e6a5cb82d2e57b"
+checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "253531aca9b6f56103c9420369db3263e784df39aa1c90685a1f69cfbba0623e"
+checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220"
 dependencies = [
- "arrayvec 0.7.4",
  "bumpalo",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
  "cranelift-isle",
- "gimli 0.26.2",
- "hashbrown 0.12.3",
+ "gimli 0.27.3",
+ "hashbrown 0.13.2",
  "log",
  "regalloc2",
  "smallvec",
@@ -1443,33 +2451,33 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f2154365e2bff1b1b8537a7181591fdff50d8e27fa6e40d5c69c3bad0ca7c8"
+checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "687e14e3f5775248930e0d5a84195abef8b829958e9794bf8d525104993612b4"
+checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1"
+checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8483c2db6f45fe9ace984e5adc5d058102227e4c62e5aa2054e16b0275fd3a6e"
+checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1479,15 +2487,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9793158837678902446c411741d87b43f57dadfb944f2440db4287cda8cbd59"
+checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba"
 
 [[package]]
 name = "cranelift-native"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72668c7755f2b880665cb422c8ad2d56db58a88b9bebfef0b73edc2277c13c49"
+checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -1496,9 +2504,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3852ce4b088b44ac4e29459573943009a70d1b192c8d77ef949b4e814f656fc1"
+checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1510,21 +2518,6 @@ 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.4.2"
@@ -1572,19 +2565,7 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 name = "crunchy"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-bigint"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
-dependencies = [
- "generic-array 0.14.7",
- "rand_core 0.6.4",
- "subtle",
- "zeroize",
-]
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
@@ -1629,33 +2610,25 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "ctr"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
-dependencies = [
- "cipher 0.3.0",
-]
-
 [[package]]
 name = "ctr"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
 dependencies = [
- "cipher 0.4.4",
+ "cipher",
 ]
 
 [[package]]
 name = "cumulus-client-cli"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "clap",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-cli",
+ "sc-client-api",
  "sc-service",
  "sp-core",
  "sp-runtime",
@@ -1665,7 +2638,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-collator"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
@@ -1688,18 +2661,29 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-aura"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
+ "cumulus-client-collator",
  "cumulus-client-consensus-common",
+ "cumulus-client-consensus-proposer",
+ "cumulus-primitives-aura",
  "cumulus-primitives-core",
+ "cumulus-primitives-parachain-inherent",
+ "cumulus-relay-chain-interface",
  "futures",
  "parity-scale-codec",
+ "polkadot-node-primitives",
+ "polkadot-node-subsystem",
+ "polkadot-overseer",
+ "polkadot-primitives",
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-aura",
+ "sc-consensus-babe",
  "sc-consensus-slots",
  "sc-telemetry",
+ "schnellru",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -1710,6 +2694,8 @@ dependencies = [
  "sp-inherents",
  "sp-keystore",
  "sp-runtime",
+ "sp-state-machine",
+ "sp-timestamp",
  "substrate-prometheus-endpoint",
  "tracing",
 ]
@@ -1717,7 +2703,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "cumulus-client-pov-recovery",
@@ -1730,18 +2716,38 @@ dependencies = [
  "polkadot-primitives",
  "sc-client-api",
  "sc-consensus",
+ "sc-consensus-babe",
  "schnellru",
  "sp-blockchain",
  "sp-consensus",
+ "sp-consensus-slots",
+ "sp-core",
  "sp-runtime",
+ "sp-timestamp",
  "sp-trie",
+ "substrate-prometheus-endpoint",
  "tracing",
 ]
 
+[[package]]
+name = "cumulus-client-consensus-proposer"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "cumulus-primitives-parachain-inherent",
+ "sp-consensus",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-state-machine",
+ "thiserror",
+]
+
 [[package]]
 name = "cumulus-client-network"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -1750,7 +2756,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.2",
  "polkadot-node-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "sc-client-api",
  "sp-blockchain",
@@ -1764,7 +2770,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-pov-recovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1788,7 +2794,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-service"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -1823,11 +2829,13 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-aura-ext"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "cumulus-pallet-parachain-system",
  "frame-support",
  "frame-system",
  "pallet-aura",
+ "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
  "sp-application-crypto",
@@ -1839,7 +2847,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-dmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1850,13 +2858,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
+ "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-pallet-parachain-system"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bytes",
  "cumulus-pallet-parachain-system-proc-macro",
@@ -1868,7 +2876,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "scale-info",
  "sp-core",
  "sp-externalities",
@@ -1879,13 +2887,14 @@ dependencies = [
  "sp-std",
  "sp-trie",
  "sp-version",
- "xcm",
+ "staging-xcm",
+ "trie-db",
 ]
 
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
@@ -1896,7 +2905,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1910,7 +2919,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcm"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1920,13 +2929,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
+ "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-benchmarking",
@@ -1940,31 +2949,45 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-executor",
+]
+
+[[package]]
+name = "cumulus-primitives-aura"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "parity-scale-codec",
+ "polkadot-core-primitives",
+ "polkadot-primitives",
+ "sp-api",
+ "sp-consensus-aura",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
 name = "cumulus-primitives-core"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "scale-info",
  "sp-api",
  "sp-runtime",
  "sp-std",
  "sp-trie",
- "xcm",
+ "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1987,7 +3010,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-timestamp"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "cumulus-primitives-core",
  "futures",
@@ -2000,7 +3023,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-utility"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -2010,15 +3033,15 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
 name = "cumulus-relay-chain-inprocess-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2026,7 +3049,6 @@ dependencies = [
  "futures",
  "futures-timer",
  "polkadot-cli",
- "polkadot-client",
  "polkadot-service",
  "sc-cli",
  "sc-client-api",
@@ -2043,7 +3065,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2061,15 +3083,14 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-minimal-node"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes",
  "async-trait",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
  "cumulus-relay-chain-rpc-interface",
  "futures",
- "lru 0.9.0",
  "polkadot-availability-recovery",
  "polkadot-collator-protocol",
  "polkadot-core-primitives",
@@ -2081,47 +3102,53 @@ dependencies = [
  "polkadot-overseer",
  "polkadot-primitives",
  "sc-authority-discovery",
- "sc-client-api",
  "sc-network",
  "sc-network-common",
  "sc-service",
  "sc-tracing",
  "sc-utils",
+ "schnellru",
  "sp-api",
- "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-runtime",
- "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "cumulus-relay-chain-rpc-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
+ "either",
  "futures",
  "futures-timer",
  "jsonrpsee",
- "lru 0.9.0",
  "parity-scale-codec",
+ "pin-project",
  "polkadot-overseer",
+ "rand 0.8.5",
  "sc-client-api",
  "sc-rpc-api",
  "sc-service",
+ "schnellru",
  "serde",
  "serde_json",
+ "smoldot",
+ "smoldot-light",
  "sp-api",
  "sp-authority-discovery",
  "sp-consensus-babe",
  "sp-core",
+ "sp-runtime",
  "sp-state-machine",
  "sp-storage",
+ "thiserror",
  "tokio",
+ "tokio-util",
  "tracing",
  "url",
 ]
@@ -2129,7 +3156,7 @@ dependencies = [
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
@@ -2137,17 +3164,18 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-std",
+ "sp-trie",
 ]
 
 [[package]]
 name = "currency"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "frame-support",
  "frame-system",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "pallet-transaction-payment",
@@ -2196,7 +3224,7 @@ dependencies = [
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "platforms 3.4.0",
+ "platforms",
  "rustc_version 0.4.0",
  "subtle",
  "zeroize",
@@ -2213,6 +3241,19 @@ dependencies = [
  "syn 2.0.65",
 ]
 
+[[package]]
+name = "curve25519-dalek-ng"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.6.4",
+ "subtle-ng",
+ "zeroize",
+]
+
 [[package]]
 name = "cxx"
 version = "1.0.122"
@@ -2318,17 +3359,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "der"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
-dependencies = [
- "const-oid",
- "pem-rfc7468",
- "zeroize",
-]
-
 [[package]]
 name = "der"
 version = "0.7.9"
@@ -2339,27 +3369,13 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "der-parser"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82"
-dependencies = [
- "asn1-rs 0.3.1",
- "displaydoc",
- "nom",
- "num-bigint",
- "num-traits",
- "rusticata-macros",
-]
-
 [[package]]
 name = "der-parser"
 version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
 dependencies = [
- "asn1-rs 0.5.2",
+ "asn1-rs",
  "displaydoc",
  "nom",
  "num-bigint",
@@ -2399,34 +3415,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "derive_builder"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.11.2"
+name = "derive-syn-parse"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4"
+checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
- "darling",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
-dependencies = [
- "derive_builder_core",
- "syn 1.0.109",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -2445,7 +3441,7 @@ dependencies = [
 [[package]]
 name = "dia-oracle"
 version = "0.1.0"
-source = "git+https://github.com/pendulum-chain/oracle-pallet?branch=polkadot-v0.9.42#79ab575220f3c59935e0e4ff73124604c9aeac6d"
+source = "git+https://github.com/pendulum-chain/oracle-pallet?branch=polkadot-v1.1.0#78899ea67dabd2b5cb2c5784ced05f0f9162fb99"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2463,12 +3459,13 @@ dependencies = [
 [[package]]
 name = "dia-oracle-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/pendulum-chain/oracle-pallet?branch=polkadot-v0.9.42#79ab575220f3c59935e0e4ff73124604c9aeac6d"
+source = "git+https://github.com/pendulum-chain/oracle-pallet?branch=polkadot-v1.1.0#299549721c8968a54ad58e3abf9f79bcbaa9d7be"
 dependencies = [
  "dia-oracle",
  "frame-support",
  "sp-api",
  "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -2559,6 +3556,50 @@ dependencies = [
  "syn 2.0.65",
 ]
 
+[[package]]
+name = "dleq_vrf"
+version = "0.0.2"
+source = "git+https://github.com/w3f//ring-vrf?rev=3ddc20#3ddc2051066c4b3f0eadd0ba5700df12500d9754"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-scale",
+ "ark-secret-scalar",
+ "ark-serialize",
+ "ark-std",
+ "ark-transcript",
+ "arrayvec 0.7.4",
+ "rand_core 0.6.4",
+ "zeroize",
+]
+
+[[package]]
+name = "docify"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce"
+dependencies = [
+ "docify_macros",
+]
+
+[[package]]
+name = "docify_macros"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad"
+dependencies = [
+ "common-path",
+ "derive-syn-parse 0.2.0",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.65",
+ "termcolor",
+ "toml 0.8.15",
+ "walkdir",
+]
+
 [[package]]
 name = "downcast"
 version = "0.11.0"
@@ -2604,30 +3645,18 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
-[[package]]
-name = "ecdsa"
-version = "0.14.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
-dependencies = [
- "der 0.6.1",
- "elliptic-curve 0.12.3",
- "rfc6979 0.3.1",
- "signature 1.6.4",
-]
-
 [[package]]
 name = "ecdsa"
 version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "der 0.7.9",
+ "der",
  "digest 0.10.7",
- "elliptic-curve 0.13.8",
- "rfc6979 0.4.0",
+ "elliptic-curve",
+ "rfc6979",
  "signature 2.2.0",
- "spki 0.7.3",
+ "spki",
 ]
 
 [[package]]
@@ -2645,7 +3674,7 @@ version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
- "pkcs8 0.10.2",
+ "pkcs8",
  "signature 2.2.0",
 ]
 
@@ -2693,48 +3722,41 @@ dependencies = [
 ]
 
 [[package]]
-name = "either"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.12.3"
+name = "ed25519-zebra"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9"
 dependencies = [
- "base16ct 0.1.1",
- "crypto-bigint 0.4.9",
- "der 0.6.1",
- "digest 0.10.7",
- "ff 0.12.1",
- "generic-array 0.14.7",
- "group 0.12.1",
- "hkdf",
- "pem-rfc7468",
- "pkcs8 0.9.0",
+ "curve25519-dalek 4.1.2",
+ "ed25519 2.2.3",
+ "hashbrown 0.14.5",
+ "hex",
  "rand_core 0.6.4",
- "sec1 0.3.0",
- "subtle",
+ "sha2 0.10.8",
  "zeroize",
 ]
 
+[[package]]
+name = "either"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+
 [[package]]
 name = "elliptic-curve"
 version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
- "base16ct 0.2.0",
- "crypto-bigint 0.5.5",
+ "base16ct",
+ "crypto-bigint",
  "digest 0.10.7",
- "ff 0.13.0",
+ "ff",
  "generic-array 0.14.7",
- "group 0.13.0",
- "pkcs8 0.10.2",
+ "group",
+ "pkcs8",
  "rand_core 0.6.4",
- "sec1 0.7.3",
+ "sec1",
  "subtle",
  "zeroize",
 ]
@@ -2836,12 +3858,50 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "ethbloom"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
+dependencies = [
+ "crunchy",
+ "fixed-hash 0.8.0",
+ "impl-rlp",
+ "impl-serde",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
+dependencies = [
+ "ethbloom",
+ "fixed-hash 0.8.0",
+ "impl-rlp",
+ "impl-serde",
+ "primitive-types",
+ "uint",
+]
+
 [[package]]
 name = "event-listener"
 version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
+[[package]]
+name = "event-listener"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite 0.2.14",
+]
+
 [[package]]
 name = "event-listener"
 version = "4.0.3"
@@ -2853,6 +3913,17 @@ dependencies = [
  "pin-project-lite 0.2.14",
 ]
 
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite 0.2.14",
+]
+
 [[package]]
 name = "event-listener-strategy"
 version = "0.4.0"
@@ -2863,6 +3934,16 @@ dependencies = [
  "pin-project-lite 0.2.14",
 ]
 
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener 5.3.1",
+ "pin-project-lite 0.2.14",
+]
+
 [[package]]
 name = "exit-future"
 version = "0.2.0"
@@ -2896,19 +3977,6 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "expander"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84"
-dependencies = [
- "blake2",
- "fs-err",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "expander"
 version = "2.1.0"
@@ -2935,6 +4003,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.1.0"
@@ -2977,8 +4054,8 @@ dependencies = [
 
 [[package]]
 name = "fee"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "currency",
  "frame-benchmarking",
@@ -3003,22 +4080,25 @@ dependencies = [
 
 [[package]]
 name = "ff"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
  "rand_core 0.6.4",
  "subtle",
 ]
 
 [[package]]
-name = "ff"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+name = "fflonk"
+version = "0.1.0"
+source = "git+https://github.com/w3f/fflonk#1e854f35e9a65d08b11a86291405cdc95baa0a35"
 dependencies = [
- "rand_core 0.6.4",
- "subtle",
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "merlin 3.0.0",
 ]
 
 [[package]]
@@ -3122,7 +4202,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -3178,7 +4258,7 @@ dependencies = [
  "orml-asset-registry",
  "orml-currencies",
  "orml-currencies-allowance-extension",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-tokens-management-extension",
  "orml-traits",
  "orml-xcm-support",
@@ -3211,7 +4291,7 @@ dependencies = [
  "parachain-staking",
  "parity-scale-codec",
  "paste",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "pooled-rewards",
  "price-chain-extension",
@@ -3233,18 +4313,19 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
  "spacewalk-primitives",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "staking",
  "stellar-relay",
  "substrate-wasm-builder",
  "token-chain-extension",
  "treasury-buyout-extension",
  "vault-registry",
- "xcm",
- "xcm-builder",
- "xcm-executor",
  "zenlink-protocol",
  "zenlink-protocol-runtime-api",
 ]
@@ -3258,7 +4339,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -3283,10 +4364,10 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "Inflector",
- "array-bytes 4.2.0",
+ "array-bytes",
  "chrono",
  "clap",
  "comfy-table",
@@ -3317,12 +4398,13 @@ dependencies = [
  "sp-database",
  "sp-externalities",
  "sp-inherents",
+ "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
  "sp-storage",
  "sp-trie",
+ "sp-wasm-interface",
  "thiserror",
  "thousands",
 ]
@@ -3330,7 +4412,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
@@ -3341,7 +4423,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -3358,11 +4440,12 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-system",
  "frame-try-runtime",
+ "log",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -3374,9 +4457,9 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "15.1.0"
+version = "16.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c"
+checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692"
 dependencies = [
  "cfg-if",
  "parity-scale-codec",
@@ -3384,10 +4467,25 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "frame-metadata-hash-extension"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "array-bytes",
+ "docify",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+]
+
 [[package]]
 name = "frame-remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-recursion",
  "futures",
@@ -3399,54 +4497,65 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
+ "sp-state-machine",
  "spinners",
  "substrate-rpc-client",
  "tokio",
+ "tokio-retry",
 ]
 
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "aquamarine",
  "bitflags 1.3.2",
+ "docify",
  "environmental",
  "frame-metadata",
  "frame-support-procedural",
  "impl-trait-for-tuples",
  "k256",
  "log",
- "once_cell",
+ "macro_magic",
  "parity-scale-codec",
  "paste",
  "scale-info",
  "serde",
+ "serde_json",
  "smallvec",
  "sp-api",
  "sp-arithmetic",
  "sp-core",
  "sp-core-hashing-proc-macro",
+ "sp-debug-derive",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
+ "sp-metadata-ir",
  "sp-runtime",
  "sp-staking",
  "sp-state-machine",
  "sp-std",
  "sp-tracing",
  "sp-weights",
+ "static_assertions",
  "tt-call",
 ]
 
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "Inflector",
  "cfg-expr",
- "derive-syn-parse",
+ "derive-syn-parse 0.1.5",
+ "expander 2.1.0",
  "frame-support-procedural-tools",
  "itertools 0.10.5",
+ "macro_magic",
  "proc-macro-warning",
  "proc-macro2",
  "quote",
@@ -3456,7 +4565,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.3.1",
@@ -3468,7 +4577,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3478,8 +4587,9 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "cfg-if",
  "frame-support",
  "log",
  "parity-scale-codec",
@@ -3496,7 +4606,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3511,7 +4621,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3520,7 +4630,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3613,13 +4723,31 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
+[[package]]
+name = "futures-lite"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+dependencies = [
+ "fastrand 1.9.0",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite 0.2.14",
+ "waker-fn",
+]
+
 [[package]]
 name = "futures-lite"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
+ "fastrand 2.1.0",
  "futures-core",
+ "futures-io",
+ "parking",
  "pin-project-lite 0.2.14",
 ]
 
@@ -3642,7 +4770,7 @@ checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd"
 dependencies = [
  "futures-io",
  "rustls 0.20.9",
- "webpki 0.22.4",
+ "webpki",
 ]
 
 [[package]]
@@ -3755,16 +4883,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "ghash"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
-dependencies = [
- "opaque-debug 0.3.1",
- "polyval 0.5.3",
-]
-
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -3772,14 +4890,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
 dependencies = [
  "opaque-debug 0.3.1",
- "polyval 0.6.2",
+ "polyval",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.26.2"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 dependencies = [
  "fallible-iterator",
  "indexmap 1.9.3",
@@ -3856,24 +4974,13 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "group"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
-dependencies = [
- "ff 0.12.1",
- "rand_core 0.6.4",
- "subtle",
-]
-
 [[package]]
 name = "group"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
- "ff 0.13.0",
+ "ff",
  "rand_core 0.6.4",
  "subtle",
 ]
@@ -3949,6 +5056,11 @@ name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash 0.8.11",
+ "allocator-api2",
+ "serde",
+]
 
 [[package]]
 name = "heck"
@@ -4134,21 +5246,6 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
-dependencies = [
- "http",
- "hyper",
- "log",
- "rustls 0.20.9",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls 0.23.4",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.24.2"
@@ -4162,7 +5259,7 @@ dependencies = [
  "rustls 0.21.12",
  "rustls-native-certs",
  "tokio",
- "tokio-rustls 0.24.1",
+ "tokio-rustls",
  "webpki-roots 0.25.4",
 ]
 
@@ -4177,7 +5274,7 @@ dependencies = [
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core",
 ]
 
 [[package]]
@@ -4232,7 +5329,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
 dependencies = [
- "async-io",
+ "async-io 2.3.2",
  "core-foundation",
  "fnv",
  "futures",
@@ -4254,6 +5351,26 @@ dependencies = [
  "parity-scale-codec",
 ]
 
+[[package]]
+name = "impl-num-traits"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17"
+dependencies = [
+ "integer-sqrt",
+ "num-traits",
+ "uint",
+]
+
+[[package]]
+name = "impl-rlp"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
+dependencies = [
+ "rlp",
+]
+
 [[package]]
 name = "impl-serde"
 version = "0.4.0"
@@ -4274,6 +5391,25 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "include_dir"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
+dependencies = [
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "index-fixed"
 version = "0.3.1"
@@ -4354,22 +5490,55 @@ dependencies = [
 ]
 
 [[package]]
-name = "interceptor"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b"
-dependencies = [
- "async-trait",
- "bytes",
- "log",
- "rand 0.8.5",
- "rtcp",
- "rtp",
- "thiserror",
- "tokio",
- "waitgroup",
- "webrtc-srtp",
- "webrtc-util",
+name = "integration-tests-common"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "asset-hub-kusama-runtime",
+ "asset-hub-polkadot-runtime",
+ "asset-hub-westend-runtime",
+ "bp-messages",
+ "bridge-hub-kusama-runtime",
+ "bridge-hub-polkadot-runtime",
+ "bridge-hub-rococo-runtime",
+ "bridge-runtime-common",
+ "collectives-polkadot-runtime",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "frame-support",
+ "kusama-runtime-constants",
+ "pallet-assets",
+ "pallet-bridge-messages",
+ "pallet-im-online",
+ "pallet-message-queue",
+ "pallet-staking",
+ "pallet-xcm",
+ "parachains-common",
+ "parity-scale-codec",
+ "paste",
+ "penpal-runtime",
+ "polkadot-core-primitives",
+ "polkadot-parachain-primitives",
+ "polkadot-primitives",
+ "polkadot-runtime",
+ "polkadot-runtime-constants",
+ "polkadot-runtime-parachains",
+ "polkadot-service",
+ "rococo-runtime",
+ "rococo-runtime-constants",
+ "sc-consensus-grandpa",
+ "sp-authority-discovery",
+ "sp-consensus-babe",
+ "sp-consensus-beefy",
+ "sp-core",
+ "sp-runtime",
+ "staging-kusama-runtime",
+ "staging-xcm",
+ "westend-runtime",
+ "westend-runtime-constants",
+ "xcm-emulator",
 ]
 
 [[package]]
@@ -4418,6 +5587,15 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "is_executable"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.0"
@@ -4426,8 +5604,8 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
 
 [[package]]
 name = "issue"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "base64 0.13.1",
  "currency",
@@ -4439,7 +5617,7 @@ dependencies = [
  "log",
  "oracle",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "pallet-timestamp",
@@ -4537,7 +5715,7 @@ dependencies = [
  "soketto",
  "thiserror",
  "tokio",
- "tokio-rustls 0.24.1",
+ "tokio-rustls",
  "tokio-util",
  "tracing",
  "webpki-roots 0.25.4",
@@ -4580,7 +5758,7 @@ checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43"
 dependencies = [
  "async-trait",
  "hyper",
- "hyper-rustls 0.24.2",
+ "hyper-rustls",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "rustc-hash",
@@ -4659,134 +5837,36 @@ checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e"
 dependencies = [
  "http",
  "jsonrpsee-client-transport",
- "jsonrpsee-core",
- "jsonrpsee-types",
-]
-
-[[package]]
-name = "k256"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
-dependencies = [
- "cfg-if",
- "ecdsa 0.16.9",
- "elliptic-curve 0.13.8",
- "once_cell",
- "sha2 0.10.8",
-]
-
-[[package]]
-name = "keccak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
-dependencies = [
- "cpufeatures",
-]
-
-[[package]]
-name = "kusama-runtime"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
-dependencies = [
- "bitvec",
- "frame-benchmarking",
- "frame-election-provider-support",
- "frame-executive",
- "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal 0.4.1",
- "kusama-runtime-constants",
- "log",
- "pallet-authority-discovery",
- "pallet-authorship",
- "pallet-babe",
- "pallet-bags-list",
- "pallet-balances",
- "pallet-bounties",
- "pallet-child-bounties",
- "pallet-collective",
- "pallet-conviction-voting",
- "pallet-democracy",
- "pallet-election-provider-multi-phase",
- "pallet-election-provider-support-benchmarking",
- "pallet-elections-phragmen",
- "pallet-fast-unstake",
- "pallet-grandpa",
- "pallet-identity",
- "pallet-im-online",
- "pallet-indices",
- "pallet-membership",
- "pallet-multisig",
- "pallet-nis",
- "pallet-nomination-pools",
- "pallet-nomination-pools-benchmarking",
- "pallet-nomination-pools-runtime-api",
- "pallet-offences",
- "pallet-offences-benchmarking",
- "pallet-preimage",
- "pallet-proxy",
- "pallet-ranked-collective",
- "pallet-recovery",
- "pallet-referenda",
- "pallet-scheduler",
- "pallet-session",
- "pallet-session-benchmarking",
- "pallet-society",
- "pallet-staking",
- "pallet-staking-runtime-api",
- "pallet-timestamp",
- "pallet-tips",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-treasury",
- "pallet-utility",
- "pallet-vesting",
- "pallet-whitelist",
- "pallet-xcm",
- "pallet-xcm-benchmarks",
- "parity-scale-codec",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "polkadot-runtime-parachains",
- "rustc-hex",
- "scale-info",
- "serde",
- "serde_derive",
- "smallvec",
- "sp-api",
- "sp-arithmetic",
- "sp-authority-discovery",
- "sp-block-builder",
- "sp-consensus-babe",
- "sp-consensus-beefy",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-mmr-primitives",
- "sp-npos-elections",
- "sp-offchain",
- "sp-runtime",
- "sp-session",
- "sp-staking",
- "sp-std",
- "sp-transaction-pool",
- "sp-version",
- "static_assertions",
- "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
+]
+
+[[package]]
+name = "k256"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "sha2 0.10.8",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+dependencies = [
+ "cpufeatures",
 ]
 
 [[package]]
 name = "kusama-runtime-constants"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -4818,9 +5898,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7a749456510c45f795e8b04a6a3e0976d0139213ecbf465843830ad55e2217"
+checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6"
 dependencies = [
  "kvdb",
  "num_cpus",
@@ -4830,6 +5910,17 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "landlock"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068"
+dependencies = [
+ "enumflags2",
+ "libc",
+ "thiserror",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -4869,22 +5960,24 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libp2p"
-version = "0.50.1"
+version = "0.51.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8"
+checksum = "f35eae38201a993ece6bdc823292d6abd1bffed1c4d0f4a3517d2bd8e1d917fe"
 dependencies = [
  "bytes",
  "futures",
  "futures-timer",
  "getrandom 0.2.15",
  "instant",
- "libp2p-core 0.38.0",
+ "libp2p-allow-block-list",
+ "libp2p-connection-limits",
+ "libp2p-core",
  "libp2p-dns",
  "libp2p-identify",
+ "libp2p-identity",
  "libp2p-kad",
  "libp2p-mdns",
  "libp2p-metrics",
- "libp2p-mplex",
  "libp2p-noise",
  "libp2p-ping",
  "libp2p-quic",
@@ -4892,47 +5985,34 @@ dependencies = [
  "libp2p-swarm",
  "libp2p-tcp",
  "libp2p-wasm-ext",
- "libp2p-webrtc",
  "libp2p-websocket",
  "libp2p-yamux",
- "multiaddr 0.16.0",
- "parking_lot 0.12.2",
+ "multiaddr",
  "pin-project",
- "smallvec",
 ]
 
 [[package]]
-name = "libp2p-core"
-version = "0.38.0"
+name = "libp2p-allow-block-list"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f"
+checksum = "510daa05efbc25184458db837f6f9a5143888f1caa742426d92e1833ddd38a50"
 dependencies = [
- "asn1_der",
- "bs58",
- "ed25519-dalek 1.0.1",
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "instant",
- "log",
- "multiaddr 0.16.0",
- "multihash 0.16.3",
- "multistream-select",
- "once_cell",
- "parking_lot 0.12.2",
- "pin-project",
- "prost",
- "prost-build",
- "rand 0.8.5",
- "rw-stream-sink",
- "sec1 0.3.0",
- "sha2 0.10.8",
- "smallvec",
- "thiserror",
- "unsigned-varint",
+ "libp2p-core",
+ "libp2p-identity",
+ "libp2p-swarm",
+ "void",
+]
+
+[[package]]
+name = "libp2p-connection-limits"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0"
+dependencies = [
+ "libp2p-core",
+ "libp2p-identity",
+ "libp2p-swarm",
  "void",
- "zeroize",
 ]
 
 [[package]]
@@ -4948,8 +6028,8 @@ dependencies = [
  "instant",
  "libp2p-identity",
  "log",
- "multiaddr 0.17.1",
- "multihash 0.17.0",
+ "multiaddr",
+ "multihash",
  "multistream-select",
  "once_cell",
  "parking_lot 0.12.2",
@@ -4965,12 +6045,12 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5"
+checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554"
 dependencies = [
  "futures",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "log",
  "parking_lot 0.12.2",
  "smallvec",
@@ -4979,20 +6059,21 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.41.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf"
+checksum = "5455f472243e63b9c497ff320ded0314254a9eb751799a39c283c6f20b793f3c"
 dependencies = [
  "asynchronous-codec",
+ "either",
  "futures",
  "futures-timer",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
- "lru 0.8.1",
- "prost",
- "prost-build",
- "prost-codec",
+ "lru 0.10.1",
+ "quick-protobuf",
+ "quick-protobuf-codec",
  "smallvec",
  "thiserror",
  "void",
@@ -5004,11 +6085,11 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce"
 dependencies = [
- "bs58",
+ "bs58 0.4.0",
  "ed25519-dalek 2.1.1",
  "log",
- "multiaddr 0.17.1",
- "multihash 0.17.0",
+ "multiaddr",
+ "multihash",
  "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.8",
@@ -5018,9 +6099,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.42.1"
+version = "0.43.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2"
+checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff"
 dependencies = [
  "arrayvec 0.7.4",
  "asynchronous-codec",
@@ -5030,11 +6111,11 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.8",
  "smallvec",
@@ -5046,14 +6127,15 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.42.0"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b"
+checksum = "19983e1f949f979a928f2c603de1cf180cc0dc23e4ac93a62651ccb18341460b"
 dependencies = [
  "data-encoding",
  "futures",
  "if-watch",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
  "rand 0.8.5",
@@ -5066,11 +6148,11 @@ dependencies = [
 
 [[package]]
 name = "libp2p-metrics"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55"
+checksum = "a42ec91e227d7d0dafa4ce88b333cdf5f277253873ab087555c92798db2ddd46"
 dependencies = [
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "libp2p-identify",
  "libp2p-kad",
  "libp2p-ping",
@@ -5078,38 +6160,20 @@ dependencies = [
  "prometheus-client",
 ]
 
-[[package]]
-name = "libp2p-mplex"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "futures",
- "libp2p-core 0.38.0",
- "log",
- "nohash-hasher",
- "parking_lot 0.12.2",
- "rand 0.8.5",
- "smallvec",
- "unsigned-varint",
-]
-
 [[package]]
 name = "libp2p-noise"
-version = "0.41.0"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e"
+checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e"
 dependencies = [
  "bytes",
  "curve25519-dalek 3.2.0",
  "futures",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "log",
  "once_cell",
- "prost",
- "prost-build",
+ "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.8",
  "snow",
@@ -5121,14 +6185,15 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.41.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f"
+checksum = "3e57759c19c28a73ef1eb3585ca410cefb72c1a709fcf6de1612a378e4219202"
 dependencies = [
+ "either",
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "libp2p-swarm",
  "log",
  "rand 0.8.5",
@@ -5137,15 +6202,16 @@ dependencies = [
 
 [[package]]
 name = "libp2p-quic"
-version = "0.7.0-alpha"
+version = "0.7.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59"
+checksum = "c6b26abd81cd2398382a1edfe739b539775be8a90fa6914f39b2ab49571ec735"
 dependencies = [
  "bytes",
  "futures",
  "futures-timer",
  "if-watch",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-tls",
  "log",
  "parking_lot 0.12.2",
@@ -5158,49 +6224,46 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.23.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884"
+checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5"
 dependencies = [
  "async-trait",
- "bytes",
  "futures",
  "instant",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
- "log",
  "rand 0.8.5",
  "smallvec",
- "unsigned-varint",
 ]
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.41.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0"
+checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296"
 dependencies = [
  "either",
  "fnv",
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm-derive",
  "log",
- "pin-project",
  "rand 0.8.5",
  "smallvec",
- "thiserror",
  "tokio",
  "void",
 ]
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400"
+checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f"
 dependencies = [
  "heck 0.4.1",
  "quote",
@@ -5209,15 +6272,15 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d"
+checksum = "33d33698596d7722d85d3ab0c86c2c322254fce1241e91208e3679b4eb3026cf"
 dependencies = [
  "futures",
  "futures-timer",
  "if-watch",
  "libc",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "log",
  "socket2 0.4.10",
  "tokio",
@@ -5231,72 +6294,41 @@ checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781"
 dependencies = [
  "futures",
  "futures-rustls",
- "libp2p-core 0.39.2",
+ "libp2p-core",
  "libp2p-identity",
- "rcgen 0.10.0",
+ "rcgen",
  "ring 0.16.20",
  "rustls 0.20.9",
  "thiserror",
- "webpki 0.22.4",
- "x509-parser 0.14.0",
+ "webpki",
+ "x509-parser",
  "yasna",
 ]
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069"
+checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43"
 dependencies = [
  "futures",
  "js-sys",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "parity-send-wrapper",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
 
-[[package]]
-name = "libp2p-webrtc"
-version = "0.4.0-alpha"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a"
-dependencies = [
- "async-trait",
- "asynchronous-codec",
- "bytes",
- "futures",
- "futures-timer",
- "hex",
- "if-watch",
- "libp2p-core 0.38.0",
- "libp2p-noise",
- "log",
- "multihash 0.16.3",
- "prost",
- "prost-build",
- "prost-codec",
- "rand 0.8.5",
- "rcgen 0.9.3",
- "serde",
- "stun",
- "thiserror",
- "tinytemplate",
- "tokio",
- "tokio-util",
- "webrtc",
-]
-
 [[package]]
 name = "libp2p-websocket"
-version = "0.40.0"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54"
+checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f"
 dependencies = [
  "either",
  "futures",
  "futures-rustls",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "log",
  "parking_lot 0.12.2",
  "quicksink",
@@ -5308,14 +6340,13 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.42.0"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29"
+checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda"
 dependencies = [
  "futures",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "log",
- "parking_lot 0.12.2",
  "thiserror",
  "yamux",
 ]
@@ -5332,9 +6363,9 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "0.10.0+7.9.2"
+version = "0.11.0+8.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b"
+checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -5443,6 +6474,12 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -5476,13 +6513,19 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17"
+checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
 dependencies = [
  "hashbrown 0.13.2",
 ]
 
+[[package]]
+name = "lru"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
+
 [[package]]
 name = "lru-cache"
 version = "0.1.2"
@@ -5522,12 +6565,51 @@ dependencies = [
 ]
 
 [[package]]
-name = "mach2"
+name = "macro_magic"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
+checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9"
 dependencies = [
- "libc",
+ "macro_magic_core",
+ "macro_magic_macros",
+ "quote",
+ "syn 2.0.65",
+]
+
+[[package]]
+name = "macro_magic_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00"
+dependencies = [
+ "const-random",
+ "derive-syn-parse 0.1.5",
+ "macro_magic_core_macros",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.65",
+]
+
+[[package]]
+name = "macro_magic_core_macros"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.65",
+]
+
+[[package]]
+name = "macro_magic_macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a"
+dependencies = [
+ "macro_magic_core",
+ "quote",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -5567,16 +6649,6 @@ dependencies = [
  "rawpointer",
 ]
 
-[[package]]
-name = "md-5"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
-dependencies = [
- "cfg-if",
- "digest 0.10.7",
-]
-
 [[package]]
 name = "memchr"
 version = "2.7.2"
@@ -5603,9 +6675,9 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.6.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
 dependencies = [
  "autocfg",
 ]
@@ -5619,12 +6691,6 @@ dependencies = [
  "hash-db",
 ]
 
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
 [[package]]
 name = "merlin"
 version = "2.0.1"
@@ -5689,7 +6755,7 @@ dependencies = [
 [[package]]
 name = "mmr-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "log",
@@ -5708,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "mmr-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "anyhow",
  "jsonrpsee",
@@ -5770,8 +6836,8 @@ dependencies = [
 
 [[package]]
 name = "module-issue-rpc"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "jsonrpsee",
  "module-issue-rpc-runtime-api",
@@ -5783,8 +6849,8 @@ dependencies = [
 
 [[package]]
 name = "module-issue-rpc-runtime-api"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -5794,8 +6860,8 @@ dependencies = [
 
 [[package]]
 name = "module-oracle-rpc"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "jsonrpsee",
  "module-oracle-rpc-runtime-api",
@@ -5808,8 +6874,8 @@ dependencies = [
 
 [[package]]
 name = "module-oracle-rpc-runtime-api"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -5843,13 +6909,14 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-api",
+ "sp-arithmetic",
  "sp-std",
 ]
 
 [[package]]
 name = "module-redeem-rpc"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "jsonrpsee",
  "module-redeem-rpc-runtime-api",
@@ -5861,8 +6928,8 @@ dependencies = [
 
 [[package]]
 name = "module-redeem-rpc-runtime-api"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -5872,8 +6939,8 @@ dependencies = [
 
 [[package]]
 name = "module-replace-rpc"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "jsonrpsee",
  "module-replace-rpc-runtime-api",
@@ -5885,8 +6952,8 @@ dependencies = [
 
 [[package]]
 name = "module-replace-rpc-runtime-api"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -5896,8 +6963,8 @@ dependencies = [
 
 [[package]]
 name = "module-vault-registry-rpc"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "jsonrpsee",
  "module-oracle-rpc-runtime-api",
@@ -5910,8 +6977,8 @@ dependencies = [
 
 [[package]]
 name = "module-vault-registry-rpc-runtime-api"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "frame-support",
  "module-oracle-rpc-runtime-api",
@@ -5920,24 +6987,6 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "multiaddr"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e"
-dependencies = [
- "arrayref",
- "byteorder",
- "data-encoding",
- "multibase",
- "multihash 0.16.3",
- "percent-encoding",
- "serde",
- "static_assertions",
- "unsigned-varint",
- "url",
-]
-
 [[package]]
 name = "multiaddr"
 version = "0.17.1"
@@ -5949,7 +6998,7 @@ dependencies = [
  "data-encoding",
  "log",
  "multibase",
- "multihash 0.17.0",
+ "multihash",
  "percent-encoding",
  "serde",
  "static_assertions",
@@ -5970,9 +7019,9 @@ dependencies = [
 
 [[package]]
 name = "multihash"
-version = "0.16.3"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc"
+checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
 dependencies = [
  "blake2b_simd",
  "blake2s_simd",
@@ -5985,17 +7034,6 @@ dependencies = [
  "unsigned-varint",
 ]
 
-[[package]]
-name = "multihash"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
-dependencies = [
- "core2",
- "multihash-derive",
- "unsigned-varint",
-]
-
 [[package]]
 name = "multihash-derive"
 version = "0.8.0"
@@ -6147,25 +7185,19 @@ dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "memoffset",
 ]
 
 [[package]]
-name = "node-primitives"
-version = "0.8.0"
-source = "git+https://github.com/pendulum-chain/bifrost?branch=upgrade-v0.9.42#37bd182449576ce641d0b3132eaa82ddba5bb05a"
-dependencies = [
- "bstringify",
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-core",
- "sp-runtime",
- "sp-std",
- "zenlink-protocol",
-]
+name = "no-std-net"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65"
+
+[[package]]
+name = "nodrop"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
 [[package]]
 name = "nohash-hasher"
@@ -6185,8 +7217,8 @@ dependencies = [
 
 [[package]]
 name = "nomination"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "currency",
  "fee",
@@ -6195,7 +7227,7 @@ dependencies = [
  "frame-system",
  "oracle",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "pallet-timestamp",
@@ -6303,12 +7335,12 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
-version = "0.29.0"
+version = "0.30.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
 dependencies = [
  "crc32fast",
- "hashbrown 0.12.3",
+ "hashbrown 0.13.2",
  "indexmap 1.9.3",
  "memchr",
 ]
@@ -6322,22 +7354,13 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "oid-registry"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a"
-dependencies = [
- "asn1-rs 0.3.1",
-]
-
 [[package]]
 name = "oid-registry"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
 dependencies = [
- "asn1-rs 0.5.2",
+ "asn1-rs",
 ]
 
 [[package]]
@@ -6366,8 +7389,8 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "oracle"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "currency",
  "dia-oracle",
@@ -6375,7 +7398,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "once_cell",
- "orml-oracle",
+ "orml-oracle 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0)",
  "pallet-balances",
  "pallet-timestamp",
  "parity-scale-codec",
@@ -6435,31 +7458,33 @@ dependencies = [
 [[package]]
 name = "orml-asset-registry"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#981d707437a22d881b993f9e902d27b163ad8bca"
 dependencies = [
  "frame-support",
  "frame-system",
+ "log",
  "orml-traits",
  "pallet-xcm",
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
 name = "orml-currencies"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#981d707437a22d881b993f9e902d27b163ad8bca"
 dependencies = [
  "frame-support",
  "frame-system",
  "orml-traits",
- "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0)",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -6477,7 +7502,7 @@ dependencies = [
  "frame-system",
  "mocktopus",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "parity-scale-codec",
@@ -6493,12 +7518,12 @@ dependencies = [
 [[package]]
 name = "orml-oracle"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#981d707437a22d881b993f9e902d27b163ad8bca"
 dependencies = [
  "frame-support",
  "frame-system",
  "orml-traits",
- "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0)",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -6509,17 +7534,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "orml-tokens"
+name = "orml-oracle"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4"
 dependencies = [
  "frame-support",
  "frame-system",
  "orml-traits",
+ "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4)",
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-arithmetic",
+ "sp-application-crypto",
+ "sp-io",
  "sp-runtime",
  "sp-std",
 ]
@@ -6527,10 +7554,11 @@ dependencies = [
 [[package]]
 name = "orml-tokens"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=4ae0372e2c624e6acc98305564b9d395f70814c0#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack//open-runtime-module-library?branch=polkadot-v1.1.0#2778a86fb12a1a61ca8ea9348f68b3c974f786e0"
 dependencies = [
  "frame-support",
  "frame-system",
+ "log",
  "orml-traits",
  "parity-scale-codec",
  "scale-info",
@@ -6549,7 +7577,7 @@ dependencies = [
  "frame-system",
  "mocktopus",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "parity-scale-codec",
@@ -6566,12 +7594,29 @@ dependencies = [
 [[package]]
 name = "orml-traits"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack//open-runtime-module-library?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack//open-runtime-module-library?branch=polkadot-v1.1.0#2778a86fb12a1a61ca8ea9348f68b3c974f786e0"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
  "num-traits",
- "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack//open-runtime-module-library?branch=polkadot-v0.9.42)",
+ "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack//open-runtime-module-library?branch=polkadot-v1.1.0)",
+ "parity-scale-codec",
+ "paste",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "staging-xcm",
+]
+
+[[package]]
+name = "orml-utilities"
+version = "0.4.1-dev"
+source = "git+https://github.com/open-web3-stack//open-runtime-module-library?branch=polkadot-v1.1.0#2778a86fb12a1a61ca8ea9348f68b3c974f786e0"
+dependencies = [
+ "frame-support",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -6579,18 +7624,18 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
 ]
 
 [[package]]
 name = "orml-utilities"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack//open-runtime-module-library?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#981d707437a22d881b993f9e902d27b163ad8bca"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -6599,12 +7644,13 @@ dependencies = [
 [[package]]
 name = "orml-utilities"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -6613,7 +7659,7 @@ dependencies = [
 [[package]]
 name = "orml-xcm"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#981d707437a22d881b993f9e902d27b163ad8bca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6621,31 +7667,32 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-std",
- "xcm",
+ "staging-xcm",
 ]
 
 [[package]]
 name = "orml-xcm-support"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#981d707437a22d881b993f9e902d27b163ad8bca"
 dependencies = [
  "frame-support",
  "orml-traits",
  "parity-scale-codec",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-executor",
 ]
 
 [[package]]
 name = "orml-xtokens"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#981d707437a22d881b993f9e902d27b163ad8bca"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
  "frame-system",
+ "log",
  "orml-traits",
  "orml-xcm-support",
  "pallet-xcm",
@@ -6655,36 +7702,67 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-executor",
 ]
 
 [[package]]
-name = "p256"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
+name = "pallet-alliance"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "ecdsa 0.14.8",
- "elliptic-curve 0.12.3",
- "sha2 0.10.8",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "pallet-collective",
+ "pallet-identity",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-core-hashing",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "p384"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa"
+name = "pallet-asset-conversion"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "ecdsa 0.14.8",
- "elliptic-curve 0.12.3",
- "sha2 0.10.8",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-asset-conversion-tx-payment"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "pallet-asset-conversion",
+ "pallet-transaction-payment",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-asset-tx-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6702,11 +7780,12 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6717,10 +7796,11 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-system",
+ "log",
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
@@ -6733,7 +7813,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6749,7 +7829,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6763,7 +7843,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6787,8 +7867,10 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "aquamarine",
+ "docify",
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-support",
@@ -6807,7 +7889,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6822,10 +7904,11 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-system",
+ "log",
  "pallet-authorship",
  "pallet-session",
  "parity-scale-codec",
@@ -6841,9 +7924,9 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "binary-merkle-tree",
  "frame-support",
  "frame-system",
@@ -6859,13 +7942,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
+ "sp-state-machine",
  "sp-std",
 ]
 
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6880,10 +7964,91 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-bridge-grandpa"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-header-chain",
+ "bp-runtime",
+ "bp-test-utils",
+ "finality-grandpa",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-consensus-grandpa",
+ "sp-runtime",
+ "sp-std",
+ "sp-trie",
+]
+
+[[package]]
+name = "pallet-bridge-messages"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-messages",
+ "bp-runtime",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "num-traits",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-bridge-parachains"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-header-chain",
+ "bp-parachains",
+ "bp-polkadot-core",
+ "bp-runtime",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "pallet-bridge-grandpa",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+ "sp-std",
+ "sp-trie",
+]
+
+[[package]]
+name = "pallet-bridge-relayers"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bp-messages",
+ "bp-relayers",
+ "bp-runtime",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "pallet-bridge-messages",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6902,7 +8067,7 @@ dependencies = [
 [[package]]
 name = "pallet-collator-selection"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6921,7 +8086,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6938,7 +8103,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bitflags 1.3.2",
  "environmental",
@@ -6947,6 +8112,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "log",
+ "pallet-balances",
  "pallet-contracts-primitives",
  "pallet-contracts-proc-macro",
  "parity-scale-codec",
@@ -6960,14 +8126,13 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "wasm-instrument 0.4.0",
- "wasmi 0.28.0",
- "wasmparser-nostd",
+ "wasmi",
 ]
 
 [[package]]
 name = "pallet-contracts-primitives"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bitflags 1.3.2",
  "parity-scale-codec",
@@ -6980,7 +8145,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6990,7 +8155,7 @@ dependencies = [
 [[package]]
 name = "pallet-conviction-voting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -7004,10 +8169,28 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-core-fellowship"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7025,7 +8208,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -7042,13 +8225,13 @@ dependencies = [
  "sp-npos-elections",
  "sp-runtime",
  "sp-std",
- "strum",
+ "strum 0.24.1",
 ]
 
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -7056,12 +8239,13 @@ dependencies = [
  "parity-scale-codec",
  "sp-npos-elections",
  "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7073,14 +8257,16 @@ dependencies = [
  "sp-io",
  "sp-npos-elections",
  "sp-runtime",
+ "sp-staking",
  "sp-std",
 ]
 
 [[package]]
 name = "pallet-fast-unstake"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-support",
@@ -7097,7 +8283,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7120,7 +8306,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -7136,7 +8322,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7156,7 +8342,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7173,7 +8359,7 @@ dependencies = [
 [[package]]
 name = "pallet-insecure-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7187,7 +8373,24 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-message-queue"
+version = "7.0.0-dev"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7195,20 +8398,23 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
+ "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
+ "sp-weights",
 ]
 
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -7221,7 +8427,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7234,10 +8440,27 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-nft-fractionalization"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "pallet-assets",
+ "pallet-nfts",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-nfts"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -7255,9 +8478,8 @@ dependencies = [
 [[package]]
 name = "pallet-nfts-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "frame-support",
  "pallet-nfts",
  "parity-scale-codec",
  "sp-api",
@@ -7266,7 +8488,7 @@ dependencies = [
 [[package]]
 name = "pallet-nis"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7282,11 +8504,12 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-system",
  "log",
+ "pallet-balances",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -7294,12 +8517,13 @@ dependencies = [
  "sp-runtime",
  "sp-staking",
  "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -7319,7 +8543,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
@@ -7330,7 +8554,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7347,7 +8571,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -7371,7 +8595,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7388,7 +8612,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7403,7 +8627,7 @@ dependencies = [
 [[package]]
 name = "pallet-ranked-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7421,7 +8645,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7436,7 +8660,7 @@ dependencies = [
 [[package]]
 name = "pallet-referenda"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -7452,11 +8676,30 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-salary"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -7472,7 +8715,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7486,6 +8729,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
+ "sp-state-machine",
  "sp-std",
  "sp-trie",
 ]
@@ -7493,13 +8737,14 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "pallet-session",
  "pallet-staking",
+ "parity-scale-codec",
  "rand 0.8.5",
  "sp-runtime",
  "sp-session",
@@ -7509,13 +8754,17 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "rand_chacha 0.2.2",
  "scale-info",
+ "sp-arithmetic",
+ "sp-io",
  "sp-runtime",
  "sp-std",
 ]
@@ -7523,7 +8772,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -7546,7 +8795,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
@@ -7557,7 +8806,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -7566,7 +8815,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7575,7 +8824,7 @@ dependencies = [
 [[package]]
 name = "pallet-state-trie-migration"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7592,8 +8841,9 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
@@ -7606,7 +8856,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7618,13 +8868,14 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
+ "sp-storage",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7643,7 +8894,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/pendulum-chain/patch-pallet-vesting-transaction-storage?branch=polkadot-v0.9.42#a62c0b5c1b4ca087ca2a7b201e386b88efd5d7ce"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7659,7 +8910,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -7675,7 +8926,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -7687,7 +8938,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7704,7 +8955,7 @@ dependencies = [
 [[package]]
 name = "pallet-uniques"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7719,7 +8970,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7735,7 +8986,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/pendulum-chain/patch-pallet-vesting-transaction-storage?branch=polkadot-v0.9.42#a62c0b5c1b4ca087ca2a7b201e386b88efd5d7ce"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7750,7 +9001,7 @@ dependencies = [
 [[package]]
 name = "pallet-whitelist"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7764,8 +9015,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
@@ -7779,14 +9030,14 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-executor",
 ]
 
 [[package]]
 name = "pallet-xcm-benchmarks"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7797,21 +9048,23 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
 name = "parachain-info"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
  "scale-info",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -7831,7 +9084,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "serde_derive",
  "sp-api",
+ "sp-arithmetic",
  "sp-consensus-aura",
  "sp-core",
  "sp-io",
@@ -7843,28 +9098,37 @@ dependencies = [
 [[package]]
 name = "parachains-common"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "cumulus-primitives-core",
  "cumulus-primitives-utility",
  "frame-support",
  "frame-system",
+ "kusama-runtime-constants",
+ "log",
+ "num-traits",
  "pallet-asset-tx-payment",
  "pallet-assets",
  "pallet-authorship",
  "pallet-balances",
  "pallet-collator-selection",
  "parity-scale-codec",
+ "polkadot-core-primitives",
  "polkadot-primitives",
+ "polkadot-runtime-constants",
+ "rococo-runtime-constants",
  "scale-info",
+ "smallvec",
  "sp-consensus-aura",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "westend-runtime-constants",
 ]
 
 [[package]]
@@ -7916,10 +9180,39 @@ dependencies = [
 ]
 
 [[package]]
-name = "parity-send-wrapper"
+name = "parity-send-wrapper"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
+
+[[package]]
+name = "parity-util-mem"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8"
+dependencies = [
+ "cfg-if",
+ "ethereum-types",
+ "hashbrown 0.12.3",
+ "impl-trait-for-tuples",
+ "lru 0.8.1",
+ "parity-util-mem-derive",
+ "parking_lot 0.12.2",
+ "primitive-types",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parity-util-mem-derive"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
+checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
+dependencies = [
+ "proc-macro2",
+ "syn 1.0.109",
+ "synstructure",
+]
 
 [[package]]
 name = "parity-wasm"
@@ -7981,6 +9274,12 @@ dependencies = [
  "windows-targets 0.52.5",
 ]
 
+[[package]]
+name = "partial_sort"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156"
+
 [[package]]
 name = "paste"
 version = "1.0.15"
@@ -8005,6 +9304,15 @@ dependencies = [
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest 0.10.7",
+]
+
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -8020,26 +9328,19 @@ dependencies = [
  "base64 0.13.1",
 ]
 
-[[package]]
-name = "pem-rfc7468"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac"
-dependencies = [
- "base64ct",
-]
-
 [[package]]
 name = "pendulum-node"
 version = "0.1.0"
 dependencies = [
  "amplitude-runtime",
- "bifrost-farming-rpc-api",
+ "bifrost-farming-rpc",
  "bifrost-farming-rpc-runtime-api",
  "clap",
  "cumulus-client-cli",
+ "cumulus-client-collator",
  "cumulus-client-consensus-aura",
  "cumulus-client-consensus-common",
+ "cumulus-client-consensus-proposer",
  "cumulus-client-network",
  "cumulus-client-service",
  "cumulus-primitives-core",
@@ -8051,6 +9352,7 @@ dependencies = [
  "foucoco-runtime",
  "frame-benchmarking",
  "frame-benchmarking-cli",
+ "futures",
  "jsonrpsee",
  "log",
  "module-issue-rpc",
@@ -8077,6 +9379,7 @@ dependencies = [
  "sc-executor",
  "sc-network",
  "sc-network-sync",
+ "sc-offchain",
  "sc-rpc",
  "sc-service",
  "sc-sysinfo",
@@ -8099,11 +9402,11 @@ dependencies = [
  "sp-timestamp",
  "sp-transaction-pool",
  "spacewalk-primitives",
+ "staging-xcm",
  "substrate-build-script-utils",
  "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
  "try-runtime-cli",
- "xcm",
  "zenlink-protocol",
  "zenlink-protocol-rpc",
  "zenlink-protocol-runtime-api",
@@ -8151,7 +9454,7 @@ dependencies = [
  "orml-asset-registry",
  "orml-currencies",
  "orml-currencies-allowance-extension",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "orml-xcm-support",
  "orml-xtokens",
@@ -8182,7 +9485,7 @@ dependencies = [
  "parachain-staking",
  "parity-scale-codec",
  "paste",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "pooled-rewards",
  "price-chain-extension",
@@ -8204,9 +9507,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
  "spacewalk-primitives",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "staking",
  "stellar-relay",
  "substrate-wasm-builder",
@@ -8214,13 +9521,69 @@ dependencies = [
  "treasury-buyout-extension",
  "vault-registry",
  "vesting-manager",
- "xcm",
- "xcm-builder",
- "xcm-executor",
  "zenlink-protocol",
  "zenlink-protocol-runtime-api",
 ]
 
+[[package]]
+name = "penpal-runtime"
+version = "0.9.27"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-session-benchmarking",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-utility",
+ "frame-benchmarking",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "log",
+ "pallet-asset-tx-payment",
+ "pallet-assets",
+ "pallet-aura",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-collator-selection",
+ "pallet-session",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-xcm",
+ "parachain-info",
+ "parachains-common",
+ "parity-scale-codec",
+ "polkadot-parachain-primitives",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "scale-info",
+ "smallvec",
+ "sp-api",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-storage",
+ "sp-transaction-pool",
+ "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "substrate-wasm-builder",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -8321,13 +9684,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
-name = "pkcs8"
-version = "0.9.0"
+name = "piper"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
 dependencies = [
- "der 0.6.1",
- "spki 0.6.0",
+ "atomic-waker",
+ "fastrand 2.1.0",
+ "futures-io",
 ]
 
 [[package]]
@@ -8336,8 +9700,8 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
- "der 0.7.9",
- "spki 0.7.3",
+ "der",
+ "spki",
 ]
 
 [[package]]
@@ -8346,12 +9710,6 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
-[[package]]
-name = "platforms"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
-
 [[package]]
 name = "platforms"
 version = "3.4.0"
@@ -8360,15 +9718,17 @@ checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
 
 [[package]]
 name = "polkadot-approval-distribution"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
+ "futures-timer",
  "polkadot-node-jaeger",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
+ "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "rand 0.8.5",
  "tracing-gum",
@@ -8376,10 +9736,12 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "always-assert",
  "futures",
+ "futures-timer",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -8390,13 +9752,12 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-distribution"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "derive_more",
  "fatality",
  "futures",
- "lru 0.9.0",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -8405,6 +9766,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "rand 0.8.5",
+ "schnellru",
  "sp-core",
  "sp-keystore",
  "thiserror",
@@ -8413,12 +9775,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-recovery"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "fatality",
  "futures",
- "lru 0.9.0",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -8428,21 +9789,20 @@ dependencies = [
  "polkadot-primitives",
  "rand 0.8.5",
  "sc-network",
+ "schnellru",
  "thiserror",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-cli"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "clap",
  "frame-benchmarking-cli",
  "futures",
  "log",
- "polkadot-client",
- "polkadot-node-core-pvf-worker",
  "polkadot-node-metrics",
  "polkadot-performance-test",
  "polkadot-service",
@@ -8461,54 +9821,11 @@ dependencies = [
  "try-runtime-cli",
 ]
 
-[[package]]
-name = "polkadot-client"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
-dependencies = [
- "async-trait",
- "frame-benchmarking",
- "frame-benchmarking-cli",
- "frame-system",
- "frame-system-rpc-runtime-api",
- "futures",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "polkadot-core-primitives",
- "polkadot-node-core-parachains-inherent",
- "polkadot-primitives",
- "polkadot-runtime",
- "polkadot-runtime-common",
- "sc-client-api",
- "sc-consensus",
- "sc-executor",
- "sc-service",
- "sp-api",
- "sp-authority-discovery",
- "sp-block-builder",
- "sp-blockchain",
- "sp-consensus",
- "sp-consensus-babe",
- "sp-consensus-beefy",
- "sp-consensus-grandpa",
- "sp-core",
- "sp-inherents",
- "sp-keyring",
- "sp-mmr-primitives",
- "sp-offchain",
- "sp-runtime",
- "sp-session",
- "sp-storage",
- "sp-timestamp",
- "sp-transaction-pool",
-]
-
 [[package]]
 name = "polkadot-collator-protocol"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "always-assert",
  "bitvec",
  "fatality",
  "futures",
@@ -8522,13 +9839,14 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "thiserror",
+ "tokio-util",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8539,15 +9857,14 @@ dependencies = [
 
 [[package]]
 name = "polkadot-dispute-distribution"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "derive_more",
  "fatality",
  "futures",
  "futures-timer",
  "indexmap 1.9.3",
- "lru 0.9.0",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -8556,6 +9873,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sc-network",
+ "schnellru",
  "sp-application-crypto",
  "sp-keystore",
  "thiserror",
@@ -8564,8 +9882,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -8578,8 +9896,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-gossip-support"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "futures-timer",
@@ -8590,6 +9908,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "sc-network",
+ "sc-network-common",
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
@@ -8598,8 +9917,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-network-bridge"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "always-assert",
  "async-trait",
@@ -8621,8 +9940,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-collation-generation"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -8639,15 +9958,14 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-approval-voting"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bitvec",
  "derive_more",
  "futures",
  "futures-timer",
  "kvdb",
- "lru 0.9.0",
  "merlin 2.0.1",
  "parity-scale-codec",
  "polkadot-node-jaeger",
@@ -8657,6 +9975,7 @@ dependencies = [
  "polkadot-overseer",
  "polkadot-primitives",
  "sc-keystore",
+ "schnellru",
  "schnorrkel 0.9.1",
  "sp-application-crypto",
  "sp-consensus",
@@ -8668,8 +9987,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-av-store"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bitvec",
  "futures",
@@ -8677,6 +9996,7 @@ dependencies = [
  "kvdb",
  "parity-scale-codec",
  "polkadot-erasure-coding",
+ "polkadot-node-jaeger",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -8689,8 +10009,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-backing"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bitvec",
  "fatality",
@@ -8708,8 +10028,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "polkadot-node-subsystem",
@@ -8723,8 +10043,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-candidate-validation"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "futures",
@@ -8735,7 +10055,8 @@ dependencies = [
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
- "polkadot-parachain",
+ "polkadot-overseer",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "sp-maybe-compressed-blob",
  "tracing-gum",
@@ -8743,8 +10064,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-api"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "polkadot-node-metrics",
@@ -8758,8 +10079,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-selection"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "futures-timer",
@@ -8775,27 +10096,27 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "fatality",
  "futures",
  "kvdb",
- "lru 0.9.0",
  "parity-scale-codec",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sc-keystore",
+ "schnellru",
  "thiserror",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "futures",
@@ -8809,10 +10130,27 @@ dependencies = [
  "tracing-gum",
 ]
 
+[[package]]
+name = "polkadot-node-core-prospective-parachains"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bitvec",
+ "fatality",
+ "futures",
+ "parity-scale-codec",
+ "polkadot-node-primitives",
+ "polkadot-node-subsystem",
+ "polkadot-node-subsystem-util",
+ "polkadot-primitives",
+ "thiserror",
+ "tracing-gum",
+]
+
 [[package]]
 name = "polkadot-node-core-provisioner"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bitvec",
  "fatality",
@@ -8822,15 +10160,14 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
  "thiserror",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-pvf"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "always-assert",
  "futures",
@@ -8839,25 +10176,26 @@ dependencies = [
  "parity-scale-codec",
  "pin-project",
  "polkadot-core-primitives",
+ "polkadot-node-core-pvf-common",
  "polkadot-node-metrics",
  "polkadot-node-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "rand 0.8.5",
  "slotmap",
  "sp-core",
  "sp-maybe-compressed-blob",
- "sp-tracing",
  "sp-wasm-interface",
  "substrate-build-script-utils",
+ "tempfile",
  "tokio",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-pvf-checker"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "polkadot-node-primitives",
@@ -8871,29 +10209,46 @@ dependencies = [
 ]
 
 [[package]]
-name = "polkadot-node-core-pvf-worker"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+name = "polkadot-node-core-pvf-common"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "assert_matches",
  "cpu-time",
  "futures",
+ "landlock",
  "libc",
  "parity-scale-codec",
- "polkadot-node-core-pvf",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
- "rayon",
  "sc-executor",
  "sc-executor-common",
  "sc-executor-wasmtime",
  "sp-core",
  "sp-externalities",
  "sp-io",
+ "sp-tracing",
+ "tokio",
+ "tracing-gum",
+]
+
+[[package]]
+name = "polkadot-node-core-pvf-prepare-worker"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "futures",
+ "libc",
+ "parity-scale-codec",
+ "polkadot-node-core-pvf-common",
+ "polkadot-parachain-primitives",
+ "polkadot-primitives",
+ "rayon",
+ "sc-executor",
+ "sc-executor-common",
+ "sc-executor-wasmtime",
+ "sp-io",
  "sp-maybe-compressed-blob",
  "sp-tracing",
- "substrate-build-script-utils",
- "tempfile",
  "tikv-jemalloc-ctl",
  "tokio",
  "tracing-gum",
@@ -8901,23 +10256,23 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-runtime-api"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
- "lru 0.9.0",
  "polkadot-node-metrics",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-types",
  "polkadot-primitives",
+ "schnellru",
  "sp-consensus-babe",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-jaeger"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "lazy_static",
  "log",
@@ -8934,10 +10289,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-metrics"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "bs58",
+ "bs58 0.5.1",
  "futures",
  "futures-timer",
  "log",
@@ -8953,10 +10308,12 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-network-protocol"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "async-channel 1.9.0",
  "async-trait",
+ "bitvec",
  "derive_more",
  "fatality",
  "futures",
@@ -8968,20 +10325,20 @@ dependencies = [
  "rand 0.8.5",
  "sc-authority-discovery",
  "sc-network",
- "strum",
+ "strum 0.24.1",
  "thiserror",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-primitives"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bounded-vec",
  "futures",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "schnorrkel 0.9.1",
  "serde",
@@ -8992,13 +10349,13 @@ dependencies = [
  "sp-maybe-compressed-blob",
  "sp-runtime",
  "thiserror",
- "zstd 0.11.2+zstd.1.5.2",
+ "zstd 0.12.4",
 ]
 
 [[package]]
 name = "polkadot-node-subsystem"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -9007,8 +10364,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-types"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9020,6 +10377,7 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-statement-table",
  "sc-network",
+ "sc-transaction-pool-api",
  "smallvec",
  "sp-api",
  "sp-authority-discovery",
@@ -9030,8 +10388,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-util"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9040,7 +10398,6 @@ dependencies = [
  "futures-channel",
  "itertools 0.10.5",
  "kvdb",
- "lru 0.9.0",
  "parity-db",
  "parity-scale-codec",
  "parking_lot 0.11.2",
@@ -9054,6 +10411,7 @@ dependencies = [
  "polkadot-primitives",
  "prioritized-metered-channel",
  "rand 0.8.5",
+ "schnellru",
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
@@ -9063,13 +10421,12 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "lru 0.9.0",
  "orchestra",
  "parking_lot 0.12.2",
  "polkadot-node-metrics",
@@ -9078,6 +10435,7 @@ dependencies = [
  "polkadot-node-subsystem-types",
  "polkadot-primitives",
  "sc-client-api",
+ "schnellru",
  "sp-api",
  "sp-core",
  "tikv-jemalloc-ctl",
@@ -9085,9 +10443,9 @@ dependencies = [
 ]
 
 [[package]]
-name = "polkadot-parachain"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+name = "polkadot-parachain-primitives"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bounded-collections",
  "derive_more",
@@ -9103,32 +10461,32 @@ dependencies = [
 
 [[package]]
 name = "polkadot-performance-test"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "env_logger 0.9.3",
- "kusama-runtime",
  "log",
  "polkadot-erasure-coding",
- "polkadot-node-core-pvf-worker",
+ "polkadot-node-core-pvf-prepare-worker",
  "polkadot-node-primitives",
  "polkadot-primitives",
  "quote",
  "sc-executor-common",
  "sp-maybe-compressed-blob",
+ "staging-kusama-runtime",
  "thiserror",
 ]
 
 [[package]]
 name = "polkadot-primitives"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bitvec",
  "hex-literal 0.4.1",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "scale-info",
  "serde",
  "sp-api",
@@ -9147,8 +10505,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-rpc"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "jsonrpsee",
  "mmr-rpc",
@@ -9179,8 +10537,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -9212,6 +10570,7 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-nomination-pools",
  "pallet-nomination-pools-benchmarking",
@@ -9236,6 +10595,7 @@ dependencies = [
  "pallet-vesting",
  "pallet-whitelist",
  "pallet-xcm",
+ "pallet-xcm-benchmarks",
  "parity-scale-codec",
  "polkadot-primitives",
  "polkadot-runtime-common",
@@ -9262,19 +10622,20 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "static_assertions",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -9313,14 +10674,14 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "staging-xcm",
  "static_assertions",
- "xcm",
 ]
 
 [[package]]
 name = "polkadot-runtime-constants"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -9333,10 +10694,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-metrics"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "bs58",
+ "bs58 0.5.1",
+ "frame-benchmarking",
  "parity-scale-codec",
  "polkadot-primitives",
  "sp-std",
@@ -9345,8 +10707,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bitflags 1.3.2",
  "bitvec",
@@ -9354,17 +10716,19 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "impl-trait-for-tuples",
  "log",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
  "pallet-balances",
+ "pallet-message-queue",
  "pallet-session",
  "pallet-staking",
  "pallet-timestamp",
  "pallet-vesting",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-metrics",
  "rand 0.8.5",
@@ -9382,39 +10746,42 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "staging-xcm",
+ "staging-xcm-executor",
  "static_assertions",
- "xcm",
- "xcm-executor",
 ]
 
 [[package]]
 name = "polkadot-service"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
+ "frame-benchmarking",
  "frame-benchmarking-cli",
  "frame-support",
+ "frame-system",
  "frame-system-rpc-runtime-api",
  "futures",
  "hex-literal 0.4.1",
- "kusama-runtime",
+ "is_executable",
  "kvdb",
  "kvdb-rocksdb",
  "log",
- "lru 0.9.0",
  "mmr-gadget",
  "pallet-babe",
  "pallet-im-online",
  "pallet-staking",
+ "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-db",
+ "parity-scale-codec",
  "polkadot-approval-distribution",
  "polkadot-availability-bitfield-distribution",
  "polkadot-availability-distribution",
  "polkadot-availability-recovery",
- "polkadot-client",
  "polkadot-collator-protocol",
+ "polkadot-core-primitives",
  "polkadot-dispute-distribution",
  "polkadot-gossip-support",
  "polkadot-network-bridge",
@@ -9428,7 +10795,9 @@ dependencies = [
  "polkadot-node-core-chain-selection",
  "polkadot-node-core-dispute-coordinator",
  "polkadot-node-core-parachains-inherent",
+ "polkadot-node-core-prospective-parachains",
  "polkadot-node-core-provisioner",
+ "polkadot-node-core-pvf",
  "polkadot-node-core-pvf-checker",
  "polkadot-node-core-runtime-api",
  "polkadot-node-network-protocol",
@@ -9437,11 +10806,11 @@ dependencies = [
  "polkadot-node-subsystem-types",
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-rpc",
  "polkadot-runtime",
- "polkadot-runtime-constants",
+ "polkadot-runtime-common",
  "polkadot-runtime-parachains",
  "polkadot-statement-distribution",
  "rococo-runtime",
@@ -9467,6 +10836,8 @@ dependencies = [
  "sc-sysinfo",
  "sc-telemetry",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
+ "schnellru",
  "serde",
  "serde_json",
  "sp-api",
@@ -9480,6 +10851,7 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-io",
+ "sp-keyring",
  "sp-keystore",
  "sp-mmr-primitives",
  "sp-offchain",
@@ -9489,7 +10861,9 @@ dependencies = [
  "sp-storage",
  "sp-timestamp",
  "sp-transaction-pool",
- "sp-trie",
+ "sp-version",
+ "sp-weights",
+ "staging-kusama-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
  "tracing-gum",
@@ -9498,17 +10872,20 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-distribution"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "arrayvec 0.5.2",
+ "arrayvec 0.7.4",
+ "bitvec",
  "fatality",
  "futures",
+ "futures-timer",
  "indexmap 1.9.3",
  "parity-scale-codec",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
+ "polkadot-node-subsystem-types",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sp-keystore",
@@ -9519,14 +10896,30 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
  "sp-core",
 ]
 
+[[package]]
+name = "polling"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "concurrent-queue",
+ "libc",
+ "log",
+ "pin-project-lite 0.2.14",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "polling"
 version = "3.7.0"
@@ -9550,19 +10943,7 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
 dependencies = [
  "cpufeatures",
  "opaque-debug 0.3.1",
- "universal-hash 0.5.1",
-]
-
-[[package]]
-name = "polyval"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "opaque-debug 0.3.1",
- "universal-hash 0.4.1",
+ "universal-hash",
 ]
 
 [[package]]
@@ -9574,13 +10955,13 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "opaque-debug 0.3.1",
- "universal-hash 0.5.1",
+ "universal-hash",
 ]
 
 [[package]]
 name = "pooled-rewards"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9665,6 +11046,16 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.65",
+]
+
 [[package]]
 name = "price-chain-extension"
 version = "0.1.0"
@@ -9675,13 +11066,15 @@ dependencies = [
  "frame-system",
  "log",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-contracts",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-runtime",
+ "sp-tracing",
+ "sp-weights",
  "spacewalk-primitives",
  "vesting-manager",
 ]
@@ -9694,6 +11087,8 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
  "fixed-hash 0.8.0",
  "impl-codec",
+ "impl-num-traits",
+ "impl-rlp",
  "impl-serde",
  "scale-info",
  "uint",
@@ -9760,9 +11155,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-warning"
-version = "0.3.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4"
+checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9794,25 +11189,25 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.18.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c"
+checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e"
 dependencies = [
  "dtoa",
  "itoa",
  "parking_lot 0.12.2",
- "prometheus-client-derive-text-encode",
+ "prometheus-client-derive-encode",
 ]
 
 [[package]]
-name = "prometheus-client-derive-text-encode"
-version = "0.3.0"
+name = "prometheus-client-derive-encode"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd"
+checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -9838,7 +11233,7 @@ dependencies = [
  "log",
  "multimap",
  "petgraph",
- "prettyplease",
+ "prettyplease 0.1.11",
  "prost",
  "prost-types",
  "regex",
@@ -9847,19 +11242,6 @@ dependencies = [
  "which",
 ]
 
-[[package]]
-name = "prost-codec"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "prost",
- "thiserror",
- "unsigned-varint",
-]
-
 [[package]]
 name = "prost-derive"
 version = "0.11.9"
@@ -9906,6 +11288,19 @@ dependencies = [
  "byteorder",
 ]
 
+[[package]]
+name = "quick-protobuf-codec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1693116345026436eb2f10b677806169c1a1260c1c60eaaffe3fb5a29ae23d8b"
+dependencies = [
+ "asynchronous-codec",
+ "bytes",
+ "quick-protobuf",
+ "thiserror",
+ "unsigned-varint",
+]
+
 [[package]]
 name = "quicksink"
 version = "0.1.2"
@@ -9932,7 +11327,7 @@ dependencies = [
  "thiserror",
  "tinyvec",
  "tracing",
- "webpki 0.22.4",
+ "webpki",
 ]
 
 [[package]]
@@ -10056,19 +11451,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "rcgen"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
-dependencies = [
- "pem",
- "ring 0.16.20",
- "time",
- "x509-parser 0.13.2",
- "yasna",
-]
-
 [[package]]
 name = "rcgen"
 version = "0.10.0"
@@ -10083,8 +11465,8 @@ dependencies = [
 
 [[package]]
 name = "redeem"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "currency",
  "fee",
@@ -10092,9 +11474,10 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex",
+ "log",
  "oracle",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "pallet-timestamp",
@@ -10186,9 +11569,9 @@ dependencies = [
 
 [[package]]
 name = "regalloc2"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c"
+checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621"
 dependencies = [
  "fxhash",
  "log",
@@ -10240,22 +11623,10 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
-[[package]]
-name = "region"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b6ebd13bc009aef9cd476c1310d49ac354d36e240cf1bd753290f3dc7199a7"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "mach2",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "replace"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "currency",
  "fee",
@@ -10263,10 +11634,11 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex",
+ "log",
  "nomination",
  "oracle",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "pallet-timestamp",
@@ -10298,8 +11670,8 @@ dependencies = [
 
 [[package]]
 name = "reward"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -10317,8 +11689,8 @@ dependencies = [
 
 [[package]]
 name = "reward-distribution"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "currency",
  "frame-benchmarking",
@@ -10327,7 +11699,7 @@ dependencies = [
  "log",
  "oracle",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "parity-scale-codec",
@@ -10346,23 +11718,28 @@ dependencies = [
 
 [[package]]
 name = "rfc6979"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
- "crypto-bigint 0.4.9",
  "hmac 0.12.1",
- "zeroize",
+ "subtle",
 ]
 
 [[package]]
-name = "rfc6979"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+name = "ring"
+version = "0.1.0"
+source = "git+https://github.com/burdges/ring-proof?branch=patch-1#05a756076cb20f981a52afea3a620168de49f95f"
 dependencies = [
- "hmac 0.12.1",
- "subtle",
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "blake2",
+ "common",
+ "fflonk",
+ "merlin 3.0.0",
 ]
 
 [[package]]
@@ -10395,11 +11772,21 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rlp"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
+dependencies = [
+ "bytes",
+ "rustc-hex",
+]
+
 [[package]]
 name = "rocksdb"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99"
+checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -10407,12 +11794,13 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "binary-merkle-tree",
  "frame-benchmarking",
  "frame-executive",
+ "frame-metadata-hash-extension",
  "frame-support",
  "frame-system",
  "frame-system-benchmarking",
@@ -10436,6 +11824,7 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-message-queue",
  "pallet-mmr",
  "pallet-multisig",
  "pallet-nis",
@@ -10459,7 +11848,7 @@ dependencies = [
  "pallet-xcm",
  "pallet-xcm-benchmarks",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-common",
  "polkadot-runtime-parachains",
@@ -10482,19 +11871,20 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "static_assertions",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
 name = "rococo-runtime-constants"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -10516,17 +11906,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "rtcp"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691"
-dependencies = [
- "bytes",
- "thiserror",
- "webrtc-util",
-]
-
 [[package]]
 name = "rtnetlink"
 version = "0.10.1"
@@ -10552,20 +11931,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "rtp"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80"
-dependencies = [
- "async-trait",
- "bytes",
- "rand 0.8.5",
- "serde",
- "thiserror",
- "webrtc-util",
-]
-
 [[package]]
 name = "runtime-common"
 version = "0.1.0"
@@ -10586,9 +11951,9 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "spacewalk-primitives",
+ "staging-xcm",
+ "staging-xcm-executor",
  "treasury-buyout-extension",
- "xcm",
- "xcm-executor",
  "zenlink-protocol",
 ]
 
@@ -10597,49 +11962,61 @@ name = "runtime-integration-tests"
 version = "0.1.0"
 dependencies = [
  "amplitude-runtime",
+ "asset-hub-kusama-runtime",
+ "asset-hub-polkadot-runtime",
+ "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcm",
  "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
  "cumulus-primitives-utility",
  "frame-support",
  "frame-system",
- "kusama-runtime",
+ "integration-tests-common",
  "orml-asset-registry",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "orml-xcm",
  "orml-xcm-support",
  "orml-xtokens",
  "pallet-assets",
+ "pallet-aura",
+ "pallet-authorship",
  "pallet-balances",
+ "pallet-message-queue",
+ "pallet-session",
+ "pallet-staking",
+ "pallet-timestamp",
+ "pallet-treasury",
  "pallet-xcm",
  "parachain-info",
+ "parachain-staking",
  "parity-scale-codec",
  "paste",
  "pendulum-runtime",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime",
  "polkadot-runtime-common",
+ "polkadot-runtime-constants",
  "polkadot-runtime-parachains",
  "runtime-common",
  "scale-info",
  "serde",
  "sp-core",
- "sp-debug-derive",
  "sp-io",
  "sp-runtime",
  "sp-std",
  "sp-tracing",
  "spacewalk-primitives",
- "statemine-runtime",
- "statemint-runtime",
- "xcm",
- "xcm-builder",
+ "staging-kusama-runtime",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "xcm-emulator",
- "xcm-executor",
+ "xcm-simulator",
 ]
 
 [[package]]
@@ -10703,28 +12080,29 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.37.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 1.3.2",
  "errno",
+ "io-lifetimes",
  "libc",
- "linux-raw-sys 0.4.14",
- "windows-sys 0.52.0",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
-name = "rustls"
-version = "0.19.1"
+name = "rustix"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "base64 0.13.1",
- "log",
- "ring 0.16.20",
- "sct 0.6.1",
- "webpki 0.21.4",
+ "bitflags 2.5.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.14",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -10735,8 +12113,8 @@ checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
 dependencies = [
  "log",
  "ring 0.16.20",
- "sct 0.7.1",
- "webpki 0.22.4",
+ "sct",
+ "webpki",
 ]
 
 [[package]]
@@ -10748,7 +12126,7 @@ dependencies = [
  "log",
  "ring 0.17.8",
  "rustls-webpki",
- "sct 0.7.1",
+ "sct",
 ]
 
 [[package]]
@@ -10788,6 +12166,17 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
+[[package]]
+name = "ruzstd"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
+dependencies = [
+ "byteorder",
+ "thiserror-core",
+ "twox-hash",
+]
+
 [[package]]
 name = "rw-stream-sink"
 version = "0.3.0"
@@ -10835,7 +12224,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "log",
  "sp-core",
@@ -10846,7 +12235,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "futures",
@@ -10854,13 +12243,13 @@ dependencies = [
  "ip_network",
  "libp2p",
  "log",
+ "multihash",
  "parity-scale-codec",
  "prost",
  "prost-build",
  "rand 0.8.5",
  "sc-client-api",
  "sc-network",
- "sc-network-common",
  "sp-api",
  "sp-authority-discovery",
  "sp-blockchain",
@@ -10874,7 +12263,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "futures-timer",
@@ -10897,7 +12286,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -10912,7 +12301,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "memmap2",
  "sc-chain-spec-derive",
@@ -10931,7 +12320,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
@@ -10942,14 +12331,14 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "chrono",
  "clap",
  "fdlimit",
  "futures",
- "libp2p",
+ "libp2p-identity",
  "log",
  "names",
  "parity-scale-codec",
@@ -10960,7 +12349,6 @@ dependencies = [
  "sc-client-db",
  "sc-keystore",
  "sc-network",
- "sc-network-common",
  "sc-service",
  "sc-telemetry",
  "sc-tracing",
@@ -10982,7 +12370,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "fnv",
  "futures",
@@ -10998,9 +12386,9 @@ dependencies = [
  "sp-core",
  "sp-database",
  "sp-externalities",
- "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
+ "sp-statement-store",
  "sp-storage",
  "substrate-prometheus-endpoint",
 ]
@@ -11008,7 +12396,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -11034,12 +12422,12 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "libp2p",
+ "libp2p-identity",
  "log",
  "mockall",
  "parking_lot 0.12.2",
@@ -11059,7 +12447,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "futures",
@@ -11088,7 +12476,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -11103,8 +12491,8 @@ dependencies = [
  "sc-consensus",
  "sc-consensus-epochs",
  "sc-consensus-slots",
- "sc-keystore",
  "sc-telemetry",
+ "sc-transaction-pool-api",
  "scale-info",
  "sp-api",
  "sp-application-crypto",
@@ -11124,7 +12512,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -11146,9 +12534,10 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
+ "async-channel 1.9.0",
  "async-trait",
  "fnv",
  "futures",
@@ -11157,9 +12546,7 @@ dependencies = [
  "parking_lot 0.12.2",
  "sc-client-api",
  "sc-consensus",
- "sc-keystore",
  "sc-network",
- "sc-network-common",
  "sc-network-gossip",
  "sc-network-sync",
  "sc-utils",
@@ -11181,7 +12568,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -11200,7 +12587,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -11213,10 +12600,10 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "ahash 0.8.11",
- "array-bytes 4.2.0",
+ "array-bytes",
  "async-trait",
  "dyn-clone",
  "finality-grandpa",
@@ -11235,6 +12622,7 @@ dependencies = [
  "sc-network-common",
  "sc-network-gossip",
  "sc-telemetry",
+ "sc-transaction-pool-api",
  "sc-utils",
  "serde_json",
  "sp-api",
@@ -11253,7 +12641,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "finality-grandpa",
  "futures",
@@ -11273,11 +12661,12 @@ dependencies = [
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "assert_matches",
  "async-trait",
  "futures",
+ "futures-timer",
  "jsonrpsee",
  "log",
  "parity-scale-codec",
@@ -11307,7 +12696,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "futures",
@@ -11330,14 +12719,13 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "lru 0.8.1",
  "parity-scale-codec",
  "parking_lot 0.12.2",
  "sc-executor-common",
- "sc-executor-wasmi",
  "sc-executor-wasmtime",
+ "schnellru",
  "sp-api",
  "sp-core",
  "sp-externalities",
@@ -11348,45 +12736,29 @@ dependencies = [
  "sp-version",
  "sp-wasm-interface",
  "tracing",
- "wasmi 0.13.2",
 ]
 
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
  "sp-wasm-interface",
  "thiserror",
  "wasm-instrument 0.3.0",
- "wasmi 0.13.2",
-]
-
-[[package]]
-name = "sc-executor-wasmi"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
-dependencies = [
- "log",
- "sc-allocator",
- "sc-executor-common",
- "sp-runtime-interface",
- "sp-wasm-interface",
- "wasmi 0.13.2",
 ]
 
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "anyhow",
  "cfg-if",
  "libc",
  "log",
- "once_cell",
  "rustix 0.36.17",
  "sc-allocator",
  "sc-executor-common",
@@ -11398,7 +12770,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "ansi_term",
  "futures",
@@ -11414,10 +12786,9 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
- "async-trait",
+ "array-bytes",
  "parking_lot 0.12.2",
  "serde_json",
  "sp-application-crypto",
@@ -11429,10 +12800,10 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
- "async-channel",
+ "array-bytes",
+ "async-channel 1.9.0",
  "async-trait",
  "asynchronous-codec",
  "bytes",
@@ -11444,47 +12815,43 @@ dependencies = [
  "libp2p",
  "linked_hash_set",
  "log",
- "lru 0.8.1",
  "mockall",
  "parity-scale-codec",
  "parking_lot 0.12.2",
+ "partial_sort",
  "pin-project",
  "rand 0.8.5",
- "sc-block-builder",
  "sc-client-api",
- "sc-consensus",
  "sc-network-common",
- "sc-peerset",
  "sc-utils",
  "serde",
  "serde_json",
  "smallvec",
- "snow",
  "sp-arithmetic",
  "sp-blockchain",
- "sp-consensus",
  "sp-core",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
  "unsigned-varint",
+ "wasm-timer",
  "zeroize",
 ]
 
 [[package]]
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "async-channel 1.9.0",
  "cid",
  "futures",
- "libp2p",
+ "libp2p-identity",
  "log",
  "prost",
  "prost-build",
  "sc-client-api",
  "sc-network",
- "sc-network-common",
  "sp-blockchain",
  "sp-runtime",
  "thiserror",
@@ -11494,45 +12861,33 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
  "async-trait",
  "bitflags 1.3.2",
- "bytes",
  "futures",
- "futures-timer",
- "libp2p",
+ "libp2p-identity",
  "parity-scale-codec",
  "prost-build",
  "sc-consensus",
- "sc-peerset",
- "sc-utils",
- "serde",
- "smallvec",
- "sp-blockchain",
  "sp-consensus",
  "sp-consensus-grandpa",
  "sp-runtime",
- "substrate-prometheus-endpoint",
- "thiserror",
- "zeroize",
 ]
 
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "ahash 0.8.11",
  "futures",
  "futures-timer",
  "libp2p",
  "log",
- "lru 0.8.1",
  "sc-network",
  "sc-network-common",
- "sc-peerset",
+ "schnellru",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "tracing",
@@ -11541,19 +12896,18 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
+ "async-channel 1.9.0",
  "futures",
- "libp2p",
+ "libp2p-identity",
  "log",
  "parity-scale-codec",
  "prost",
  "prost-build",
  "sc-client-api",
  "sc-network",
- "sc-network-common",
- "sc-peerset",
  "sp-blockchain",
  "sp-core",
  "sp-runtime",
@@ -11563,16 +12917,16 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
+ "async-channel 1.9.0",
  "async-trait",
  "fork-tree",
  "futures",
  "futures-timer",
  "libp2p",
  "log",
- "lru 0.8.1",
  "mockall",
  "parity-scale-codec",
  "prost",
@@ -11581,8 +12935,8 @@ dependencies = [
  "sc-consensus",
  "sc-network",
  "sc-network-common",
- "sc-peerset",
  "sc-utils",
+ "schnellru",
  "smallvec",
  "sp-arithmetic",
  "sp-blockchain",
@@ -11597,17 +12951,15 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "futures",
  "libp2p",
  "log",
  "parity-scale-codec",
- "pin-project",
  "sc-network",
  "sc-network-common",
- "sc-peerset",
  "sc-utils",
  "sp-consensus",
  "sp-runtime",
@@ -11617,16 +12969,17 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "bytes",
  "fnv",
  "futures",
  "futures-timer",
  "hyper",
- "hyper-rustls 0.23.2",
+ "hyper-rustls",
  "libp2p",
+ "log",
  "num_cpus",
  "once_cell",
  "parity-scale-codec",
@@ -11635,33 +12988,22 @@ dependencies = [
  "sc-client-api",
  "sc-network",
  "sc-network-common",
- "sc-peerset",
+ "sc-transaction-pool-api",
  "sc-utils",
  "sp-api",
  "sp-core",
+ "sp-externalities",
+ "sp-keystore",
  "sp-offchain",
- "sp-runtime",
- "threadpool",
- "tracing",
-]
-
-[[package]]
-name = "sc-peerset"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
-dependencies = [
- "futures",
- "libp2p",
- "log",
- "sc-utils",
- "serde_json",
- "wasm-timer",
+ "sp-runtime",
+ "threadpool",
+ "tracing",
 ]
 
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -11670,7 +13012,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -11693,6 +13035,7 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-session",
+ "sp-statement-store",
  "sp-version",
  "tokio",
 ]
@@ -11700,7 +13043,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -11719,7 +13062,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "http",
  "jsonrpsee",
@@ -11734,9 +13077,9 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "futures",
  "futures-util",
  "hex",
@@ -11747,6 +13090,7 @@ dependencies = [
  "sc-chain-spec",
  "sc-client-api",
  "sc-transaction-pool-api",
+ "sc-utils",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -11754,13 +13098,14 @@ dependencies = [
  "sp-runtime",
  "sp-version",
  "thiserror",
+ "tokio",
  "tokio-stream",
 ]
 
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "directories",
@@ -11787,11 +13132,9 @@ dependencies = [
  "sc-network-light",
  "sc-network-sync",
  "sc-network-transactions",
- "sc-offchain",
  "sc-rpc",
  "sc-rpc-server",
  "sc-rpc-spec-v2",
- "sc-storage-monitor",
  "sc-sysinfo",
  "sc-telemetry",
  "sc-tracing",
@@ -11826,7 +13169,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -11837,14 +13180,12 @@ dependencies = [
 [[package]]
 name = "sc-storage-monitor"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "clap",
  "fs4",
- "futures",
  "log",
  "sc-client-db",
- "sc-utils",
  "sp-core",
  "thiserror",
  "tokio",
@@ -11853,7 +13194,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -11872,7 +13213,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "libc",
@@ -11891,7 +13232,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "chrono",
  "futures",
@@ -11910,7 +13251,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "ansi_term",
  "atty",
@@ -11918,12 +13259,10 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "once_cell",
  "parking_lot 0.12.2",
  "regex",
  "rustc-hash",
  "sc-client-api",
- "sc-rpc-server",
  "sc-tracing-proc-macro",
  "serde",
  "sp-api",
@@ -11941,7 +13280,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
@@ -11952,14 +13291,13 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
  "linked-hash-map",
  "log",
- "num-traits",
  "parity-scale-codec",
  "parking_lot 0.12.2",
  "sc-client-api",
@@ -11979,13 +13317,15 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "futures",
  "log",
+ "parity-scale-codec",
  "serde",
  "sp-blockchain",
+ "sp-core",
  "sp-runtime",
  "thiserror",
 ]
@@ -11993,9 +13333,9 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "futures",
  "futures-timer",
  "lazy_static",
@@ -12005,6 +13345,68 @@ dependencies = [
  "sp-arithmetic",
 ]
 
+[[package]]
+name = "scale-bits"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54"
+dependencies = [
+ "parity-scale-codec",
+ "scale-type-resolver",
+]
+
+[[package]]
+name = "scale-decode"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27"
+dependencies = [
+ "derive_more",
+ "parity-scale-codec",
+ "scale-bits",
+ "scale-decode-derive",
+ "scale-type-resolver",
+ "smallvec",
+]
+
+[[package]]
+name = "scale-decode-derive"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bb22f574168103cdd3133b19281639ca65ad985e24612728f727339dcaf4021"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "scale-encode"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ba0b9c48dc0eb20c60b083c29447c0c4617cb7c4a4c9fef72aa5c5bc539e15e"
+dependencies = [
+ "derive_more",
+ "parity-scale-codec",
+ "scale-encode-derive",
+ "scale-type-resolver",
+ "smallvec",
+]
+
+[[package]]
+name = "scale-encode-derive"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82ab7e60e2d9c8d47105f44527b26f04418e5e624ffc034f6b4a86c0ba19c5bf"
+dependencies = [
+ "darling",
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "scale-info"
 version = "2.11.3"
@@ -12031,6 +13433,15 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "scale-type-resolver"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.23"
@@ -12069,6 +13480,22 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "schnorrkel"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.4",
+ "curve25519-dalek-ng",
+ "merlin 3.0.0",
+ "rand_core 0.6.4",
+ "sha2 0.9.9",
+ "subtle-ng",
+ "zeroize",
+]
+
 [[package]]
 name = "schnorrkel"
 version = "0.11.4"
@@ -12098,16 +13525,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"
 
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
-
 [[package]]
 name = "sct"
 version = "0.7.1"
@@ -12118,42 +13535,16 @@ dependencies = [
  "untrusted 0.9.0",
 ]
 
-[[package]]
-name = "sdp"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13"
-dependencies = [
- "rand 0.8.5",
- "substring",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "sec1"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
-dependencies = [
- "base16ct 0.1.1",
- "der 0.6.1",
- "generic-array 0.14.7",
- "pkcs8 0.9.0",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "sec1"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
- "base16ct 0.2.0",
- "der 0.7.9",
+ "base16ct",
+ "der",
  "generic-array 0.14.7",
- "pkcs8 0.10.2",
+ "pkcs8",
  "subtle",
  "zeroize",
 ]
@@ -12187,8 +13578,8 @@ dependencies = [
 
 [[package]]
 name = "security"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -12316,17 +13707,6 @@ dependencies = [
  "opaque-debug 0.3.1",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.7",
-]
-
 [[package]]
 name = "sha2"
 version = "0.8.2"
@@ -12402,10 +13782,6 @@ name = "signature"
 version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-dependencies = [
- "digest 0.10.7",
- "rand_core 0.6.4",
-]
 
 [[package]]
 name = "signature"
@@ -12453,8 +13829,8 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
 
 [[package]]
 name = "slot-range-helper"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -12478,6 +13854,113 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[package]]
+name = "smol"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-executor",
+ "async-fs",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
+ "async-net",
+ "async-process",
+ "blocking",
+ "futures-lite 1.13.0",
+]
+
+[[package]]
+name = "smoldot"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5"
+dependencies = [
+ "arrayvec 0.7.4",
+ "async-lock 2.8.0",
+ "atomic-take",
+ "base64 0.21.7",
+ "bip39",
+ "blake2-rfc",
+ "bs58 0.5.1",
+ "chacha20",
+ "crossbeam-queue",
+ "derive_more",
+ "ed25519-zebra 4.0.3",
+ "either",
+ "event-listener 2.5.3",
+ "fnv",
+ "futures-lite 1.13.0",
+ "futures-util",
+ "hashbrown 0.14.5",
+ "hex",
+ "hmac 0.12.1",
+ "itertools 0.11.0",
+ "libsecp256k1",
+ "merlin 3.0.0",
+ "no-std-net",
+ "nom",
+ "num-bigint",
+ "num-rational",
+ "num-traits",
+ "pbkdf2 0.12.2",
+ "pin-project",
+ "poly1305",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "ruzstd",
+ "schnorrkel 0.10.2",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "sha3",
+ "siphasher",
+ "slab",
+ "smallvec",
+ "soketto",
+ "twox-hash",
+ "wasmi",
+ "x25519-dalek 2.0.1",
+ "zeroize",
+]
+
+[[package]]
+name = "smoldot-light"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "256b5bad1d6b49045e95fe87492ce73d5af81545d8b4d8318a872d2007024c33"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-lock 2.8.0",
+ "base64 0.21.7",
+ "blake2-rfc",
+ "derive_more",
+ "either",
+ "event-listener 2.5.3",
+ "fnv",
+ "futures-channel",
+ "futures-lite 1.13.0",
+ "futures-util",
+ "hashbrown 0.14.5",
+ "hex",
+ "itertools 0.11.0",
+ "log",
+ "lru 0.11.1",
+ "no-std-net",
+ "parking_lot 0.12.2",
+ "pin-project",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "serde",
+ "serde_json",
+ "siphasher",
+ "slab",
+ "smol",
+ "smoldot",
+ "zeroize",
+]
+
 [[package]]
 name = "snap"
 version = "1.1.1"
@@ -12490,7 +13973,7 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85"
 dependencies = [
- "aes-gcm 0.10.3",
+ "aes-gcm",
  "blake2",
  "chacha20poly1305",
  "curve25519-dalek 4.1.2",
@@ -12550,7 +14033,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "hash-db",
  "log",
@@ -12558,6 +14041,7 @@ dependencies = [
  "scale-info",
  "sp-api-proc-macro",
  "sp-core",
+ "sp-externalities",
  "sp-metadata-ir",
  "sp-runtime",
  "sp-state-machine",
@@ -12570,11 +14054,11 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "Inflector",
  "blake2",
- "expander 1.0.0",
+ "expander 2.1.0",
  "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
@@ -12583,8 +14067,8 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -12596,8 +14080,8 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "16.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -12611,7 +14095,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -12624,9 +14108,8 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "parity-scale-codec",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
@@ -12636,13 +14119,13 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "futures",
  "log",
- "lru 0.8.1",
  "parity-scale-codec",
  "parking_lot 0.12.2",
+ "schnellru",
  "sp-api",
  "sp-consensus",
  "sp-database",
@@ -12654,7 +14137,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "futures",
@@ -12669,14 +14152,13 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-application-crypto",
- "sp-consensus",
  "sp-consensus-slots",
  "sp-inherents",
  "sp-runtime",
@@ -12687,7 +14169,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -12695,11 +14177,9 @@ dependencies = [
  "serde",
  "sp-api",
  "sp-application-crypto",
- "sp-consensus",
  "sp-consensus-slots",
  "sp-core",
  "sp-inherents",
- "sp-keystore",
  "sp-runtime",
  "sp-std",
  "sp-timestamp",
@@ -12708,7 +14188,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "lazy_static",
  "parity-scale-codec",
@@ -12721,13 +14201,13 @@ dependencies = [
  "sp-mmr-primitives",
  "sp-runtime",
  "sp-std",
- "strum",
+ "strum 0.24.1",
 ]
 
 [[package]]
 name = "sp-consensus-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -12745,7 +14225,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -12756,16 +14236,18 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "21.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
+ "arrayvec 0.7.4",
+ "bandersnatch_vrfs",
  "bitflags 1.3.2",
  "blake2",
  "bounded-collections",
- "bs58",
+ "bs58 0.5.1",
  "dyn-clonable",
- "ed25519-zebra",
+ "ed25519-zebra 3.1.0",
  "futures",
  "hash-db",
  "hash256-std-hasher",
@@ -12795,29 +14277,28 @@ dependencies = [
  "substrate-bip39",
  "thiserror",
  "tiny-bip39",
+ "tracing",
  "zeroize",
 ]
 
 [[package]]
 name = "sp-core-hashing"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "9.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "blake2b_simd",
  "byteorder",
  "digest 0.10.7",
  "sha2 0.10.8",
  "sha3",
- "sp-std",
  "twox-hash",
 ]
 
 [[package]]
 name = "sp-core-hashing-proc-macro"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "9.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "proc-macro2",
  "quote",
  "sp-core-hashing",
  "syn 2.0.65",
@@ -12826,7 +14307,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.2",
@@ -12834,8 +14315,8 @@ dependencies = [
 
 [[package]]
 name = "sp-debug-derive"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12844,8 +14325,8 @@ dependencies = [
 
 [[package]]
 name = "sp-externalities"
-version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -12853,16 +14334,26 @@ dependencies = [
  "sp-storage",
 ]
 
+[[package]]
+name = "sp-genesis-builder"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "serde_json",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
- "sp-core",
  "sp-runtime",
  "sp-std",
  "thiserror",
@@ -12870,13 +14361,11 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bytes",
- "ed25519 1.5.3",
- "ed25519-dalek 1.0.1",
- "futures",
+ "ed25519-dalek 2.1.1",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
@@ -12896,24 +14385,22 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "lazy_static",
  "sp-core",
  "sp-runtime",
- "strum",
+ "strum 0.24.1",
 ]
 
 [[package]]
 name = "sp-keystore"
-version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "0.27.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "futures",
  "parity-scale-codec",
  "parking_lot 0.12.2",
- "serde",
  "sp-core",
  "sp-externalities",
  "thiserror",
@@ -12922,7 +14409,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -12931,7 +14418,7 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
@@ -12942,7 +14429,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -12960,7 +14447,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -12974,7 +14461,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -12983,8 +14470,8 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -12994,7 +14481,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -13003,8 +14490,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -13025,8 +14512,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -13043,8 +14530,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.3.1",
@@ -13056,12 +14543,13 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-core",
+ "sp-keystore",
  "sp-runtime",
  "sp-staking",
  "sp-std",
@@ -13070,8 +14558,9 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -13082,8 +14571,8 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "0.28.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "hash-db",
  "log",
@@ -13093,22 +14582,47 @@ dependencies = [
  "smallvec",
  "sp-core",
  "sp-externalities",
- "sp-panic-handler",
+ "sp-panic-handler",
+ "sp-std",
+ "sp-trie",
+ "thiserror",
+ "tracing",
+ "trie-db",
+]
+
+[[package]]
+name = "sp-statement-store"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "aes-gcm",
+ "curve25519-dalek 4.1.2",
+ "ed25519-dalek 2.1.1",
+ "hkdf",
+ "parity-scale-codec",
+ "rand 0.8.5",
+ "scale-info",
+ "sha2 0.10.8",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-externalities",
+ "sp-runtime",
+ "sp-runtime-interface",
  "sp-std",
- "sp-trie",
  "thiserror",
- "tracing",
+ "x25519-dalek 2.0.1",
 ]
 
 [[package]]
 name = "sp-std"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 
 [[package]]
 name = "sp-storage"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -13121,11 +14635,9 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
- "futures-timer",
- "log",
  "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
@@ -13135,8 +14647,8 @@ dependencies = [
 
 [[package]]
 name = "sp-tracing"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -13148,7 +14660,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -13157,10 +14669,9 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
- "log",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -13172,8 +14683,8 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "22.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "ahash 0.8.11",
  "hash-db",
@@ -13195,8 +14706,8 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "22.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -13212,8 +14723,8 @@ dependencies = [
 
 [[package]]
 name = "sp-version-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -13223,22 +14734,21 @@ dependencies = [
 
 [[package]]
 name = "sp-wasm-interface"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "sp-std",
- "wasmi 0.13.2",
  "wasmtime",
 ]
 
 [[package]]
 name = "sp-weights"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+version = "20.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13252,14 +14762,16 @@ dependencies = [
 
 [[package]]
 name = "spacewalk-primitives"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "base58",
  "bstringify",
  "frame-support",
  "hex",
  "parity-scale-codec",
+ "scale-decode",
+ "scale-encode",
  "scale-info",
  "serde",
  "sp-core",
@@ -13291,17 +14803,7 @@ checksum = "a0ef947f358b9c238923f764c72a4a9d42f2d637c46e059dbd319d6e7cfb4f82"
 dependencies = [
  "lazy_static",
  "maplit",
- "strum",
-]
-
-[[package]]
-name = "spki"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
-dependencies = [
- "base64ct",
- "der 0.6.1",
+ "strum 0.24.1",
 ]
 
 [[package]]
@@ -13311,7 +14813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
- "der 0.7.9",
+ "der",
 ]
 
 [[package]]
@@ -13336,152 +14838,189 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
-name = "staking"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+name = "staging-kusama-runtime"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "binary-merkle-tree",
+ "bitvec",
  "frame-benchmarking",
- "frame-support",
- "frame-system",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
- "orml-traits",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-arithmetic",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "spacewalk-primitives",
-]
-
-[[package]]
-name = "statemine-runtime"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
-dependencies = [
- "assets-common",
- "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-session-benchmarking",
- "cumulus-pallet-xcm",
- "cumulus-pallet-xcmp-queue",
- "cumulus-primitives-core",
- "cumulus-primitives-timestamp",
- "cumulus-primitives-utility",
+ "frame-election-provider-support",
  "frame-executive",
  "frame-support",
  "frame-system",
+ "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
  "hex-literal 0.4.1",
  "kusama-runtime-constants",
  "log",
- "pallet-asset-tx-payment",
- "pallet-assets",
- "pallet-aura",
+ "pallet-authority-discovery",
  "pallet-authorship",
+ "pallet-babe",
+ "pallet-bags-list",
  "pallet-balances",
- "pallet-collator-selection",
+ "pallet-beefy",
+ "pallet-beefy-mmr",
+ "pallet-bounties",
+ "pallet-child-bounties",
+ "pallet-collective",
+ "pallet-conviction-voting",
+ "pallet-democracy",
+ "pallet-election-provider-multi-phase",
+ "pallet-election-provider-support-benchmarking",
+ "pallet-elections-phragmen",
+ "pallet-fast-unstake",
+ "pallet-grandpa",
+ "pallet-identity",
+ "pallet-im-online",
+ "pallet-indices",
+ "pallet-membership",
+ "pallet-message-queue",
+ "pallet-mmr",
  "pallet-multisig",
- "pallet-nfts",
- "pallet-nfts-runtime-api",
+ "pallet-nis",
+ "pallet-nomination-pools",
+ "pallet-nomination-pools-benchmarking",
+ "pallet-nomination-pools-runtime-api",
+ "pallet-offences",
+ "pallet-offences-benchmarking",
+ "pallet-preimage",
  "pallet-proxy",
+ "pallet-ranked-collective",
+ "pallet-recovery",
+ "pallet-referenda",
+ "pallet-scheduler",
  "pallet-session",
+ "pallet-session-benchmarking",
+ "pallet-society",
+ "pallet-staking",
+ "pallet-staking-runtime-api",
  "pallet-state-trie-migration",
  "pallet-timestamp",
+ "pallet-tips",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
- "pallet-uniques",
+ "pallet-treasury",
  "pallet-utility",
+ "pallet-vesting",
+ "pallet-whitelist",
  "pallet-xcm",
- "parachain-info",
- "parachains-common",
+ "pallet-xcm-benchmarks",
  "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-primitives",
  "polkadot-runtime-common",
+ "polkadot-runtime-parachains",
+ "rustc-hex",
  "scale-info",
+ "serde",
+ "serde_derive",
  "smallvec",
  "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
+ "sp-authority-discovery",
  "sp-block-builder",
- "sp-consensus-aura",
+ "sp-consensus-babe",
+ "sp-consensus-beefy",
  "sp-core",
  "sp-inherents",
+ "sp-io",
+ "sp-mmr-primitives",
+ "sp-npos-elections",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
+ "sp-staking",
  "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
- "sp-weights",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "static_assertions",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
-name = "statemint-runtime"
+name = "staging-xcm"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "bounded-collections",
+ "derivative",
+ "environmental",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-weights",
+ "xcm-procedural",
+]
+
+[[package]]
+name = "staging-xcm-builder"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "assets-common",
- "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-session-benchmarking",
- "cumulus-pallet-xcm",
- "cumulus-pallet-xcmp-queue",
- "cumulus-primitives-core",
- "cumulus-primitives-timestamp",
- "cumulus-primitives-utility",
- "frame-executive",
  "frame-support",
  "frame-system",
- "frame-system-rpc-runtime-api",
+ "impl-trait-for-tuples",
  "log",
- "pallet-asset-tx-payment",
- "pallet-assets",
- "pallet-aura",
- "pallet-authorship",
- "pallet-balances",
- "pallet-collator-selection",
- "pallet-multisig",
- "pallet-proxy",
- "pallet-session",
- "pallet-timestamp",
  "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-uniques",
- "pallet-utility",
- "pallet-xcm",
- "parachain-info",
- "parachains-common",
  "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain",
- "polkadot-runtime-common",
- "polkadot-runtime-constants",
+ "polkadot-parachain-primitives",
  "scale-info",
- "smallvec",
- "sp-api",
- "sp-block-builder",
- "sp-consensus-aura",
+ "sp-arithmetic",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-weights",
+ "staging-xcm",
+ "staging-xcm-executor",
+]
+
+[[package]]
+name = "staging-xcm-executor"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "environmental",
+ "frame-benchmarking",
+ "frame-support",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "sp-arithmetic",
  "sp-core",
- "sp-inherents",
- "sp-offchain",
+ "sp-io",
  "sp-runtime",
- "sp-session",
  "sp-std",
- "sp-transaction-pool",
- "sp-version",
  "sp-weights",
- "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+]
+
+[[package]]
+name = "staking"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "orml-tokens",
+ "orml-traits",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "spacewalk-primitives",
 ]
 
 [[package]]
@@ -13520,19 +15059,21 @@ dependencies = [
 
 [[package]]
 name = "stellar-relay"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "base64 0.13.1",
  "currency",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sha2 0.10.8",
  "sp-core",
+ "sp-runtime",
  "sp-std",
  "spacewalk-primitives",
 ]
@@ -13555,9 +15096,15 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.24.3",
 ]
 
+[[package]]
+name = "strum"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+
 [[package]]
 name = "strum_macros"
 version = "0.24.3"
@@ -13572,22 +15119,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "stun"
-version = "0.4.4"
+name = "strum_macros"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "base64 0.13.1",
- "crc",
- "lazy_static",
- "md-5",
- "rand 0.8.5",
- "ring 0.16.20",
- "subtle",
- "thiserror",
- "tokio",
- "url",
- "webrtc-util",
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -13606,15 +15147,12 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
-dependencies = [
- "platforms 2.0.0",
-]
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -13633,7 +15171,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "hyper",
  "log",
@@ -13645,7 +15183,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "jsonrpsee",
@@ -13658,14 +15196,12 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "jsonrpsee",
- "log",
  "parity-scale-codec",
  "sc-client-api",
  "sc-rpc-api",
- "scale-info",
  "serde",
  "sp-core",
  "sp-runtime",
@@ -13676,8 +15212,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-stellar-sdk"
-version = "0.2.4"
-source = "git+https://github.com/pendulum-chain/substrate-stellar-sdk?branch=polkadot-v0.9.42#cda1a1cf2c8e99a8c3c2e739b80e5caea4cd99a7"
+version = "0.3.0"
+source = "git+https://github.com/pendulum-chain/substrate-stellar-sdk?branch=polkadot-v1.1.0#519b60deacb293d01b37a4c9c4126de15b9b4bf1"
 dependencies = [
  "base64 0.13.1",
  "hex",
@@ -13686,7 +15222,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sha2 0.9.9",
+ "sha2 0.10.8",
  "sodalite",
  "sp-io",
  "sp-runtime",
@@ -13696,34 +15232,32 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "ansi_term",
  "build-helper",
  "cargo_metadata",
  "filetime",
+ "parity-wasm",
  "sp-maybe-compressed-blob",
- "strum",
+ "strum 0.24.1",
  "tempfile",
  "toml 0.7.8",
  "walkdir",
  "wasm-opt",
 ]
 
-[[package]]
-name = "substring"
-version = "1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "subtle"
 version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+
+[[package]]
+name = "subtle-ng"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
 
 [[package]]
 name = "syn"
@@ -13799,7 +15333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
- "fastrand",
+ "fastrand 2.1.0",
  "rustix 0.38.34",
  "windows-sys 0.52.0",
 ]
@@ -13828,6 +15362,26 @@ dependencies = [
  "thiserror-impl",
 ]
 
+[[package]]
+name = "thiserror-core"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999"
+dependencies = [
+ "thiserror-core-impl",
+]
+
+[[package]]
+name = "thiserror-core-impl"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.65",
+]
+
 [[package]]
 name = "thiserror-impl"
 version = "1.0.61"
@@ -13949,13 +15503,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinytemplate"
-version = "1.2.1"
+name = "tiny-keccak"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
 dependencies = [
- "serde",
- "serde_json",
+ "crunchy",
 ]
 
 [[package]]
@@ -13983,13 +15536,15 @@ dependencies = [
  "log",
  "orml-currencies",
  "orml-currencies-allowance-extension",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-contracts",
  "parity-scale-codec",
  "sp-core",
  "sp-runtime",
  "sp-std",
+ "sp-tracing",
+ "sp-weights",
  "spacewalk-primitives",
 ]
 
@@ -14024,14 +15579,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-rustls"
-version = "0.23.4"
+name = "tokio-retry"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
 dependencies = [
- "rustls 0.20.9",
+ "pin-project",
+ "rand 0.8.5",
  "tokio",
- "webpki 0.22.4",
 ]
 
 [[package]]
@@ -14091,6 +15646,18 @@ dependencies = [
  "toml_edit 0.19.15",
 ]
 
+[[package]]
+name = "toml"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.16",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.6"
@@ -14110,7 +15677,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
 ]
 
 [[package]]
@@ -14121,7 +15688,20 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
  "indexmap 2.2.6",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
+dependencies = [
+ "indexmap 2.2.6",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.18",
 ]
 
 [[package]]
@@ -14137,11 +15717,11 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.3.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
+checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
  "bytes",
  "futures-core",
  "futures-util",
@@ -14210,9 +15790,10 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "coarsetime",
  "polkadot-node-jaeger",
  "polkadot-primitives",
  "tracing",
@@ -14221,8 +15802,8 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum-proc-macro"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "expander 2.1.0",
  "proc-macro-crate 1.3.1",
@@ -14284,7 +15865,7 @@ dependencies = [
  "frame-system",
  "mocktopus",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "pallet-treasury",
@@ -14299,7 +15880,7 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "spacewalk-primitives",
- "xcm",
+ "staging-xcm",
 ]
 
 [[package]]
@@ -14379,7 +15960,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "async-trait",
  "clap",
@@ -14390,7 +15971,6 @@ dependencies = [
  "parity-scale-codec",
  "sc-cli",
  "sc-executor",
- "sc-service",
  "serde",
  "serde_json",
  "sp-api",
@@ -14419,25 +15999,6 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df"
 
-[[package]]
-name = "turn"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8"
-dependencies = [
- "async-trait",
- "base64 0.13.1",
- "futures",
- "log",
- "md-5",
- "rand 0.8.5",
- "ring 0.16.20",
- "stun",
- "thiserror",
- "tokio",
- "webrtc-util",
-]
-
 [[package]]
 name = "twox-hash"
 version = "1.6.3"
@@ -14446,7 +16007,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
  "digest 0.10.7",
- "rand 0.8.5",
+ "rand 0.7.3",
  "static_assertions",
 ]
 
@@ -14507,16 +16068,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
-[[package]]
-name = "universal-hash"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
-dependencies = [
- "generic-array 0.14.7",
- "subtle",
-]
-
 [[package]]
 name = "universal-hash"
 version = "0.5.1"
@@ -14568,15 +16119,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
-[[package]]
-name = "uuid"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
-dependencies = [
- "getrandom 0.2.15",
-]
-
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -14585,8 +16127,8 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "vault-registry"
-version = "1.0.9"
-source = "git+https://github.com/pendulum-chain/spacewalk?rev=8b41e633321e472288e8fb635a4fc3cde9236d54#8b41e633321e472288e8fb635a4fc3cde9236d54"
+version = "1.0.10"
+source = "git+https://github.com/pendulum-chain/spacewalk?rev=580dd307ede65f90f17df6731645b678f3596e0f#580dd307ede65f90f17df6731645b678f3596e0f"
 dependencies = [
  "currency",
  "fee",
@@ -14597,7 +16139,7 @@ dependencies = [
  "log",
  "oracle",
  "orml-currencies",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.42)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "pallet-timestamp",
@@ -14653,13 +16195,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
-name = "waitgroup"
-version = "0.1.2"
+name = "waker-fn"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292"
-dependencies = [
- "atomic-waker",
-]
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 
 [[package]]
 name = "walkdir"
@@ -14787,14 +16326,14 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt"
-version = "0.111.0"
+version = "0.114.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a303793cbc01fb96551badfc7367db6007396bba6bac97936b3c8b6f7fdb41"
+checksum = "effbef3bd1dde18acb401f73e740a6f3d4a1bc651e9773bddc512fe4d8d68f67"
 dependencies = [
  "anyhow",
  "libc",
- "strum",
- "strum_macros",
+ "strum 0.24.1",
+ "strum_macros 0.24.3",
  "tempfile",
  "thiserror",
  "wasm-opt-cxx-sys",
@@ -14803,9 +16342,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-cxx-sys"
-version = "0.111.0"
+version = "0.114.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c9deb56f8a9f2ec177b3bd642a8205621835944ed5da55f2388ef216aca5a4"
+checksum = "c09e24eb283919ace2ed5733bda4842a59ce4c8de110ef5c6d98859513d17047"
 dependencies = [
  "anyhow",
  "cxx",
@@ -14815,15 +16354,14 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-sys"
-version = "0.111.0"
+version = "0.114.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4432e28b542738a9776cedf92e8a99d8991c7b4667ee2c7ccddfb479dd2856a7"
+checksum = "36f2f817bed2e8d65eb779fa37317e74de15585751f903c9118342d1970703a4"
 dependencies = [
  "anyhow",
  "cc",
  "cxx",
  "cxx-build",
- "regex",
 ]
 
 [[package]]
@@ -14843,36 +16381,17 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422"
-dependencies = [
- "parity-wasm",
- "wasmi-validation",
- "wasmi_core 0.2.1",
-]
-
-[[package]]
-name = "wasmi"
-version = "0.28.0"
+version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e61a7006b0fdf24f6bbe8dcfdad5ca1b350de80061fb2827f31c82fbbb9565a"
+checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7"
 dependencies = [
+ "smallvec",
  "spin 0.9.8",
  "wasmi_arena",
- "wasmi_core 0.12.0",
+ "wasmi_core",
  "wasmparser-nostd",
 ]
 
-[[package]]
-name = "wasmi-validation"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b"
-dependencies = [
- "parity-wasm",
-]
-
 [[package]]
 name = "wasmi_arena"
 version = "0.4.1"
@@ -14881,23 +16400,9 @@ checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073"
 
 [[package]]
 name = "wasmi_core"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
-dependencies = [
- "downcast-rs",
- "libm",
- "memory_units",
- "num-rational",
- "num-traits",
- "region",
-]
-
-[[package]]
-name = "wasmi_core"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624e6333e861ef49095d2d678b76ebf30b06bf37effca845be7e5b87c90071b7"
+checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a"
 dependencies = [
  "downcast-rs",
  "libm",
@@ -14907,9 +16412,9 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.100.0"
+version = "0.102.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4"
+checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b"
 dependencies = [
  "indexmap 1.9.3",
  "url",
@@ -14926,9 +16431,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6"
+checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9"
 dependencies = [
  "anyhow",
  "bincode",
@@ -14936,7 +16441,7 @@ dependencies = [
  "indexmap 1.9.3",
  "libc",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "once_cell",
  "paste",
  "psm",
@@ -14949,26 +16454,26 @@ dependencies = [
  "wasmtime-environ",
  "wasmtime-jit",
  "wasmtime-runtime",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "wasmtime-asm-macros"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc"
+checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "wasmtime-cache"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ceb3adf61d654be0be67fffdce42447b0880481348785be5fe40b5dd7663a4c"
+checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213"
 dependencies = [
  "anyhow",
- "base64 0.13.1",
+ "base64 0.21.7",
  "bincode",
  "directories-next",
  "file-per-thread-logger",
@@ -14977,15 +16482,15 @@ dependencies = [
  "serde",
  "sha2 0.10.8",
  "toml 0.5.11",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
  "zstd 0.11.2+zstd.1.5.2",
 ]
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c366bb8647e01fd08cb5589976284b00abfded5529b33d7e7f3f086c68304a4"
+checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -14993,378 +16498,178 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli 0.26.2",
+ "gimli 0.27.3",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "target-lexicon",
  "thiserror",
  "wasmparser",
+ "wasmtime-cranelift-shared",
  "wasmtime-environ",
 ]
 
 [[package]]
-name = "wasmtime-environ"
-version = "6.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7"
-dependencies = [
- "anyhow",
- "cranelift-entity",
- "gimli 0.26.2",
- "indexmap 1.9.3",
- "log",
- "object 0.29.0",
- "serde",
- "target-lexicon",
- "thiserror",
- "wasmparser",
- "wasmtime-types",
-]
-
-[[package]]
-name = "wasmtime-jit"
-version = "6.0.2"
+name = "wasmtime-cranelift-shared"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa"
+checksum = "cd041e382ef5aea1b9fc78442394f1a4f6d676ce457e7076ca4cb3f397882f8b"
 dependencies = [
- "addr2line 0.17.0",
  "anyhow",
- "bincode",
- "cfg-if",
- "cpp_demangle",
- "gimli 0.26.2",
- "log",
- "object 0.29.0",
- "rustc-demangle",
- "serde",
+ "cranelift-codegen",
+ "cranelift-native",
+ "gimli 0.27.3",
+ "object 0.30.4",
  "target-lexicon",
  "wasmtime-environ",
- "wasmtime-jit-debug",
- "wasmtime-jit-icache-coherence",
- "wasmtime-runtime",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "wasmtime-jit-debug"
-version = "6.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2"
-dependencies = [
- "object 0.29.0",
- "once_cell",
- "rustix 0.36.17",
-]
-
-[[package]]
-name = "wasmtime-jit-icache-coherence"
-version = "6.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c"
-dependencies = [
- "cfg-if",
- "libc",
- "windows-sys 0.42.0",
 ]
 
 [[package]]
-name = "wasmtime-runtime"
-version = "6.0.2"
+name = "wasmtime-environ"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b"
+checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949"
 dependencies = [
  "anyhow",
- "cc",
- "cfg-if",
+ "cranelift-entity",
+ "gimli 0.27.3",
  "indexmap 1.9.3",
- "libc",
  "log",
- "mach",
- "memfd",
- "memoffset",
- "paste",
- "rand 0.8.5",
- "rustix 0.36.17",
- "wasmtime-asm-macros",
- "wasmtime-environ",
- "wasmtime-jit-debug",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "wasmtime-types"
-version = "6.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568"
-dependencies = [
- "cranelift-entity",
+ "object 0.30.4",
  "serde",
+ "target-lexicon",
  "thiserror",
  "wasmparser",
+ "wasmtime-types",
 ]
 
 [[package]]
-name = "web-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
-
-[[package]]
-name = "webpki"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
-dependencies = [
- "ring 0.17.8",
- "untrusted 0.9.0",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
-dependencies = [
- "webpki 0.22.4",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.25.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
-
-[[package]]
-name = "webrtc"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb"
-dependencies = [
- "arc-swap",
- "async-trait",
- "bytes",
- "hex",
- "interceptor",
- "lazy_static",
- "log",
- "rand 0.8.5",
- "rcgen 0.9.3",
- "regex",
- "ring 0.16.20",
- "rtcp",
- "rtp",
- "rustls 0.19.1",
- "sdp",
- "serde",
- "serde_json",
- "sha2 0.10.8",
- "stun",
- "thiserror",
- "time",
- "tokio",
- "turn",
- "url",
- "waitgroup",
- "webrtc-data",
- "webrtc-dtls",
- "webrtc-ice",
- "webrtc-mdns",
- "webrtc-media",
- "webrtc-sctp",
- "webrtc-srtp",
- "webrtc-util",
-]
-
-[[package]]
-name = "webrtc-data"
-version = "0.6.0"
+name = "wasmtime-jit"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100"
+checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244"
 dependencies = [
- "bytes",
- "derive_builder",
+ "addr2line 0.19.0",
+ "anyhow",
+ "bincode",
+ "cfg-if",
+ "cpp_demangle",
+ "gimli 0.27.3",
  "log",
- "thiserror",
- "tokio",
- "webrtc-sctp",
- "webrtc-util",
+ "object 0.30.4",
+ "rustc-demangle",
+ "serde",
+ "target-lexicon",
+ "wasmtime-environ",
+ "wasmtime-jit-debug",
+ "wasmtime-jit-icache-coherence",
+ "wasmtime-runtime",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
-name = "webrtc-dtls"
-version = "0.7.2"
+name = "wasmtime-jit-debug"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267"
+checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
 dependencies = [
- "aes 0.6.0",
- "aes-gcm 0.10.3",
- "async-trait",
- "bincode",
- "block-modes",
- "byteorder",
- "ccm",
- "curve25519-dalek 3.2.0",
- "der-parser 8.2.0",
- "elliptic-curve 0.12.3",
- "hkdf",
- "hmac 0.12.1",
- "log",
- "p256",
- "p384",
- "rand 0.8.5",
- "rand_core 0.6.4",
- "rcgen 0.10.0",
- "ring 0.16.20",
- "rustls 0.19.1",
- "sec1 0.3.0",
- "serde",
- "sha1",
- "sha2 0.10.8",
- "signature 1.6.4",
- "subtle",
- "thiserror",
- "tokio",
- "webpki 0.21.4",
- "webrtc-util",
- "x25519-dalek 2.0.1",
- "x509-parser 0.13.2",
+ "object 0.30.4",
+ "once_cell",
+ "rustix 0.36.17",
 ]
 
 [[package]]
-name = "webrtc-ice"
-version = "0.9.1"
+name = "wasmtime-jit-icache-coherence"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80"
+checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd"
 dependencies = [
- "arc-swap",
- "async-trait",
- "crc",
- "log",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "stun",
- "thiserror",
- "tokio",
- "turn",
- "url",
- "uuid",
- "waitgroup",
- "webrtc-mdns",
- "webrtc-util",
+ "cfg-if",
+ "libc",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
-name = "webrtc-mdns"
-version = "0.5.2"
+name = "wasmtime-runtime"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106"
+checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441"
 dependencies = [
+ "anyhow",
+ "cc",
+ "cfg-if",
+ "indexmap 1.9.3",
+ "libc",
  "log",
- "socket2 0.4.10",
- "thiserror",
- "tokio",
- "webrtc-util",
+ "mach",
+ "memfd",
+ "memoffset",
+ "paste",
+ "rand 0.8.5",
+ "rustix 0.36.17",
+ "wasmtime-asm-macros",
+ "wasmtime-environ",
+ "wasmtime-jit-debug",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
-name = "webrtc-media"
-version = "0.5.1"
+name = "wasmtime-types"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f72e1650a8ae006017d1a5280efb49e2610c19ccc3c0905b03b648aee9554991"
+checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
 dependencies = [
- "byteorder",
- "bytes",
- "rand 0.8.5",
- "rtp",
+ "cranelift-entity",
+ "serde",
  "thiserror",
+ "wasmparser",
 ]
 
 [[package]]
-name = "webrtc-sctp"
-version = "0.7.0"
+name = "web-sys"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
- "arc-swap",
- "async-trait",
- "bytes",
- "crc",
- "log",
- "rand 0.8.5",
- "thiserror",
- "tokio",
- "webrtc-util",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "webrtc-srtp"
-version = "0.9.1"
+name = "webpki"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
 dependencies = [
- "aead 0.4.3",
- "aes 0.7.5",
- "aes-gcm 0.9.4",
- "async-trait",
- "byteorder",
- "bytes",
- "ctr 0.8.0",
- "hmac 0.11.0",
- "log",
- "rtcp",
- "rtp",
- "sha-1",
- "subtle",
- "thiserror",
- "tokio",
- "webrtc-util",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
-name = "webrtc-util"
-version = "0.7.0"
+name = "webpki-roots"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
- "async-trait",
- "bitflags 1.3.2",
- "bytes",
- "cc",
- "ipnet",
- "lazy_static",
- "libc",
- "log",
- "nix",
- "rand 0.8.5",
- "thiserror",
- "tokio",
- "winapi",
+ "webpki",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.25.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+
 [[package]]
 name = "westend-runtime"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
+ "binary-merkle-tree",
  "bitvec",
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-executive",
+ "frame-metadata-hash-extension",
  "frame-support",
  "frame-system",
  "frame-system-benchmarking",
@@ -15377,6 +16682,8 @@ dependencies = [
  "pallet-babe",
  "pallet-bags-list",
  "pallet-balances",
+ "pallet-beefy",
+ "pallet-beefy-mmr",
  "pallet-collective",
  "pallet-democracy",
  "pallet-election-provider-multi-phase",
@@ -15388,6 +16695,8 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-message-queue",
+ "pallet-mmr",
  "pallet-multisig",
  "pallet-nomination-pools",
  "pallet-nomination-pools-benchmarking",
@@ -15415,7 +16724,7 @@ dependencies = [
  "pallet-xcm",
  "pallet-xcm-benchmarks",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-common",
  "polkadot-runtime-parachains",
@@ -15425,6 +16734,7 @@ dependencies = [
  "serde_derive",
  "smallvec",
  "sp-api",
+ "sp-application-crypto",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
@@ -15439,19 +16749,20 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
  "westend-runtime-constants",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
 name = "westend-runtime-constants"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -15527,7 +16838,7 @@ version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
 dependencies = [
- "windows-core 0.51.1",
+ "windows-core",
  "windows-targets 0.48.5",
 ]
 
@@ -15540,30 +16851,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -15778,6 +17065,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -15820,130 +17116,60 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "x509-parser"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c"
-dependencies = [
- "asn1-rs 0.3.1",
- "base64 0.13.1",
- "data-encoding",
- "der-parser 7.0.0",
- "lazy_static",
- "nom",
- "oid-registry 0.4.0",
- "ring 0.16.20",
- "rusticata-macros",
- "thiserror",
- "time",
-]
-
 [[package]]
 name = "x509-parser"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8"
 dependencies = [
- "asn1-rs 0.5.2",
+ "asn1-rs",
  "base64 0.13.1",
  "data-encoding",
- "der-parser 8.2.0",
+ "der-parser",
  "lazy_static",
  "nom",
- "oid-registry 0.6.1",
+ "oid-registry",
  "rusticata-macros",
  "thiserror",
  "time",
 ]
 
-[[package]]
-name = "xcm"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
-dependencies = [
- "bounded-collections",
- "derivative",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-weights",
- "xcm-procedural",
-]
-
-[[package]]
-name = "xcm-builder"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
-dependencies = [
- "frame-support",
- "frame-system",
- "impl-trait-for-tuples",
- "log",
- "pallet-transaction-payment",
- "parity-scale-codec",
- "polkadot-parachain",
- "scale-info",
- "sp-arithmetic",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "xcm",
- "xcm-executor",
-]
-
 [[package]]
 name = "xcm-emulator"
 version = "0.1.0"
-source = "git+https://github.com/shaunxw/xcm-simulator?rev=d011e5ca62b93e8f688c2042c1f92cdbafc5d1d0#d011e5ca62b93e8f688c2042c1f92cdbafc5d1d0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
  "cumulus-test-relay-sproof-builder",
  "frame-support",
  "frame-system",
- "parachain-info",
+ "impl-trait-for-tuples",
+ "lazy_static",
+ "log",
+ "pallet-balances",
+ "pallet-message-queue",
+ "parachains-common",
  "parity-scale-codec",
  "paste",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-parachains",
- "quote",
- "sp-arithmetic",
- "sp-io",
- "sp-std",
- "xcm",
- "xcm-executor",
-]
-
-[[package]]
-name = "xcm-executor"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
-dependencies = [
- "environmental",
- "frame-benchmarking",
- "frame-support",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
- "sp-weights",
- "xcm",
+ "sp-tracing",
+ "staging-xcm",
+ "staging-xcm-executor",
 ]
 
 [[package]]
 name = "xcm-procedural"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
 dependencies = [
  "Inflector",
  "proc-macro2",
@@ -15951,6 +17177,24 @@ dependencies = [
  "syn 2.0.65",
 ]
 
+[[package]]
+name = "xcm-simulator"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#e51a91fcac27d2f95ad631989622848aa8043f9e"
+dependencies = [
+ "frame-support",
+ "parity-scale-codec",
+ "paste",
+ "polkadot-core-primitives",
+ "polkadot-parachain-primitives",
+ "polkadot-runtime-parachains",
+ "sp-io",
+ "sp-std",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+]
+
 [[package]]
 name = "yamux"
 version = "0.10.2"
@@ -15977,13 +17221,13 @@ dependencies = [
 [[package]]
 name = "zenlink-protocol"
 version = "0.4.4"
-source = "git+https://github.com/zenlinkpro/Zenlink-DEX-Module?branch=polkadot-v0.9.42#c32bb5f63bcd06dc49ca8a48dd7b7a0f78c358bf"
+source = "git+https://github.com/bifrost-finance/Zenlink-DEX-Module?branch=release-polkadot-v1.1.0#f5d2ce81b72d36eb0b71d021a4eecf95d0a437e1"
 dependencies = [
  "cumulus-primitives-core",
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
- "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=4ae0372e2c624e6acc98305564b9d395f70814c0)",
+ "orml-tokens",
  "orml-traits",
  "pallet-balances",
  "parity-scale-codec",
@@ -15993,17 +17237,17 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-executor",
+ "staging-xcm",
 ]
 
 [[package]]
 name = "zenlink-protocol-rpc"
 version = "0.4.4"
-source = "git+https://github.com/zenlinkpro/Zenlink-DEX-Module?branch=polkadot-v0.9.42#c32bb5f63bcd06dc49ca8a48dd7b7a0f78c358bf"
+source = "git+https://github.com/bifrost-finance/Zenlink-DEX-Module?branch=release-polkadot-v1.1.0#f5d2ce81b72d36eb0b71d021a4eecf95d0a437e1"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
+ "serde",
  "sp-api",
  "sp-blockchain",
  "sp-rpc",
@@ -16015,7 +17259,7 @@ dependencies = [
 [[package]]
 name = "zenlink-protocol-runtime-api"
 version = "0.4.4"
-source = "git+https://github.com/zenlinkpro/Zenlink-DEX-Module?branch=polkadot-v0.9.42#c32bb5f63bcd06dc49ca8a48dd7b7a0f78c358bf"
+source = "git+https://github.com/bifrost-finance/Zenlink-DEX-Module?branch=release-polkadot-v1.1.0#f5d2ce81b72d36eb0b71d021a4eecf95d0a437e1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -16110,13 +17354,3 @@ dependencies = [
  "cc",
  "pkg-config",
 ]
-
-[[patch.unused]]
-name = "orml-currencies"
-version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack//open-runtime-module-library?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
-
-[[patch.unused]]
-name = "orml-tokens"
-version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack//open-runtime-module-library?branch=polkadot-v0.9.42#4ae0372e2c624e6acc98305564b9d395f70814c0"
diff --git a/Cargo.toml b/Cargo.toml
index dc0ab9f75..0ec3f93e0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,21 +25,13 @@ members = [
 # need this because of bifrost farming dependency in runtime
 # bifrost farming uses different orml-traits for orml-currencies
 [patch."https://github.com/open-web3-stack/open-runtime-module-library"]
-orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.42" }
-
-# need this because of bifrost farming dependency in runtime
-# bifrost uses :
-# orml packages { version = "0.4.1-dev" }
-# zenlink packages  { version = "*" }
-[patch.crates-io]
-orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.42" }
-orml-currencies = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.42" }
-orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.42" }
-zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", branch = "polkadot-v0.9.42" }
-zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", branch = "polkadot-v0.9.42" }
-
-
-[patch.'https://github.com/paritytech/substrate']
-pallet-vesting = { git = "https://github.com/pendulum-chain/patch-pallet-vesting-transaction-storage", branch = "polkadot-v0.9.42" }
-pallet-transaction-payment = { git = "https://github.com/pendulum-chain/patch-pallet-vesting-transaction-storage", branch = "polkadot-v0.9.42" }
+orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.1.0" }
+orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.1.0" }
+##
+### need this because of bifrost farming dependency in runtime
+### bifrost uses :
+### orml packages { version = "0.4.1-dev" }
+### zenlink packages  { version = "*" }
 
+[patch."https://github.com/w3f/ring-vrf"]
+bandersnatch_vrfs = { git = "https://github.com/w3f//ring-vrf", version = "0.0.4", rev = "3ddc20" }
\ No newline at end of file
diff --git a/README.md b/README.md
index 2bf57bd27..9ef4aaaaa 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Pendulum chain by SatoshiPay. More information about Pendulum can be found [here
 ### How to Run Tests
 
 [`mocktopus`](https://docs.rs/mocktopus/latest/mocktopus/) is nightly-only lib, and is used in testing.  
-So to run the tests, override the toolchain with nightly; minimum version is `nightly-2024-04-18`.
+So to run the tests, override the toolchain with nightly; minimum version is `nightly-2024-05-30`.
 
 ```
 cargo +nightly test
diff --git a/chain-extensions/common/Cargo.toml b/chain-extensions/common/Cargo.toml
index 7e945ac4d..542895446 100644
--- a/chain-extensions/common/Cargo.toml
+++ b/chain-extensions/common/Cargo.toml
@@ -13,11 +13,11 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 log = { version = "0.4.17", default-features = false }
 
 # Substrate
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 
diff --git a/chain-extensions/common/src/lib.rs b/chain-extensions/common/src/lib.rs
index a97796d58..84966c602 100644
--- a/chain-extensions/common/src/lib.rs
+++ b/chain-extensions/common/src/lib.rs
@@ -71,6 +71,8 @@ pub enum ChainExtensionTokenError {
 	CannotCreateHold,
 	/// Withdrawal would cause unwanted loss of account.
 	NotExpendable,
+	/// Blocked
+	Blocked,
 	/// Unknown error
 	Unknown,
 }
@@ -121,6 +123,7 @@ impl From<TokenError> for ChainExtensionTokenError {
 			TokenError::CannotCreateHold => ChainExtensionTokenError::CannotCreateHold,
 			TokenError::NotExpendable => ChainExtensionTokenError::NotExpendable,
 			TokenError::Unsupported => ChainExtensionTokenError::Unsupported,
+			TokenError::Blocked => ChainExtensionTokenError::Blocked,
 		}
 	}
 }
@@ -197,6 +200,7 @@ impl ChainExtensionTokenError {
 			ChainExtensionTokenError::OnlyProvider => 6,
 			ChainExtensionTokenError::CannotCreateHold => 7,
 			ChainExtensionTokenError::NotExpendable => 8,
+			ChainExtensionTokenError::Blocked => 9,
 			ChainExtensionTokenError::Unknown => 999,
 		}
 	}
diff --git a/chain-extensions/price/Cargo.toml b/chain-extensions/price/Cargo.toml
index d86b11e3e..f8039764e 100644
--- a/chain-extensions/price/Cargo.toml
+++ b/chain-extensions/price/Cargo.toml
@@ -16,23 +16,25 @@ log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 
 # Open Runtime Module Library
-orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
+orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
 
 # Pendulum Pallets
 vesting-manager = { path = "../../pallets/vesting-manager", default-features = false }
 
 # DIA
-dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v0.9.42" }
+dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v1.1.0" }
 
 
 [features]
@@ -50,6 +52,8 @@ std = [
     "orml-tokens/std",
     "sp-core/std",
     "sp-runtime/std",
+    "sp-tracing/std",
+    "sp-weights/std",
     "vesting-manager/std",
     "dia-oracle/std",
     "pallet-contracts/std",
diff --git a/chain-extensions/price/src/lib.rs b/chain-extensions/price/src/lib.rs
index 411905a9f..b6b59a30b 100644
--- a/chain-extensions/price/src/lib.rs
+++ b/chain-extensions/price/src/lib.rs
@@ -5,17 +5,17 @@ use chain_extension_common::{Blockchain, ChainExtensionOutcome, Symbol, ToTrimme
 use codec::Encode;
 use dia_oracle::{CoinInfo as DiaCoinInfo, DiaOracle};
 use frame_support::{
-	dispatch::Weight,
-	inherent::Vec,
 	pallet_prelude::{Get, PhantomData},
-	sp_tracing::{error, trace},
 	DefaultNoBound,
 };
 use pallet_contracts::chain_extension::{
 	ChainExtension, Environment, Ext, InitState, RetVal, SysConfig,
 };
+use scale_info::prelude::vec::Vec;
 use sp_core::crypto::UncheckedFrom;
 use sp_runtime::DispatchError;
+use sp_tracing::{error, trace};
+use sp_weights::Weight;
 
 // Enum that handles all supported function id options for this chain extension module
 #[derive(Debug)]
diff --git a/chain-extensions/token/Cargo.toml b/chain-extensions/token/Cargo.toml
index 6f583a3fd..876e1af6c 100644
--- a/chain-extensions/token/Cargo.toml
+++ b/chain-extensions/token/Cargo.toml
@@ -14,20 +14,22 @@ log = { version = "0.4.17", default-features = false }
 chain-extension-common = { path = "../common", default-features = false }
 
 # Substrate
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
 
 # Open Runtime Module Library
-orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
+orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
 
 # Custom libraries for Spacewalk
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 
 # Pendulum Pallets
 orml-currencies-allowance-extension = { path = "../../pallets/orml-currencies-allowance-extension", default-features = false }
@@ -46,6 +48,8 @@ std = [
     "orml-tokens/std",
     "sp-core/std",
     "sp-runtime/std",
+    "sp-tracing/std",
+    "sp-weights/std",
     "orml-currencies-allowance-extension/std",
     "pallet-contracts/std",
     "frame-system/std",
diff --git a/chain-extensions/token/src/lib.rs b/chain-extensions/token/src/lib.rs
index 961f3d485..17eb83dc7 100644
--- a/chain-extensions/token/src/lib.rs
+++ b/chain-extensions/token/src/lib.rs
@@ -4,9 +4,7 @@
 use chain_extension_common::{ChainExtensionOutcome, ChainExtensionTokenError};
 use codec::Encode;
 use frame_support::{
-	dispatch::Weight,
 	pallet_prelude::{Decode, Get, PhantomData},
-	sp_tracing::{error, trace},
 	DefaultNoBound,
 };
 use orml_currencies::WeightInfo;
@@ -19,6 +17,8 @@ use pallet_contracts::chain_extension::{
 };
 use sp_core::crypto::UncheckedFrom;
 use sp_runtime::DispatchError;
+use sp_tracing::{error, trace};
+use sp_weights::Weight;
 use spacewalk_primitives::CurrencyId;
 
 pub(crate) type BalanceOfForChainExt<T> =
@@ -218,7 +218,7 @@ where
 		"Calling transfer() sending {:?} {:?}, from {:?} to {:?}",
 		amount,
 		currency_id,
-		env.ext().caller(),
+		env.ext().caller().account_id(),
 		recipient
 	);
 
@@ -228,7 +228,7 @@ where
 
 	<orml_currencies::Pallet<T> as MultiCurrency<T::AccountId>>::transfer(
 		currency_id,
-		env.ext().caller(),
+		env.ext().caller().account_id()?,
 		&recipient,
 		amount,
 	)?;
@@ -310,7 +310,7 @@ where
 		spender,
 		amount,
 		currency_id,
-		env.ext().caller(),
+		env.ext().caller().account_id()?,
 	);
 
 	if !orml_currencies_allowance_extension::Pallet::<T>::is_allowed_currency(currency_id) {
@@ -319,7 +319,7 @@ where
 
 	orml_currencies_allowance_extension::Pallet::<T>::do_approve_transfer(
 		currency_id,
-		env.ext().caller(),
+		env.ext().caller().account_id()?,
 		&spender,
 		amount,
 	)?;
@@ -357,7 +357,7 @@ where
 
 	trace!(
 		"Calling transfer_from() for caller {:?}, sending {:?} {:?}, from {:?} to {:?}",
-		env.ext().caller(),
+		env.ext().caller().account_id()?,
 		amount,
 		currency_id,
 		owner,
@@ -371,7 +371,7 @@ where
 	orml_currencies_allowance_extension::Pallet::<T>::do_transfer_approved(
 		currency_id,
 		&owner,
-		env.ext().caller(),
+		env.ext().caller().account_id()?,
 		&recipient,
 		amount,
 	)?;
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 09f12c5c2..97c2c140b 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -15,13 +15,13 @@ codec = { package = "parity-scale-codec", version = "3.0.0" }
 serde = { version = "1.0.145", features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 
-module-issue-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-oracle-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-redeem-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-replace-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-vault-registry-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+module-issue-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-oracle-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-redeem-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-replace-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-vault-registry-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 module-pallet-staking-rpc = { path = "../pallets/parachain-staking/rpc" }
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 
 # Local
 amplitude-runtime = { path = "../runtime/amplitude" }
@@ -30,73 +30,77 @@ pendulum-runtime = { path = "../runtime/pendulum" }
 runtime-common = { path = "../runtime/common" }
 
 # Substrate
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-multisig = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-executor = { git = "https://github.com/paritytech/substrate",  branch = "polkadot-v0.9.42" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
 # Polkadot
-polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
+polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+staging-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
 # Cumulus
-cumulus-client-cli = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
-cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
-cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
-cumulus-client-network = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
-cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
-cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
+cumulus-client-cli =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-client-consensus-aura =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-client-consensus-common =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-client-consensus-proposer =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-client-collator =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-client-network =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-client-service =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-core =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-parachain-inherent =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-relay-chain-inprocess-interface =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-relay-chain-interface =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-relay-chain-rpc-interface =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-relay-chain-minimal-node =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
 #bifrost
-bifrost-farming-rpc-api = { git = "https://github.com/pendulum-chain/bifrost", branch = "upgrade-v0.9.42" }
-bifrost-farming-rpc-runtime-api = { git = "https://github.com/pendulum-chain/bifrost", branch = "upgrade-v0.9.42" }
+bifrost-farming-rpc = { git = "https://github.com/bifrost-finance/bifrost", rev = "46ba3689c2fe1011cce0d752cb479e0e522e2e76" }
+bifrost-farming-rpc-runtime-api = { git = "https://github.com/bifrost-finance/bifrost", rev = "46ba3689c2fe1011cce0d752cb479e0e522e2e76" }
 
-zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", branch = "polkadot-v0.9.42" }
-zenlink-protocol-rpc = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", branch = "polkadot-v0.9.42" }
-zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", branch = "polkadot-v0.9.42" }
+zenlink-protocol = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", branch = "release-polkadot-v1.1.0" }
+zenlink-protocol-rpc = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", branch = "release-polkadot-v1.1.0" }
+zenlink-protocol-runtime-api = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", branch = "release-polkadot-v1.1.0" }
+futures = "0.3.30"
 
 [build-dependencies]
-substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
 [features]
 default = []
diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
index 1fbdc1c7a..79b51dda5 100644
--- a/node/src/chain_spec.rs
+++ b/node/src/chain_spec.rs
@@ -1,3 +1,7 @@
+#![allow(clippy::default_constructed_unit_structs)]
+
+use crate::constants::{amplitude, foucoco, pendulum};
+use core::default::Default;
 use cumulus_primitives_core::ParaId;
 use runtime_common::{AccountId, AuraId, Balance, BlockNumber, Signature, UNIT};
 use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
@@ -5,7 +9,7 @@ use sc_service::ChainType;
 use serde::{Deserialize, Serialize};
 use sp_core::{
 	crypto::{Ss58Codec, UncheckedInto},
-	sr25519, Pair, Public,
+	sp_std, sr25519, Pair, Public,
 };
 use sp_runtime::{
 	traits::{IdentifyAccount, Verify},
@@ -13,23 +17,21 @@ use sp_runtime::{
 };
 use spacewalk_primitives::{oracle::Key, Asset, CurrencyId, CurrencyId::XCM, VaultCurrencyPair};
 
-use crate::constants::{amplitude, foucoco, pendulum};
-
 const MAINNET_USDC_CURRENCY_ID: CurrencyId = pendulum_runtime::GetWrappedCurrencyId::get();
 const TESTNET_USDC_CURRENCY_ID: CurrencyId = amplitude_runtime::GetWrappedCurrencyId::get();
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
 pub type AmplitudeChainSpec =
-	sc_service::GenericChainSpec<amplitude_runtime::GenesisConfig, ParachainExtensions>;
+	sc_service::GenericChainSpec<amplitude_runtime::RuntimeGenesisConfig, ParachainExtensions>;
 
 pub type FoucocoChainSpec =
-	sc_service::GenericChainSpec<foucoco_runtime::GenesisConfig, ParachainExtensions>;
+	sc_service::GenericChainSpec<foucoco_runtime::RuntimeGenesisConfig, ParachainExtensions>;
 
 pub type PendulumChainSpec =
-	sc_service::GenericChainSpec<pendulum_runtime::GenesisConfig, ParachainExtensions>;
+	sc_service::GenericChainSpec<pendulum_runtime::RuntimeGenesisConfig, ParachainExtensions>;
 
 /// The default XCM version to set in genesis config.
-const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
+const SAFE_XCM_VERSION: u32 = staging_xcm::prelude::XCM_VERSION;
 
 pub fn create_pendulum_multisig_account(id: &str) -> AccountId {
 	let mut signatories: Vec<_> = pendulum::SUDO_SIGNATORIES
@@ -251,25 +253,25 @@ pub fn foucoco_standalone_config() -> FoucocoChainSpec {
 		.map(|ss58| AccountId::from_ss58check(ss58).unwrap())
 		.collect();
 
-	let sudo_account = get_account_id_from_seed::<sr25519::Public>("Alice"); 
+	let sudo_account = get_account_id_from_seed::<sr25519::Public>("Alice");
 
 	let offchain_worker_price_feeder =
 		AccountId::from_ss58check(foucoco::OFF_CHAIN_WORKER_ADDRESS).unwrap();
 
 	let allowed_currencies = vec![
-			CurrencyId::Native,
-			CurrencyId::XCM(0),
-			CurrencyId::XCM(1),
-			CurrencyId::XCM(2),
-			CurrencyId::XCM(3),
-			CurrencyId::XCM(4),
-			CurrencyId::XCM(5),
-			CurrencyId::XCM(6),
-			CurrencyId::XCM(7),
-			CurrencyId::XCM(8),
-			CurrencyId::XCM(9),
-			CurrencyId::XCM(10),
-		];
+		CurrencyId::Native,
+		CurrencyId::XCM(0),
+		CurrencyId::XCM(1),
+		CurrencyId::XCM(2),
+		CurrencyId::XCM(3),
+		CurrencyId::XCM(4),
+		CurrencyId::XCM(5),
+		CurrencyId::XCM(6),
+		CurrencyId::XCM(7),
+		CurrencyId::XCM(8),
+		CurrencyId::XCM(9),
+		CurrencyId::XCM(10),
+	];
 
 	FoucocoChainSpec::from_genesis(
 		// Name
@@ -446,7 +448,7 @@ fn amplitude_genesis(
 	sudo_account: AccountId,
 	id: ParaId,
 	start_shutdown: bool,
-) -> amplitude_runtime::GenesisConfig {
+) -> amplitude_runtime::RuntimeGenesisConfig {
 	let mut balances: Vec<_> = signatories
 		.iter()
 		.cloned()
@@ -488,15 +490,20 @@ fn amplitude_genesis(
 		Perquintill::from_percent(9),
 	);
 
-	amplitude_runtime::GenesisConfig {
+	amplitude_runtime::RuntimeGenesisConfig {
 		asset_registry: Default::default(),
 		system: amplitude_runtime::SystemConfig {
 			code: amplitude_runtime::WASM_BINARY
 				.expect("WASM binary was not build, please build it!")
 				.to_vec(),
+			#[allow(clippy::wrong_self_convention)]
+			_config: sp_std::marker::PhantomData::default(),
 		},
 		balances: amplitude_runtime::BalancesConfig { balances },
-		parachain_info: amplitude_runtime::ParachainInfoConfig { parachain_id: id },
+		parachain_info: amplitude_runtime::ParachainInfoConfig {
+			parachain_id: id,
+			_config: sp_std::marker::PhantomData::default(),
+		},
 		parachain_staking: amplitude_runtime::ParachainStakingConfig {
 			stakers,
 			inflation_config,
@@ -522,6 +529,7 @@ fn amplitude_genesis(
 		parachain_system: Default::default(),
 		polkadot_xcm: amplitude_runtime::PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),
+			_config: sp_std::marker::PhantomData::default(),
 		},
 		council: amplitude_runtime::CouncilConfig {
 			members: signatories.clone(),
@@ -564,6 +572,7 @@ fn amplitude_genesis(
 			} else {
 				amplitude_runtime::StatusCode::Error
 			},
+			_phantom: sp_std::marker::PhantomData::default(),
 		},
 		oracle: amplitude_runtime::OracleConfig {
 			max_delay: u32::MAX,
@@ -572,6 +581,7 @@ fn amplitude_genesis(
 				Key::ExchangeRate(CurrencyId::XCM(0)),
 				Key::ExchangeRate(MAINNET_USDC_CURRENCY_ID),
 			],
+			_phantom: sp_std::marker::PhantomData::default(),
 		},
 		vault_registry: amplitude_runtime::VaultRegistryConfig {
 			minimum_collateral_vault: vec![(XCM(0), 0)],
@@ -605,7 +615,10 @@ fn amplitude_genesis(
 			punishment_fee: FixedU128::checked_from_rational(1, 10).unwrap(), // 10%
 			replace_griefing_collateral: FixedU128::checked_from_rational(1, 10).unwrap(), // 10%
 		},
-		nomination: amplitude_runtime::NominationConfig { is_nomination_enabled: false },
+		nomination: amplitude_runtime::NominationConfig {
+			is_nomination_enabled: false,
+			_phantom: sp_std::marker::PhantomData::default(),
+		},
 		dia_oracle_module: amplitude_runtime::DiaOracleModuleConfig {
 			authorized_accounts: authorized_oracles,
 			supported_currencies: vec![
@@ -617,6 +630,12 @@ fn amplitude_genesis(
 			batching_api: b"https://dia-00.pendulumchain.tech/currencies".to_vec(),
 			coin_infos_map: vec![],
 		},
+		token_allowance: Default::default(),
+		transaction_payment: Default::default(),
+		treasury: Default::default(),
+		treasury_buyout_extension: Default::default(),
+		vesting: Default::default(),
+		zenlink_protocol: Default::default(),
 	}
 }
 
@@ -628,7 +647,7 @@ fn foucoco_genesis(
 	id: ParaId,
 	start_shutdown: bool,
 	allowed_currencies: Vec<CurrencyId>,
-) -> foucoco_runtime::GenesisConfig {
+) -> foucoco_runtime::RuntimeGenesisConfig {
 	fn get_vault_currency_pair(
 		collateral: CurrencyId,
 		wrapped: CurrencyId,
@@ -680,15 +699,19 @@ fn foucoco_genesis(
 		Perquintill::from_percent(9),
 	);
 
-	foucoco_runtime::GenesisConfig {
+	foucoco_runtime::RuntimeGenesisConfig {
 		asset_registry: Default::default(),
 		system: foucoco_runtime::SystemConfig {
 			code: foucoco_runtime::WASM_BINARY
 				.expect("WASM binary was not build, please build it!")
 				.to_vec(),
+			_config: sp_std::marker::PhantomData::default(),
 		},
 		balances: foucoco_runtime::BalancesConfig { balances },
-		parachain_info: foucoco_runtime::ParachainInfoConfig { parachain_id: id },
+		parachain_info: foucoco_runtime::ParachainInfoConfig {
+			parachain_id: id,
+			_config: sp_std::marker::PhantomData::default(),
+		},
 		parachain_staking: foucoco_runtime::ParachainStakingConfig {
 			stakers,
 			inflation_config,
@@ -714,6 +737,7 @@ fn foucoco_genesis(
 		parachain_system: Default::default(),
 		polkadot_xcm: foucoco_runtime::PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),
+			_config: sp_std::marker::PhantomData::default(),
 		},
 		council: foucoco_runtime::CouncilConfig {
 			members: signatories.clone(),
@@ -757,6 +781,7 @@ fn foucoco_genesis(
 			} else {
 				foucoco_runtime::StatusCode::Error
 			},
+			_phantom: sp_std::marker::PhantomData::default(),
 		},
 		oracle: foucoco_runtime::OracleConfig {
 			max_delay: 604_800_000, // 7 days
@@ -766,6 +791,7 @@ fn foucoco_genesis(
 				Key::ExchangeRate(CurrencyId::Stellar(Asset::StellarNative)),
 				Key::ExchangeRate(TESTNET_USDC_CURRENCY_ID),
 			],
+			_phantom: sp_std::marker::PhantomData::default(),
 		},
 		vault_registry: foucoco_runtime::VaultRegistryConfig {
 			minimum_collateral_vault: vec![(XCM(0), 0)],
@@ -810,7 +836,10 @@ fn foucoco_genesis(
 			punishment_fee: FixedU128::checked_from_rational(1, 10).unwrap(), // 10%
 			replace_griefing_collateral: FixedU128::checked_from_rational(1, 10).unwrap(), // 10%
 		},
-		nomination: foucoco_runtime::NominationConfig { is_nomination_enabled: false },
+		nomination: foucoco_runtime::NominationConfig {
+			is_nomination_enabled: false,
+			_phantom: sp_std::marker::PhantomData::default(),
+		},
 		dia_oracle_module: foucoco_runtime::DiaOracleModuleConfig {
 			authorized_accounts: authorized_oracles,
 			supported_currencies: vec![
@@ -823,6 +852,11 @@ fn foucoco_genesis(
 			coin_infos_map: vec![],
 		},
 		token_allowance: foucoco_runtime::TokenAllowanceConfig { allowed_currencies },
+		transaction_payment: Default::default(),
+		treasury: Default::default(),
+		treasury_buyout_extension: Default::default(),
+		vesting: Default::default(),
+		zenlink_protocol: Default::default(),
 	}
 }
 
@@ -834,7 +868,7 @@ fn pendulum_genesis(
 	sudo_account: AccountId,
 	id: ParaId,
 	start_shutdown: bool,
-) -> pendulum_runtime::GenesisConfig {
+) -> pendulum_runtime::RuntimeGenesisConfig {
 	let mut genesis_issuance = pendulum::TOTAL_INITIAL_ISSUANCE;
 	for balance in balances.clone() {
 		genesis_issuance -= balance.1;
@@ -861,15 +895,19 @@ fn pendulum_genesis(
 		.map(|address| AccountId::from_ss58check(address).unwrap())
 		.collect();
 
-	pendulum_runtime::GenesisConfig {
+	pendulum_runtime::RuntimeGenesisConfig {
 		asset_registry: Default::default(),
 		system: pendulum_runtime::SystemConfig {
 			code: pendulum_runtime::WASM_BINARY
 				.expect("WASM binary was not build, please build it!")
 				.to_vec(),
+			_config: sp_std::marker::PhantomData::default(),
 		},
 		balances: pendulum_runtime::BalancesConfig { balances },
-		parachain_info: pendulum_runtime::ParachainInfoConfig { parachain_id: id },
+		parachain_info: pendulum_runtime::ParachainInfoConfig {
+			parachain_id: id,
+			_config: sp_std::marker::PhantomData::default(),
+		},
 		parachain_staking: pendulum_runtime::ParachainStakingConfig {
 			stakers,
 			inflation_config,
@@ -895,6 +933,7 @@ fn pendulum_genesis(
 		parachain_system: Default::default(),
 		polkadot_xcm: pendulum_runtime::PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),
+			_config: sp_std::marker::PhantomData::default(),
 		},
 		council: pendulum_runtime::CouncilConfig { members: council.clone(), ..Default::default() },
 		democracy: Default::default(),
@@ -931,6 +970,7 @@ fn pendulum_genesis(
 			} else {
 				pendulum_runtime::StatusCode::Error
 			},
+			_phantom: sp_std::marker::PhantomData::default(),
 		},
 		oracle: pendulum_runtime::OracleConfig {
 			max_delay: u32::MAX,
@@ -939,6 +979,7 @@ fn pendulum_genesis(
 				Key::ExchangeRate(CurrencyId::XCM(0)),
 				Key::ExchangeRate(MAINNET_USDC_CURRENCY_ID),
 			],
+			_phantom: sp_std::marker::PhantomData::default(),
 		},
 		vault_registry: pendulum_runtime::VaultRegistryConfig {
 			minimum_collateral_vault: vec![(XCM(0), 0)],
@@ -972,7 +1013,10 @@ fn pendulum_genesis(
 			punishment_fee: FixedU128::checked_from_rational(1, 10).unwrap(), // 10%
 			replace_griefing_collateral: FixedU128::checked_from_rational(1, 10).unwrap(), // 10%
 		},
-		nomination: pendulum_runtime::NominationConfig { is_nomination_enabled: false },
+		nomination: pendulum_runtime::NominationConfig {
+			is_nomination_enabled: false,
+			_phantom: sp_std::marker::PhantomData::default(),
+		},
 		dia_oracle_module: pendulum_runtime::DiaOracleModuleConfig {
 			authorized_accounts: authorized_oracles,
 			supported_currencies: vec![
@@ -984,5 +1028,10 @@ fn pendulum_genesis(
 			batching_api: b"https://dia-00.pendulumchain.tech/currencies".to_vec(),
 			coin_infos_map: vec![],
 		},
+		token_allowance: Default::default(),
+		transaction_payment: Default::default(),
+		treasury: Default::default(),
+		tokens: Default::default(),
+		treasury_buyout_extension: Default::default(),
 	}
 }
diff --git a/node/src/cli.rs b/node/src/cli.rs
index 9933a0d80..bc3fe47b7 100644
--- a/node/src/cli.rs
+++ b/node/src/cli.rs
@@ -93,7 +93,11 @@ impl RelayChainCli {
 	) -> Self {
 		let extension = crate::chain_spec::ParachainExtensions::try_get(&*para_config.chain_spec);
 		let chain_id = extension.map(|e| e.relay_chain.clone());
-		let base_path = para_config.base_path.as_ref().map(|x| x.path().join("polkadot"));
-		Self { base_path, chain_id, base: clap::Parser::parse_from(relay_chain_args) }
+		let base_path = para_config.base_path.path().join("polkadot");
+		Self {
+			base_path: Some(base_path),
+			chain_id,
+			base: clap::Parser::parse_from(relay_chain_args),
+		}
 	}
 }
diff --git a/node/src/command.rs b/node/src/command.rs
index ec33c71e6..f5cab045a 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -1,10 +1,8 @@
-use std::net::SocketAddr;
-
 use codec::Encode;
 use cumulus_client_cli::generate_genesis_block;
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
-use log::{info, trace};
+use log::info;
 use runtime_common::opaque::Block;
 use sc_chain_spec::GenericChainSpec;
 use sc_cli::{
@@ -18,11 +16,7 @@ use sc_service::{
 use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::traits::{AccountIdConversion, Block as BlockT};
 
-#[cfg(feature = "try-runtime")]
-use try_runtime_cli::block_building_info::substrate_info;
-
-#[cfg(feature = "try-runtime")]
-use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
+use sc_executor::NativeExecutionDispatch;
 
 use crate::{
 	chain_spec::{self, ParachainExtensions},
@@ -32,11 +26,6 @@ use crate::{
 	},
 };
 
-#[cfg(feature = "try-runtime")]
-/// The time internavel for block production on our chain in milliseconds (12
-/// seconds to millis)
-const BLOCK_TIME_MILLIS: u64 = 12 * 1_000;
-
 #[derive(PartialEq, Eq)]
 enum ChainIdentity {
 	Amplitude,
@@ -153,10 +142,6 @@ impl SubstrateCli for Cli {
 			None => ChainIdentity::from_json_file(id)?.load_chain_spec_from_json_file(id)?,
 		})
 	}
-
-	fn native_runtime_version(spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
-		spec.identify().get_runtime_version()
-	}
 }
 
 impl SubstrateCli for RelayChainCli {
@@ -193,10 +178,6 @@ impl SubstrateCli for RelayChainCli {
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
 		polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id)
 	}
-
-	fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
-		polkadot_cli::Cli::native_runtime_version(chain_spec)
-	}
 }
 
 macro_rules! construct_sync_run {
@@ -331,14 +312,10 @@ pub fn run() -> Result<()> {
 				cmd.run(config, polkadot_config)
 			})
 		},
-		Some(Subcommand::ExportGenesisState(cmd)) => {
-			let runner = cli.create_runner(cmd)?;
-			runner.sync_run(|_config| {
-				let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?;
-				let state_version = Cli::native_runtime_version(&spec).state_version();
-				cmd.run::<Block>(&*spec, state_version)
-			})
-		},
+		Some(Subcommand::ExportGenesisState(cmd)) =>
+			construct_async_run!(|components, cli, cmd, config| {
+				Ok(async move { cmd.run(&*config.chain_spec, &*components.client) })
+			}),
 		Some(Subcommand::ExportGenesisWasm(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.sync_run(|_config| {
@@ -352,12 +329,16 @@ pub fn run() -> Result<()> {
 					let runner = cli.create_runner(cmd)?;
 
 					match runner.config().chain_spec.identify() {
-						ChainIdentity::Amplitude => runner
-							.sync_run(|config| cmd.run::<Block, AmplitudeRuntimeExecutor>(config)),
-						ChainIdentity::Foucoco => runner
-							.sync_run(|config| cmd.run::<Block, FoucocoRuntimeExecutor>(config)),
-						ChainIdentity::Pendulum => runner
-							.sync_run(|config| cmd.run::<Block, PendulumRuntimeExecutor>(config)),
+						ChainIdentity::Amplitude => runner.sync_run(|config| {
+							cmd.run::<Block, <AmplitudeRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions>(config)
+						}),
+						ChainIdentity::Foucoco =>
+							runner.sync_run(|config| {
+								cmd.run::<Block, <FoucocoRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions>(config)
+							}),
+						ChainIdentity::Pendulum => runner.sync_run(|config| {
+							cmd.run::<Block, <PendulumRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions>(config)
+						}),
 						ChainIdentity::FoucocoStandalone => unimplemented!(),
 					}
 				} else {
@@ -393,41 +374,11 @@ pub fn run() -> Result<()> {
 			_ => Err("Benchmarking sub-command unsupported".into()),
 		},
 		#[cfg(feature = "try-runtime")]
-		Some(Subcommand::TryRuntime(cmd)) => {
-			if cfg!(feature = "try-runtime") {
-				let runner = cli.create_runner(cmd)?;
-
-				// grab the task manager.
-				let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry);
-				let task_manager =
-					sc_service::TaskManager::new(runner.config().tokio_handle.clone(), *registry)
-						.map_err(|e| format!("Error: {:?}", e))?;
-
-				match runner.config().chain_spec.identify() {
-					ChainIdentity::Amplitude => runner.async_run(|_config| {
-						Ok((cmd.run::<Block, ExtendedHostFunctions<
-							sp_io::SubstrateHostFunctions,
-							<AmplitudeRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
-						>, _>(Some(substrate_info(BLOCK_TIME_MILLIS))), task_manager))
-					}),
-					ChainIdentity::Foucoco => runner.async_run(|_config| {
-						Ok((cmd.run::<Block, ExtendedHostFunctions<
-							sp_io::SubstrateHostFunctions,
-							<FoucocoRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
-						>, _>(Some(substrate_info(BLOCK_TIME_MILLIS))), task_manager))
-					}),
-					ChainIdentity::Pendulum => runner.async_run(|_config| {
-						Ok((cmd.run::<Block, ExtendedHostFunctions<
-							sp_io::SubstrateHostFunctions,
-							<PendulumRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
-						>, _>(Some(substrate_info(BLOCK_TIME_MILLIS))), task_manager))
-					}),
-					ChainIdentity::FoucocoStandalone => unimplemented!(),
-				}
-			} else {
-				Err("Try-runtime must be enabled by `--features try-runtime`.".into())
-			}
-		},
+		Some(Subcommand::TryRuntime(_cmd)) => Err("The `try-runtime` subcommand has been migrated to a \
+			standalone CLI (https://github.com/paritytech/try-runtime-cli). It is no longer \
+			being maintained here and will be removed entirely some time after January 2024. \
+			Please remove this subcommand from your runtime and use the standalone CLI."
+			.into()),
 
 		None => {
 			let runner = cli.create_runner(&cli.run.normalize())?;
@@ -480,9 +431,9 @@ async fn start_node(
 	let id = ParaId::from(para_id);
 
 	let parachain_account =
-		AccountIdConversion::<polkadot_primitives::v4::AccountId>::into_account_truncating(&id);
+		AccountIdConversion::<polkadot_primitives::v5::AccountId>::into_account_truncating(&id);
 
-	let state_version = Cli::native_runtime_version(&config.chain_spec).state_version();
+	let state_version = config.chain_spec.identify().get_runtime_version().state_version();
 	let block: Block =
 		generate_genesis_block(&*config.chain_spec, state_version).map_err(|e| format!("{e:?}"))?;
 	let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
@@ -497,10 +448,6 @@ async fn start_node(
 	info!("Parachain genesis state: {}", genesis_state);
 	info!("Is collating: {}", if config.role.is_authority() { "yes" } else { "no" });
 
-	if !collator_options.relay_chain_rpc_urls.is_empty() && cli.relay_chain_args.is_empty() {
-		trace!("Detected relay chain node arguments together with --relay-chain-rpc-url. This command starts a minimal Polkadot node that only uses a network-related subset of all relay chain CLI options.");
-	}
-
 	match config.chain_spec.identify() {
 		ChainIdentity::Amplitude => {
 			sp_core::crypto::set_default_ss58_version(amplitude_runtime::SS58Prefix::get().into());
@@ -554,14 +501,6 @@ impl DefaultConfigurationValues for RelayChainCli {
 		30334
 	}
 
-	fn rpc_ws_listen_port() -> u16 {
-		9945
-	}
-
-	fn rpc_http_listen_port() -> u16 {
-		9934
-	}
-
 	fn prometheus_listen_port() -> u16 {
 		9616
 	}
@@ -591,18 +530,6 @@ impl CliConfiguration<Self> for RelayChainCli {
 			.or_else(|| self.base_path.clone().map(Into::into)))
 	}
 
-	fn rpc_http(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {
-		self.base.base.rpc_http(default_listen_port)
-	}
-
-	fn rpc_ipc(&self) -> Result<Option<String>> {
-		self.base.base.rpc_ipc()
-	}
-
-	fn rpc_ws(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {
-		self.base.base.rpc_ws(default_listen_port)
-	}
-
 	fn prometheus_config(
 		&self,
 		default_listen_port: u16,
@@ -646,10 +573,6 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.rpc_methods()
 	}
 
-	fn rpc_ws_max_connections(&self) -> Result<Option<usize>> {
-		self.base.base.rpc_ws_max_connections()
-	}
-
 	fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {
 		self.base.base.rpc_cors(is_dev)
 	}
diff --git a/node/src/rpc.rs b/node/src/rpc.rs
index 122c9f69c..4ebcf8b77 100644
--- a/node/src/rpc.rs
+++ b/node/src/rpc.rs
@@ -10,7 +10,7 @@ use std::sync::Arc;
 pub use sc_rpc::DenyUnsafe;
 use sc_transaction_pool_api::TransactionPool;
 
-use bifrost_farming_rpc_api::{FarmingRpc, FarmingRpcApiServer};
+use bifrost_farming_rpc::{FarmingRpc, FarmingRpcApiServer};
 
 use zenlink_protocol_rpc::{ZenlinkProtocol, ZenlinkProtocolApiServer};
 
diff --git a/node/src/service.rs b/node/src/service.rs
index 8f3993263..42294c549 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -3,26 +3,29 @@
 // std
 use std::{sync::Arc, time::Duration};
 
-use cumulus_client_cli::CollatorOptions;
+use cumulus_client_cli::{CollatorOptions, RelayChainMode};
 // Local Runtime Types
 use runtime_common::{opaque::Block, AccountId, Balance, Index as Nonce};
 
 // Cumulus Imports
-use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion};
-use cumulus_client_consensus_common::{
-	ParachainBlockImport as TParachainBlockImport, ParachainConsensus,
+use cumulus_client_collator::service::CollatorService;
+use cumulus_client_consensus_aura::collators::basic::{
+	self as basic_aura, Params as BasicAuraParams,
 };
-use cumulus_client_network::BlockAnnounceValidator;
+use cumulus_client_consensus_common::ParachainBlockImport as TParachainBlockImport;
+use cumulus_client_consensus_proposer::Proposer;
+use cumulus_client_network::RequireSecondedInBlockAnnounce;
 use cumulus_client_service::{
-	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
+	prepare_node_config, start_relay_chain_tasks, DARecoveryProfile, StartRelayChainTasksParams,
 };
-use cumulus_primitives_core::ParaId;
+use cumulus_primitives_core::{relay_chain::Hash, ParaId};
 use cumulus_primitives_parachain_inherent::{
 	MockValidationDataInherentDataProvider, MockXcmConfig,
 };
 use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain;
 use cumulus_relay_chain_interface::{RelayChainInterface, RelayChainResult};
-use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node;
+use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node_with_rpc;
+
 // Substrate Imports
 use sc_executor::{
 	HeapAllocStrategy, NativeElseWasmExecutor, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY,
@@ -41,12 +44,16 @@ use sp_keystore::KeystorePtr;
 use sp_runtime::traits::BlakeTwo256;
 use substrate_prometheus_endpoint::Registry;
 
-use polkadot_service::CollatorPair;
-use sc_consensus::{import_queue::ImportQueueService, ImportQueue};
-
 use crate::rpc::{
 	create_full_amplitude, create_full_foucoco, create_full_pendulum, FullDeps, ResultRpcExtension,
 };
+use polkadot_service::{CollatorPair, Handle};
+use sc_consensus::{import_queue::ImportQueueService, ImportQueue};
+use sc_transaction_pool_api::OffchainTransactionPoolFactory;
+
+use sc_client_api::Backend;
+
+use futures::FutureExt;
 
 pub use amplitude_runtime::RuntimeApi as AmplitudeRuntimeApi;
 pub use foucoco_runtime::RuntimeApi as FoucocoRuntimeApi;
@@ -70,10 +77,7 @@ type FullPool<RuntimeApi, Executor> = sc_transaction_pool::FullPool<
 	TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>,
 >;
 
-type DefaultImportQueue<RuntimeApi, Executor> = sc_consensus::DefaultImportQueue<
-	Block,
-	TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>,
->;
+type DefaultImportQueue = sc_consensus::DefaultImportQueue<Block>;
 
 type OtherComponents<RuntimeApi, Executor> =
 	(ParachainBlockImport<RuntimeApi, Executor>, Option<Telemetry>, Option<TelemetryWorkerHandle>);
@@ -82,7 +86,7 @@ pub trait ParachainRuntimeApiImpl:
 	sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
 	+ sp_api::Metadata<Block>
 	+ sp_session::SessionKeys<Block>
-	+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<TFullBackend<Block>, Block>>
+	+ sp_api::ApiExt<Block>
 	+ sp_offchain::OffchainWorkerApi<Block>
 	+ sp_block_builder::BlockBuilder<Block>
 	+ cumulus_primitives_core::CollectCollationInfo<Block>
@@ -130,7 +134,10 @@ impl sc_executor::NativeExecutionDispatch for FoucocoRuntimeExecutor {
 pub struct PendulumRuntimeExecutor;
 
 impl sc_executor::NativeExecutionDispatch for PendulumRuntimeExecutor {
+	#[cfg(feature = "runtime-benchmarks")]
 	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type ExtendHostFunctions = ();
 
 	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
 		pendulum_runtime::api::dispatch(method, data)
@@ -145,7 +152,7 @@ type ResultNewPartial<RuntimeApi, Executor> = PartialComponents<
 	TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>,
 	TFullBackend<Block>,
 	(),
-	DefaultImportQueue<RuntimeApi, Executor>,
+	DefaultImportQueue,
 	FullPool<RuntimeApi, Executor>,
 	OtherComponents<RuntimeApi, Executor>,
 >;
@@ -264,13 +271,8 @@ async fn build_relay_chain_interface(
 	collator_options: CollatorOptions,
 	hwbench: Option<sc_sysinfo::HwBench>,
 ) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option<CollatorPair>)> {
-	if !collator_options.relay_chain_rpc_urls.is_empty() {
-		build_minimal_relay_chain_node(
-			polkadot_config,
-			task_manager,
-			collator_options.relay_chain_rpc_urls,
-		)
-		.await
+	if let RelayChainMode::ExternalRpc(rpc) = collator_options.relay_chain_mode {
+		build_minimal_relay_chain_node_with_rpc(polkadot_config, task_manager, rpc).await
 	} else {
 		build_inprocess_relay_chain(
 			polkadot_config,
@@ -296,7 +298,9 @@ async fn setup_common_services<RuntimeApi, Executor>(
 	parachain_config: Configuration,
 	params: ResultNewPartial<RuntimeApi, Executor>,
 	create_full_rpc: fn(deps: FullDepsOf<RuntimeApi, Executor>) -> ResultRpcExtension,
-	block_announce_validator: Option<BlockAnnounceValidator<Block, Arc<dyn RelayChainInterface>>>,
+	block_announce_validator: Option<
+		RequireSecondedInBlockAnnounce<Block, Arc<dyn RelayChainInterface>>,
+	>,
 ) -> Result<
 	(
 		NetworkStarter,
@@ -322,9 +326,12 @@ where
 	let (block_import, mut telemetry, _telemetry_worker_handle) = params.other;
 	let import_queue_service = params.import_queue.service();
 
+	let net_config = sc_network::config::FullNetworkConfiguration::new(&parachain_config.network);
+
 	let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &parachain_config,
+			net_config,
 			client: client.clone(),
 			transaction_pool: params.transaction_pool.clone(),
 			spawn_handle: task_manager.spawn_handle(),
@@ -350,11 +357,23 @@ where
 	};
 
 	if parachain_config.offchain_worker.enabled {
-		sc_service::build_offchain_workers(
-			&parachain_config,
-			task_manager.spawn_handle(),
-			client.clone(),
-			network.clone(),
+		task_manager.spawn_handle().spawn(
+			"offchain-workers-runner",
+			"offchain-worker",
+			sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
+				runtime_api_provider: client.clone(),
+				is_validator: parachain_config.role.is_authority(),
+				keystore: Some(params.keystore_container.keystore()),
+				offchain_db: backend.offchain_storage(),
+				transaction_pool: Some(OffchainTransactionPoolFactory::new(
+					params.transaction_pool.clone(),
+				)),
+				network_provider: network.clone(),
+				enable_http_requests: true,
+				custom_extensions: |_| vec![],
+			})
+			.run(client.clone(), task_manager.spawn_handle())
+			.boxed(),
 		);
 	}
 
@@ -416,9 +435,9 @@ where
 	)
 	.await
 	.map_err(|e| sc_service::Error::Application(Box::new(e)))?;
-	let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id);
+	let block_announce_validator =
+		RequireSecondedInBlockAnnounce::new(relay_chain_interface.clone(), id);
 
-	let force_authoring = parachain_config.force_authoring;
 	let validator = parachain_config.role.is_authority();
 	let prometheus_registry = parachain_config.prometheus_registry().cloned();
 	let transaction_pool = params.transaction_pool.clone();
@@ -452,19 +471,36 @@ where
 		}
 	}
 
-	let announce_block = {
-		let sync_service = sync_service.clone();
-		Arc::new(move |hash, data| sync_service.announce_block(hash, data))
-	};
-
 	let relay_chain_slot_duration = Duration::from_secs(6);
 
 	let overseer_handle = relay_chain_interface
 		.overseer_handle()
 		.map_err(|e| sc_service::Error::Application(Box::new(e)))?;
 
+	let announce_block = {
+		let sync_service = sync_service.clone();
+		Arc::new(move |hash, data| sync_service.announce_block(hash, data))
+	};
+
+	start_relay_chain_tasks(StartRelayChainTasksParams {
+		client: client.clone(),
+		announce_block: announce_block.clone(),
+		para_id: id,
+		relay_chain_interface: relay_chain_interface.clone(),
+		task_manager: &mut task_manager,
+		da_recovery_profile: if validator {
+			DARecoveryProfile::Collator
+		} else {
+			DARecoveryProfile::FullNode
+		},
+		import_queue: import_queue_service,
+		relay_chain_slot_duration,
+		recovery_handle: Box::new(overseer_handle.clone()),
+		sync_service: sync_service.clone(),
+	})?;
+
 	if validator {
-		let parachain_consensus = build_consensus(
+		start_consensus(
 			client.clone(),
 			block_import,
 			prometheus_registry.as_ref(),
@@ -474,42 +510,12 @@ where
 			transaction_pool,
 			sync_service.clone(),
 			keystore_ptr,
-			force_authoring,
+			overseer_handle.clone(),
 			id,
-		)?;
-
-		let spawner = task_manager.spawn_handle();
-		let params = StartCollatorParams {
-			para_id: id,
-			block_status: client.clone(),
-			announce_block,
-			client: client.clone(),
-			task_manager: &mut task_manager,
-			relay_chain_interface,
-			spawner,
-			parachain_consensus,
-			import_queue: import_queue_service,
-			collator_key: collator_key.expect("Command line arguments do not allow this. qed"),
-			relay_chain_slot_duration,
-			recovery_handle: Box::new(overseer_handle),
-			sync_service: sync_service.clone(),
-		};
-
-		start_collator(params).await?;
-	} else {
-		let params = StartFullNodeParams {
-			client: client.clone(),
-			announce_block,
-			task_manager: &mut task_manager,
-			para_id: id,
-			relay_chain_interface,
 			relay_chain_slot_duration,
-			import_queue: import_queue_service,
-			recovery_handle: Box::new(overseer_handle),
-			sync_service: sync_service.clone(),
-		};
-
-		start_full_node(params)?;
+			collator_key.clone().expect("Command line arguments do not allow this. qed"),
+			announce_block.clone(),
+		)?;
 	}
 
 	start_network.start_network();
@@ -524,7 +530,7 @@ fn build_import_queue<RuntimeApi, Executor>(
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
 	task_manager: &TaskManager,
-) -> Result<DefaultImportQueue<RuntimeApi, Executor>, sc_service::Error>
+) -> Result<DefaultImportQueue, sc_service::Error>
 where
 	RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>
 		+ Send
@@ -657,7 +663,7 @@ where
 }
 
 #[allow(clippy::too_many_arguments)]
-fn build_consensus<RuntimeApi, Executor>(
+fn start_consensus<RuntimeApi, Executor>(
 	client: Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>,
 	block_import: ParachainBlockImport<RuntimeApi, Executor>,
 	prometheus_registry: Option<&Registry>,
@@ -667,9 +673,12 @@ fn build_consensus<RuntimeApi, Executor>(
 	transaction_pool: Arc<FullPool<RuntimeApi, Executor>>,
 	sync_oracle: Arc<SyncingService<Block>>,
 	keystore: KeystorePtr,
-	force_authoring: bool,
+	overseer_handle: Handle,
 	id: ParaId,
-) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>
+	relay_chain_slot_duration: Duration,
+	collator_key: CollatorPair,
+	announce_block: Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,
+) -> Result<(), sc_service::Error>
 where
 	RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>
 		+ Send
@@ -688,51 +697,39 @@ where
 		prometheus_registry,
 		telemetry.clone(),
 	);
+	let proposer = Proposer::new(proposer_factory);
 
-	let params = BuildAuraConsensusParams {
-		proposer_factory,
-		create_inherent_data_providers: move |_, (relay_parent, validation_data)| {
-			let relay_chain_interface = relay_chain_interface.clone();
-			async move {
-				let parachain_inherent =
-					cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(
-						relay_parent,
-						&relay_chain_interface,
-						&validation_data,
-						id,
-					)
-					.await;
-				let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
-
-				let slot =
-						sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
-							*timestamp,
-							slot_duration,
-						);
-
-				let parachain_inherent = parachain_inherent.ok_or_else(|| {
-					Box::<dyn std::error::Error + Send + Sync>::from(
-						"Failed to create parachain inherent",
-					)
-				})?;
-				Ok((slot, timestamp, parachain_inherent))
-			}
-		},
+	let collator_service = CollatorService::new(
+		client.clone(),
+		Arc::new(task_manager.spawn_handle()),
+		announce_block.clone(),
+		client.clone(),
+	);
+
+	let params = BasicAuraParams {
+		proposer,
+		create_inherent_data_providers: move |_, ()| async move { Ok(()) },
 		block_import,
+		collator_key,
+		collator_service,
 		para_client: client,
-		backoff_authoring_blocks: Option::<()>::None,
+		relay_client: relay_chain_interface,
 		sync_oracle,
 		keystore,
-		force_authoring,
 		slot_duration,
-		// We got around 500ms for proposing
-		block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32),
-		// And a maximum of 750ms if slots are skipped
-		max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)),
-		telemetry,
+		authoring_duration: Duration::from_millis(500),
+		relay_chain_slot_duration,
+		para_id: id,
+		overseer_handle,
 	};
 
-	Ok(AuraConsensus::build::<sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _>(params))
+	let fut =
+		basic_aura::run::<Block, sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _, _>(
+			params,
+		);
+
+	task_manager.spawn_essential_handle().spawn("aura", None, fut);
+	Ok(())
 }
 
 /// Start a parachain node.
diff --git a/pallets/orml-currencies-allowance-extension/Cargo.toml b/pallets/orml-currencies-allowance-extension/Cargo.toml
index c5a782b19..f30d1941a 100644
--- a/pallets/orml-currencies-allowance-extension/Cargo.toml
+++ b/pallets/orml-currencies-allowance-extension/Cargo.toml
@@ -6,36 +6,36 @@ version = "1.0.0"
 
 [dependencies]
 codec = {package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"]}
-scale-info = {version = "2.2.0", default-features = false, features = ["derive"]}
-serde = {version = "1.0.130", default-features = false, features = ["derive"], optional = true}
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"]}
+serde = {version = "1.0.136", default-features = false, features = ["derive"]}
 sha2 = {version = "0.8.2", default-features = false}
 
 # Substrate dependencies
-frame-support = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-sp-core = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-sp-runtime = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-sp-std = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true }
 
-orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
-pallet-balances = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
+orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0", default-features = false }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0", default-features = false }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true }
 
 [dev-dependencies]
 mocktopus = "0.8.0"
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-io = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
-pallet-balances = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
+pallet-balances = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
 
 
 [features]
 default = ["std"]
 std = [
-  "serde",
+  "serde/std",
   "codec/std",
   "sha2/std",
   "sp-core/std",
diff --git a/pallets/orml-currencies-allowance-extension/src/lib.rs b/pallets/orml-currencies-allowance-extension/src/lib.rs
index c23f93984..b4cdfda56 100644
--- a/pallets/orml-currencies-allowance-extension/src/lib.rs
+++ b/pallets/orml-currencies-allowance-extension/src/lib.rs
@@ -13,6 +13,8 @@ use orml_traits::MultiCurrency;
 use sp_runtime::traits::*;
 use sp_std::{convert::TryInto, prelude::*, vec};
 
+pub use default_weights::WeightInfo;
+
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 
@@ -107,7 +109,6 @@ pub mod pallet {
 		pub allowed_currencies: Vec<CurrencyOf<T>>,
 	}
 
-	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
 			Self { allowed_currencies: vec![] }
@@ -115,7 +116,7 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			for i in &self.allowed_currencies.clone() {
 				AllowedCurrencies::<T>::insert(i, ());
@@ -238,7 +239,12 @@ pub mod pallet {
 	}
 }
 
-#[allow(clippy::forget_non_drop, clippy::swap_ptr_to_ref, forgetting_references, forgetting_copy_types)]
+#[allow(
+	clippy::forget_non_drop,
+	clippy::swap_ptr_to_ref,
+	forgetting_references,
+	forgetting_copy_types
+)]
 #[cfg_attr(test, mockable)]
 impl<T: Config> Pallet<T> {
 	// Check the amount approved to be spent by an owner to a delegate
diff --git a/pallets/orml-currencies-allowance-extension/src/mock.rs b/pallets/orml-currencies-allowance-extension/src/mock.rs
index e8459620d..b251cbcca 100644
--- a/pallets/orml-currencies-allowance-extension/src/mock.rs
+++ b/pallets/orml-currencies-allowance-extension/src/mock.rs
@@ -7,31 +7,26 @@ use orml_currencies::BasicCurrencyAdapter;
 use orml_traits::parameter_type_with_key;
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
 };
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Config<T>, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		Currencies: orml_currencies::{Pallet, Call},
-		TokenAllowance: token_allowance::{Pallet, Storage, Call, Event<T>},
+	pub enum Test {
+		System: frame_system,
+		Tokens: orml_tokens,
+		Balances: pallet_balances,
+		Currencies: orml_currencies,
+		TokenAllowance: token_allowance,
 	}
 );
 
 pub type AccountId = u64;
 pub type Balance = u128;
 pub type BlockNumber = u64;
-pub type Index = u64;
+pub type Nonce = u64;
 pub type Amount = i64;
 pub type CurrencyId = u64;
 
@@ -40,19 +35,18 @@ parameter_types! {
 	pub const SS58Prefix: u8 = 42;
 }
 impl frame_system::Config for Test {
+	type Block = Block;
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = Index;
-	type BlockNumber = BlockNumber;
+	type Nonce = Nonce;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
 	type RuntimeEvent = TestEvent;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
@@ -128,7 +122,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type MaxHolds = ConstU32<1>;
-	type HoldIdentifier = RuntimeHoldReason;
+	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
 impl orml_currencies::Config for Test {
@@ -148,7 +142,7 @@ pub struct ExtBuilder;
 
 impl ExtBuilder {
 	pub fn build() -> sp_io::TestExternalities {
-		let storage = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let storage = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 
 		sp_io::TestExternalities::from(storage)
 	}
diff --git a/pallets/orml-tokens-management-extension/Cargo.toml b/pallets/orml-tokens-management-extension/Cargo.toml
index d592ad636..7aab7c288 100644
--- a/pallets/orml-tokens-management-extension/Cargo.toml
+++ b/pallets/orml-tokens-management-extension/Cargo.toml
@@ -7,39 +7,37 @@ version = "1.0.0"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true }
+serde = { version = "1.0.130", default-features = false, features = ["derive"] }
 sha2 = { version = "0.8.2", default-features = false }
 
 # Substrate dependencies
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true }
 
-orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
+orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
 
 
 
 [dev-dependencies]
 mocktopus = "0.8.0"
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0"}
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 # Spacewalk libraries
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 
 
 [features]
 default = ["std"]
 std = [
-    "serde",
+    "serde/std",
     "codec/std",
     "sha2/std",
     "sp-core/std",
diff --git a/pallets/orml-tokens-management-extension/src/benchmarking.rs b/pallets/orml-tokens-management-extension/src/benchmarking.rs
index 0ff3de564..f0c1e6c00 100644
--- a/pallets/orml-tokens-management-extension/src/benchmarking.rs
+++ b/pallets/orml-tokens-management-extension/src/benchmarking.rs
@@ -12,6 +12,7 @@ use orml_traits::{
 use sp_runtime::traits::Get;
 use sp_std::prelude::*;
 
+use sp_runtime::Saturating;
 const AMOUNT_MINTED: u32 = 2000000000;
 const AMOUNT_BURNED: u32 = 1000000000;
 
@@ -22,11 +23,11 @@ fn get_test_currency<T: Config>() -> CurrencyOf<T> {
 // mint some tokens to the account
 fn set_up_account<T: Config>(account: &AccountIdOf<T>) {
 	let token_currency_id = get_test_currency::<T>();
-
+    let deposit_amount = <T as crate::Config>::AssetDeposit::get();
 	assert_ok!(<orml_currencies::Pallet<T> as MultiCurrency<AccountIdOf<T>>>::deposit(
 		token_currency_id,
 		&account,
-		<T as crate::Config>::AssetDeposit::get()
+		deposit_amount.saturating_mul(deposit_amount)
 	));
 }
 
diff --git a/pallets/orml-tokens-management-extension/src/ext.rs b/pallets/orml-tokens-management-extension/src/ext.rs
index 1de51cf2b..3cb1a5077 100644
--- a/pallets/orml-tokens-management-extension/src/ext.rs
+++ b/pallets/orml-tokens-management-extension/src/ext.rs
@@ -2,7 +2,7 @@
 use mocktopus::macros::mockable;
 
 #[cfg_attr(test, mockable)]
-pub(crate) mod orml_tokens {
+pub(crate) mod orml_currencies_ext {
 	use crate::types::{AccountIdOf, BalanceOf, CurrencyOf};
 	use frame_support::traits::BalanceStatus;
 	use orml_traits::{MultiCurrency, MultiReservableCurrency};
diff --git a/pallets/orml-tokens-management-extension/src/lib.rs b/pallets/orml-tokens-management-extension/src/lib.rs
index d2c35e962..81dd145e9 100644
--- a/pallets/orml-tokens-management-extension/src/lib.rs
+++ b/pallets/orml-tokens-management-extension/src/lib.rs
@@ -127,7 +127,7 @@ pub mod pallet {
 			ensure!(!CurrencyData::<T>::contains_key(currency_id), Error::<T>::AlreadyCreated);
 
 			let deposit = T::AssetDeposit::get();
-			ext::orml_tokens::reserve::<T>(T::DepositCurrency::get(), &creator, deposit)
+			ext::orml_currencies_ext::reserve::<T>(T::DepositCurrency::get(), &creator, deposit)
 				.map_err(|_| Error::<T>::InsufficientBalance)?;
 
 			CurrencyData::<T>::insert(
@@ -175,7 +175,7 @@ pub mod pallet {
 			ensure!(origin == currency_data.issuer, Error::<T>::NoPermission);
 
 			// do mint via orml-currencies
-			ext::orml_tokens::mint::<T>(currency_id, &to, amount)?;
+			ext::orml_currencies_ext::mint::<T>(currency_id, &to, amount)?;
 
 			Self::deposit_event(Event::Mint { currency_id, to, amount });
 			Ok(())
@@ -207,7 +207,7 @@ pub mod pallet {
 			ensure!(origin == currency_data.admin, Error::<T>::NoPermission);
 
 			// do burn via orml-currencies
-			ext::orml_tokens::burn::<T>(currency_id, &from, amount)?;
+			ext::orml_currencies_ext::burn::<T>(currency_id, &from, amount)?;
 
 			Self::deposit_event(Event::Burned { currency_id, from, amount });
 			Ok(())
@@ -241,7 +241,7 @@ pub mod pallet {
 				details.owner = new_owner.clone();
 
 				// move reserved balance to the new owner's account
-				ext::orml_tokens::repatriate_reserve::<T>(
+				ext::orml_currencies_ext::repatriate_reserve::<T>(
 					T::DepositCurrency::get(),
 					&origin,
 					&new_owner,
@@ -277,7 +277,7 @@ pub mod pallet {
 				if details.owner == new_owner {
 					return Ok(())
 				}
-				ext::orml_tokens::repatriate_reserve::<T>(
+				ext::orml_currencies_ext::repatriate_reserve::<T>(
 					T::DepositCurrency::get(),
 					&details.owner,
 					&new_owner,
diff --git a/pallets/orml-tokens-management-extension/src/mock.rs b/pallets/orml-tokens-management-extension/src/mock.rs
index 24fb7633e..24ab3e058 100644
--- a/pallets/orml-tokens-management-extension/src/mock.rs
+++ b/pallets/orml-tokens-management-extension/src/mock.rs
@@ -3,7 +3,6 @@ use crate::{
 	CurrencyIdCheck,
 };
 use frame_support::{
-	pallet_prelude::GenesisBuild,
 	parameter_types,
 	traits::{ConstU32, Everything},
 };
@@ -11,31 +10,27 @@ use orml_currencies::BasicCurrencyAdapter;
 use orml_traits::parameter_type_with_key;
 use sp_core::{ConstU128, H256};
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
 };
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Config<T>, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		Currencies: orml_currencies::{Pallet, Call},
-		TokensExtension: orml_tokens_management_extension::{Pallet, Storage, Call, Event<T>},
+		System: frame_system,
+		Tokens: orml_tokens,
+		Balances: pallet_balances,
+		Currencies: orml_currencies,
+		TokensExtension: orml_tokens_management_extension,
 	}
 );
 
 pub type AccountId = u64;
 pub type Balance = u128;
 pub type BlockNumber = u64;
-pub type Index = u64;
+pub type Nonce = u64;
 pub type Amount = i64;
 pub type CurrencyId = u64;
 
@@ -44,19 +39,18 @@ parameter_types! {
 	pub const SS58Prefix: u8 = 42;
 }
 impl frame_system::Config for Test {
+	type Block = Block;
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = Index;
-	type BlockNumber = BlockNumber;
+	type Nonce = Nonce;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
 	type RuntimeEvent = TestEvent;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
@@ -131,7 +125,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type MaxHolds = ConstU32<1>;
-	type HoldIdentifier = RuntimeHoldReason;
+	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
 impl orml_currencies::Config for Test {
@@ -173,7 +167,7 @@ pub struct ExtBuilder;
 
 impl ExtBuilder {
 	pub fn build() -> sp_io::TestExternalities {
-		let mut storage = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let mut storage = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 
 		let native_currency_id = GetNativeCurrencyId::get();
 
diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml
index 869191bad..357c008de 100644
--- a/pallets/parachain-staking/Cargo.toml
+++ b/pallets/parachain-staking/Cargo.toml
@@ -6,32 +6,33 @@ name = "parachain-staking"
 version = "1.7.2"
 
 [dev-dependencies]
-pallet-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
-pallet-timestamp = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
-sp-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
-sp-core = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
-sp-io = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
+pallet-aura =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
+pallet-timestamp =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
+sp-consensus-aura =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
+sp-core =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
+sp-io =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
 
 [dependencies]
-log = "0.4.17"
+log = { version = "0.4.17", default-features = false }
 parity-scale-codec = {version = "3.1.5", default-features = false, features = ["derive"]}
 scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
-serde = {version = "1.0.142", optional = true}
-sp-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
+serde = {version = "1.0.142", default-features = false}
+serde_derive = { version = "1.0.117" }
+sp-api =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 module-pallet-staking-rpc-runtime-api = { path = "./rpc/runtime-api", default-features = false }
 
-
-frame-support = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-pallet-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-pallet-balances = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-pallet-session = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-sp-runtime = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-sp-staking = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-sp-std = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
+frame-support =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-system =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-authorship =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-balances =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-session =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-runtime =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-staking =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-std =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-arithmetic =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
 # benchmarking
-frame-benchmarking = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true}
+frame-benchmarking =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true}
 
 [features]
 default = ["std"]
@@ -42,6 +43,7 @@ runtime-benchmarks = [
   "pallet-balances/runtime-benchmarks",
 ]
 std = [
+  "serde/std",
   "frame-support/std",
   "frame-system/std",
   "log/std",
@@ -51,11 +53,11 @@ std = [
   "pallet-session/std",
   "parity-scale-codec/std",
   "scale-info/std",
-  "serde",
   "sp-api/std",
   "sp-runtime/std",
   "sp-staking/std",
   "sp-std/std",
+  "sp-arithmetic/std"
 ]
 try-runtime = [
   "frame-support/try-runtime",
diff --git a/pallets/parachain-staking/rpc/Cargo.toml b/pallets/parachain-staking/rpc/Cargo.toml
index 2e5fd11ea..b1d6325e7 100644
--- a/pallets/parachain-staking/rpc/Cargo.toml
+++ b/pallets/parachain-staking/rpc/Cargo.toml
@@ -7,8 +7,8 @@ version = "1.0.0"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 jsonrpsee = { version = "0.16.0", features = ["server", "macros"] }
-module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-pallet-staking-rpc-runtime-api = { path = "runtime-api" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-pallet-staking-rpc-runtime-api = { path = "runtime-api", default-features = false }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
\ No newline at end of file
diff --git a/pallets/parachain-staking/rpc/runtime-api/Cargo.toml b/pallets/parachain-staking/rpc/runtime-api/Cargo.toml
index 8d838e82a..8ef7e8542 100644
--- a/pallets/parachain-staking/rpc/runtime-api/Cargo.toml
+++ b/pallets/parachain-staking/rpc/runtime-api/Cargo.toml
@@ -5,22 +5,24 @@ name = "module-pallet-staking-rpc-runtime-api"
 version = "1.0.0"
 
 [dependencies]
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-serde = { version = "1.0.142", default-features = false, optional = true, features = ["derive"] }
+module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+serde = { version = "1.0.142", default-features = false, features = ["derive"] }
+sp-arithmetic =  { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
 [features]
 default = ["std"]
 std = [
-    "serde",
+    "serde/std",
     "frame-support/std",
     "scale-info/std",
     "sp-api/std",
     "sp-std/std",
     "parity-scale-codec/std",
     "module-oracle-rpc-runtime-api/std",
+    "sp-arithmetic/std"
 ]
diff --git a/pallets/parachain-staking/rpc/runtime-api/src/lib.rs b/pallets/parachain-staking/rpc/runtime-api/src/lib.rs
index af488b967..dffa466ed 100644
--- a/pallets/parachain-staking/rpc/runtime-api/src/lib.rs
+++ b/pallets/parachain-staking/rpc/runtime-api/src/lib.rs
@@ -1,9 +1,10 @@
 //! Runtime API definition for Parachain Staking.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-use frame_support::{scale_info::TypeInfo, sp_runtime::Perquintill};
 use module_oracle_rpc_runtime_api::BalanceWrapper;
 use parity_scale_codec::{Codec, Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
+use sp_arithmetic::per_things::Perquintill;
 use sp_std::fmt::Debug;
 
 #[cfg(feature = "std")]
diff --git a/pallets/parachain-staking/src/benchmarking.rs b/pallets/parachain-staking/src/benchmarking.rs
index 053003a51..469ab640f 100644
--- a/pallets/parachain-staking/src/benchmarking.rs
+++ b/pallets/parachain-staking/src/benchmarking.rs
@@ -15,17 +15,17 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
-#![cfg(feature = "runtime-benchmarks")]
 
 //! Benchmarking
 use crate::{types::RoundInfo, *};
-use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, Zero};
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite};
 use frame_support::{
 	assert_ok,
 	traits::{Currency, Get, OnInitialize},
 };
-use frame_system::{Pallet as System, RawOrigin};
+use frame_system::{pallet_prelude::BlockNumberFor, Pallet as System, RawOrigin};
 use pallet_session::Pallet as Session;
+use sp_arithmetic::traits::Zero;
 use sp_runtime::{
 	traits::{One, SaturatedConversion, StaticLookup},
 	Perquintill,
@@ -100,7 +100,7 @@ fn fill_unstaking<T: Config>(
 	delegator: Option<&T::AccountId>,
 	unstaked: u64,
 ) where
-	u32: Into<<T as frame_system::Config>::BlockNumber>,
+	u32: Into<BlockNumberFor<T>>,
 {
 	let who = delegator.unwrap_or(collator);
 	assert_eq!(<Unstaking<T>>::get(who).len(), 0);
@@ -117,18 +117,18 @@ fn fill_unstaking<T: Config>(
 				T::CurrencyBalance::one()
 			));
 		}
-		System::<T>::set_block_number(System::<T>::block_number() + T::BlockNumber::one());
+		System::<T>::set_block_number(System::<T>::block_number() + BlockNumberFor::<T>::one());
 	}
 	assert_eq!(<Unstaking<T>>::get(who).len() as u64, unstaked);
 	assert!(<Unstaking<T>>::get(who).len() <= T::MaxUnstakeRequests::get().try_into().unwrap());
 }
 
 benchmarks! {
-	where_clause { where u32: Into<<T as frame_system::Config>::BlockNumber> }
+	where_clause { where u32: Into<BlockNumberFor<T>> }
 
 	on_initialize_no_action {
 		assert_eq!(<Round<T>>::get().current, 0u32);
-		let block = T::BlockNumber::one();
+		let block = BlockNumberFor::<T>::one();
 	}: { Pallet::<T>::on_initialize(block) }
 	verify {
 		assert_eq!(<Round<T>>::get().current, 0u32);
@@ -145,7 +145,7 @@ benchmarks! {
 	on_initialize_network_rewards {
 		let issuance = T::Currency::total_issuance();
 		// if we only add by one, we also initialize a new year
-		let block = T::NetworkRewardStart::get() + T::BlockNumber::one() * 2_u32.into();
+		let block = T::NetworkRewardStart::get() + BlockNumberFor::<T>::one() * 2_u32.into();
 	}: { Pallet::<T>::on_initialize(block) }
 	verify {
 		let new_issuance = T::Currency::total_issuance();
@@ -169,7 +169,7 @@ benchmarks! {
 		assert_eq!(Session::<T>::current_index(), 0);
 
 		// jump to next block to trigger new round
-		let now = now + T::BlockNumber::one();
+		let now = now + BlockNumberFor::<T>::one();
 		System::<T>::set_block_number(now);
 		Session::<T>::on_initialize(now);
 		assert_eq!(Session::<T>::current_index(), 1);
@@ -221,7 +221,7 @@ benchmarks! {
 	}
 
 	set_blocks_per_round {
-		let bpr: T::BlockNumber = T::MinBlocksPerRound::get() + T::BlockNumber::one();
+		let bpr: BlockNumberFor<T> = T::MinBlocksPerRound::get() + BlockNumberFor::<T>::one();
 	}: _(RawOrigin::Root, bpr)
 	verify {
 		assert_eq!(<Round<T>>::get().length, bpr);
@@ -628,12 +628,12 @@ benchmarks! {
 		let collator = candidates[0].clone();
 
 		let old = InflationConfig::<T>::get();
-		assert_eq!(LastRewardReduction::<T>::get(), T::BlockNumber::zero());
-		System::<T>::set_block_number(T::BLOCKS_PER_YEAR + T::BlockNumber::one());
+		assert_eq!(LastRewardReduction::<T>::get(), BlockNumberFor::<T>::zero());
+		System::<T>::set_block_number(T::BLOCKS_PER_YEAR + BlockNumberFor::<T>::one());
 	}: _(RawOrigin::Signed(collator))
 	verify {
 		let new = InflationConfig::<T>::get();
-		assert_eq!(LastRewardReduction::<T>::get(), T::BlockNumber::one());
+		assert_eq!(LastRewardReduction::<T>::get(), BlockNumberFor::<T>::one());
 		assert_eq!(new.collator.max_rate, old.collator.max_rate);
 		assert_eq!(new.delegator.max_rate, old.delegator.max_rate);
 		assert!(new.collator.reward_rate.annual < old.collator.reward_rate.annual);
diff --git a/pallets/parachain-staking/src/inflation.rs b/pallets/parachain-staking/src/inflation.rs
index 51ef5c3ce..5514c4a52 100644
--- a/pallets/parachain-staking/src/inflation.rs
+++ b/pallets/parachain-staking/src/inflation.rs
@@ -22,11 +22,11 @@ use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{traits::Saturating, Perquintill, RuntimeDebug};
 
-#[cfg(feature = "std")]
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Eq, PartialEq, Clone, Encode, Decode, Default, RuntimeDebug, TypeInfo)]
+#[derive(
+	Eq, PartialEq, Clone, Encode, Decode, Default, RuntimeDebug, TypeInfo, Serialize, Deserialize,
+)]
 pub struct RewardRate {
 	pub annual: Perquintill,
 	pub per_block: Perquintill,
@@ -51,8 +51,9 @@ impl RewardRate {
 }
 
 /// Staking info (staking rate and reward rate) for collators and delegators.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Eq, PartialEq, Clone, Encode, Decode, Default, RuntimeDebug, TypeInfo)]
+#[derive(
+	Eq, PartialEq, Clone, Encode, Decode, Default, RuntimeDebug, TypeInfo, Serialize, Deserialize,
+)]
 pub struct StakingInfo {
 	/// Maximum staking rate.
 	pub max_rate: Perquintill,
@@ -99,8 +100,19 @@ impl StakingInfo {
 	}
 }
 
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Eq, PartialEq, Clone, Encode, Decode, Default, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+#[derive(
+	Eq,
+	PartialEq,
+	Clone,
+	Encode,
+	Decode,
+	Default,
+	RuntimeDebug,
+	TypeInfo,
+	MaxEncodedLen,
+	Serialize,
+	Deserialize,
+)]
 pub struct InflationInfo {
 	pub collator: StakingInfo,
 	pub delegator: StakingInfo,
diff --git a/pallets/parachain-staking/src/lib.rs b/pallets/parachain-staking/src/lib.rs
index 08a41e43a..d7e8d02e6 100644
--- a/pallets/parachain-staking/src/lib.rs
+++ b/pallets/parachain-staking/src/lib.rs
@@ -142,6 +142,7 @@ pub mod pallet {
 	pub use crate::inflation::{InflationInfo, RewardRate, StakingInfo};
 
 	use frame_support::{
+		assert_ok,
 		pallet_prelude::*,
 		storage::bounded_btree_map::BoundedBTreeMap,
 		traits::{
@@ -150,17 +151,14 @@ pub mod pallet {
 		},
 		BoundedVec,
 	};
-
-	#[cfg(feature = "std")]
-	use frame_support::assert_ok;
-
 	use frame_system::pallet_prelude::*;
 	use pallet_balances::{BalanceLock, Locks};
 	use pallet_session::ShouldEndSession;
 	use scale_info::TypeInfo;
+	use sp_arithmetic::per_things::Perquintill;
 	use sp_runtime::{
 		traits::{Convert, One, SaturatedConversion, Saturating, StaticLookup, Zero},
-		Permill, Perquintill,
+		Permill,
 	};
 	use sp_staking::SessionIndex;
 	use sp_std::prelude::*;
@@ -220,17 +218,17 @@ pub mod pallet {
 
 		/// Minimum number of blocks validation rounds can last.
 		#[pallet::constant]
-		type MinBlocksPerRound: Get<Self::BlockNumber>;
+		type MinBlocksPerRound: Get<BlockNumberFor<Self>>;
 
 		/// Default number of blocks validation rounds last, as set in the
 		/// genesis configuration.
 		#[pallet::constant]
-		type DefaultBlocksPerRound: Get<Self::BlockNumber>;
+		type DefaultBlocksPerRound: Get<BlockNumberFor<Self>>;
 		/// Number of blocks for which unstaked balance will still be locked
 		/// before it can be unlocked by actively calling the extrinsic
 		/// `unlock_unstaked`.
 		#[pallet::constant]
-		type StakeDuration: Get<Self::BlockNumber>;
+		type StakeDuration: Get<BlockNumberFor<Self>>;
 		/// Number of rounds a collator has to stay active after submitting a
 		/// request to leave the set of collator candidates.
 		#[pallet::constant]
@@ -297,7 +295,7 @@ pub mod pallet {
 		/// block number exceeds this start, the beneficiary will receive the
 		/// configured reward in each block.
 		#[pallet::constant]
-		type NetworkRewardStart: Get<<Self as frame_system::Config>::BlockNumber>;
+		type NetworkRewardStart: Get<BlockNumberFor<Self>>;
 
 		/// The rate in percent for the network rewards which are based on the
 		/// maximum number of collators and the maximum amount a collator can
@@ -311,7 +309,7 @@ pub mod pallet {
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 
-		const BLOCKS_PER_YEAR: Self::BlockNumber;
+		const BLOCKS_PER_YEAR: BlockNumberFor<Self>;
 	}
 
 	#[pallet::error]
@@ -413,7 +411,7 @@ pub mod pallet {
 	pub enum Event<T: Config> {
 		/// A new staking round has started.
 		/// \[block number, round number\]
-		NewRound(T::BlockNumber, SessionIndex),
+		NewRound(BlockNumberFor<T>, SessionIndex),
 		/// A new account has joined the set of top candidates.
 		/// \[account\]
 		EnteredTopCandidates(T::AccountId),
@@ -493,12 +491,12 @@ pub mod pallet {
 		/// The length in blocks for future validation rounds has changed.
 		/// \[round number, first block in the current round, old value, new
 		/// value\]
-		BlocksPerRoundSet(SessionIndex, T::BlockNumber, T::BlockNumber, T::BlockNumber),
+		BlocksPerRoundSet(SessionIndex, BlockNumberFor<T>, BlockNumberFor<T>, BlockNumberFor<T>),
 	}
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_initialize(now: T::BlockNumber) -> frame_support::weights::Weight {
+		fn on_initialize(now: BlockNumberFor<T>) -> frame_support::weights::Weight {
 			let mut post_weight = <T as Config>::WeightInfo::on_initialize_no_action();
 			let mut round = <Round<T>>::get();
 
@@ -531,7 +529,7 @@ pub mod pallet {
 	/// Current round number and next round scheduled transition.
 	#[pallet::storage]
 	#[pallet::getter(fn round)]
-	pub(crate) type Round<T: Config> = StorageValue<_, RoundInfo<T::BlockNumber>, ValueQuery>;
+	pub(crate) type Round<T: Config> = StorageValue<_, RoundInfo<BlockNumberFor<T>>, ValueQuery>;
 
 	/// Delegation information for the latest session in which a delegator
 	/// delegated.
@@ -613,7 +611,7 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		T::AccountId,
-		BoundedBTreeMap<T::BlockNumber, BalanceOf<T>, T::MaxUnstakeRequests>,
+		BoundedBTreeMap<BlockNumberFor<T>, BalanceOf<T>, T::MaxUnstakeRequests>,
 		ValueQuery,
 	>;
 
@@ -630,7 +628,7 @@ pub mod pallet {
 	/// many blocks.
 	#[pallet::storage]
 	#[pallet::getter(fn last_reward_reduction)]
-	pub(crate) type LastRewardReduction<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+	pub(crate) type LastRewardReduction<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
 	/// The counter of accumulated rewards for an account.
 	///
@@ -675,7 +673,6 @@ pub mod pallet {
 		pub max_selected_candidates: u32,
 	}
 
-	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
 			Self {
@@ -688,7 +685,7 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			assert!(
 				self.inflation_config.is_valid(T::BLOCKS_PER_YEAR.saturated_into()),
@@ -725,7 +722,7 @@ pub mod pallet {
 			<Pallet<T>>::update_total_stake();
 
 			// Start Round 0 at Block 0
-			let round: RoundInfo<T::BlockNumber> =
+			let round: RoundInfo<BlockNumberFor<T>> =
 				RoundInfo::new(0u32, 0u32.into(), T::DefaultBlocksPerRound::get());
 			<Round<T>>::put(round);
 		}
@@ -896,7 +893,10 @@ pub mod pallet {
 		/// Emits `BlocksPerRoundSet`.
 		#[pallet::call_index(3)]
 		#[pallet::weight(<T as pallet::Config>::WeightInfo::set_blocks_per_round())]
-		pub fn set_blocks_per_round(origin: OriginFor<T>, new: T::BlockNumber) -> DispatchResult {
+		pub fn set_blocks_per_round(
+			origin: OriginFor<T>,
+			new: BlockNumberFor<T>,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			ensure!(new >= T::MinBlocksPerRound::get(), Error::<T>::CannotSetBelowMin);
 
@@ -1797,7 +1797,7 @@ pub mod pallet {
 			let c_reward_rate =
 				inflation.collator.reward_rate.annual * T::CollatorRewardRateDecay::get();
 			// delegator reward rate should be 6% in 2nd year and 0% afterwards
-			let d_reward_rate = if year == T::BlockNumber::one() {
+			let d_reward_rate = if year == (BlockNumberFor::<T>::one()) {
 				// Amplitude: this value differs from the original
 				Perquintill::from_percent(7)
 			} else {
@@ -2585,7 +2585,7 @@ pub mod pallet {
 		}
 	}
 
-	impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Pallet<T>
+	impl<T> pallet_authorship::EventHandler<T::AccountId, BlockNumberFor<T>> for Pallet<T>
 	where
 		T: Config + pallet_authorship::Config + pallet_session::Config,
 	{
@@ -2648,8 +2648,8 @@ pub mod pallet {
 		}
 	}
 
-	impl<T: Config> ShouldEndSession<T::BlockNumber> for Pallet<T> {
-		fn should_end_session(now: T::BlockNumber) -> bool {
+	impl<T: Config> ShouldEndSession<BlockNumberFor<T>> for Pallet<T> {
+		fn should_end_session(now: BlockNumberFor<T>) -> bool {
 			frame_system::Pallet::<T>::register_extra_weight_unchecked(
 				T::DbWeight::get().reads(2),
 				DispatchClass::Mandatory,
@@ -2676,12 +2676,12 @@ pub mod pallet {
 		}
 	}
 
-	impl<T: Config> EstimateNextSessionRotation<T::BlockNumber> for Pallet<T> {
-		fn average_session_length() -> T::BlockNumber {
+	impl<T: Config> EstimateNextSessionRotation<BlockNumberFor<T>> for Pallet<T> {
+		fn average_session_length() -> BlockNumberFor<T> {
 			<Round<T>>::get().length
 		}
 
-		fn estimate_current_session_progress(now: T::BlockNumber) -> (Option<Permill>, Weight) {
+		fn estimate_current_session_progress(now: BlockNumberFor<T>) -> (Option<Permill>, Weight) {
 			let round = <Round<T>>::get();
 			let passed_blocks = now.saturating_sub(round.first);
 
@@ -2693,8 +2693,8 @@ pub mod pallet {
 		}
 
 		fn estimate_next_session_rotation(
-			_now: T::BlockNumber,
-		) -> (Option<T::BlockNumber>, Weight) {
+			_now: BlockNumberFor<T>,
+		) -> (Option<BlockNumberFor<T>>, Weight) {
 			let round = <Round<T>>::get();
 
 			(
diff --git a/pallets/parachain-staking/src/mock.rs b/pallets/parachain-staking/src/mock.rs
index 2a31ab022..5b1300f45 100644
--- a/pallets/parachain-staking/src/mock.rs
+++ b/pallets/parachain-staking/src/mock.rs
@@ -23,20 +23,19 @@ use super::*;
 use crate::{self as stake, types::NegativeImbalanceOf};
 use frame_support::{
 	assert_ok, construct_runtime, parameter_types,
-	traits::{Currency, GenesisBuild, OnFinalize, OnInitialize, OnUnbalanced},
+	traits::{Currency, OnFinalize, OnInitialize, OnUnbalanced},
 };
 use pallet_authorship::EventHandler;
 use sp_consensus_aura::sr25519::AuthorityId;
 use sp_core::H256;
 use sp_runtime::{
 	impl_opaque_keys,
-	testing::{Header, UintAuthorityId},
+	testing::UintAuthorityId,
 	traits::{BlakeTwo256, ConstU32, ConvertInto, IdentityLookup, OpaqueKeys},
-	Perbill, Perquintill,
+	BuildStorage, Perbill, Perquintill,
 };
 use sp_std::fmt::Debug;
 
-pub(crate) type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 pub(crate) type Block = frame_system::mocking::MockBlock<Test>;
 pub(crate) type Balance = u128;
 pub(crate) type AccountId = u64;
@@ -50,17 +49,14 @@ pub(crate) const TREASURY_ACC: AccountId = u64::MAX;
 
 // Configure a mock runtime to test the pallet.
 construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Aura: pallet_aura::{Pallet, Storage},
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
-		StakePallet: stake::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Authorship: pallet_authorship::{Pallet, Storage},
+		System: frame_system,
+		Balances: pallet_balances,
+		Aura: pallet_aura,
+		Session: pallet_session,
+		StakePallet: stake,
+		Authorship: pallet_authorship,
 	}
 );
 
@@ -72,17 +68,16 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
+	type Block = Block;
 	type BaseCallFilter = frame_support::traits::Everything;
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
@@ -114,13 +109,14 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type MaxHolds = ConstU32<1>;
-	type HoldIdentifier = RuntimeHoldReason;
+	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
 impl pallet_aura::Config for Test {
 	type AuthorityId = AuthorityId;
 	type DisabledValidators = ();
 	type MaxAuthorities = MaxCollatorCandidates;
+	type AllowMultipleBlocksPerSlot = ();
 }
 
 impl pallet_authorship::Config for Test {
@@ -177,7 +173,7 @@ impl Config for Test {
 	type NetworkRewardBeneficiary = ToBeneficiary;
 	type CollatorRewardRateDecay = CollatorRewardRateDecay;
 	type WeightInfo = ();
-	const BLOCKS_PER_YEAR: Self::BlockNumber = 5 * 60 * 24 * 36525 / 100;
+	const BLOCKS_PER_YEAR: BlockNumber = 5 * 60 * 24 * 36525 / 100;
 }
 
 impl_opaque_keys! {
@@ -294,8 +290,8 @@ impl ExtBuilder {
 	}
 
 	pub(crate) fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Test>()
+		let mut t = frame_system::GenesisConfig::<Test>::default()
+			.build_storage()
 			.expect("Frame system builds valid default genesis config");
 
 		pallet_balances::GenesisConfig::<Test> { balances: self.balances.clone() }
diff --git a/pallets/parachain-staking/src/set.rs b/pallets/parachain-staking/src/set.rs
index c00367a94..11f999589 100644
--- a/pallets/parachain-staking/src/set.rs
+++ b/pallets/parachain-staking/src/set.rs
@@ -16,10 +16,10 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use frame_support::{traits::Get, BoundedVec, DefaultNoBound, RuntimeDebug};
+use frame_support::{traits::Get, BoundedVec, DefaultNoBound};
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
-use sp_runtime::{traits::Zero, SaturatedConversion};
+use sp_runtime::{traits::Zero, RuntimeDebug, SaturatedConversion};
 use sp_std::{
 	cmp::Ordering,
 	convert::TryInto,
diff --git a/pallets/parachain-staking/src/try_state.rs b/pallets/parachain-staking/src/try_state.rs
index 2deaea2ac..8687fb770 100644
--- a/pallets/parachain-staking/src/try_state.rs
+++ b/pallets/parachain-staking/src/try_state.rs
@@ -229,8 +229,8 @@ fn validate_delegators<T: Config>() -> Result<(), &'static str> {
 	DelegatorState::<T>::iter_values().try_for_each(
 		|delegator_details| -> Result<(), &'static str> {
 			let Some(owner) = &delegator_details.owner else {
-			return Err("owner not found");
-		};
+				return Err("owner not found");
+			};
 
 			ensure!(
 				CandidatePool::<T>::contains_key(owner),
diff --git a/pallets/treasury-buyout-extension/Cargo.toml b/pallets/treasury-buyout-extension/Cargo.toml
index dc7d129cb..6e6a9007e 100644
--- a/pallets/treasury-buyout-extension/Cargo.toml
+++ b/pallets/treasury-buyout-extension/Cargo.toml
@@ -7,41 +7,41 @@ version = "1.0.0"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true }
+serde = { version = "1.0.130",  default-features = false, features = ["derive"]}
 sha2 = { version = "0.8.2", default-features = false }
 
 # Substrate dependencies
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true }
 
-orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
+orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
 
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 
 [dev-dependencies]
 mocktopus = "0.8.0"
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm", branch = "release-polkadot-v1.1.0" }
 
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
 
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 runtime-common = { path = "../../runtime/common", default-features = false }
 
 [features]
 default = ["std"]
 std = [
-    "serde",
+    "serde/std",
     "codec/std",
     "sha2/std",
     "sp-core/std",
@@ -55,6 +55,7 @@ std = [
     "orml-traits/std",
     "frame-benchmarking/std",
     "pallet-balances/std",
+    "pallet-treasury/std",
     "spacewalk-primitives/std",
     "xcm/std",
     "runtime-common/std"
diff --git a/pallets/treasury-buyout-extension/src/benchmarking.rs b/pallets/treasury-buyout-extension/src/benchmarking.rs
index 49a4f221c..4d4a2bb60 100644
--- a/pallets/treasury-buyout-extension/src/benchmarking.rs
+++ b/pallets/treasury-buyout-extension/src/benchmarking.rs
@@ -3,7 +3,7 @@
 
 use super::{Pallet as TreasuryBuyoutExtension, *};
 use crate::types::{AccountIdOf, BalanceOf, CurrencyIdOf};
-use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, Vec};
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite};
 use frame_support::assert_ok;
 use frame_system::RawOrigin;
 use sp_std::prelude::*;
diff --git a/pallets/treasury-buyout-extension/src/lib.rs b/pallets/treasury-buyout-extension/src/lib.rs
index 4c8b91c72..c8c4b5839 100644
--- a/pallets/treasury-buyout-extension/src/lib.rs
+++ b/pallets/treasury-buyout-extension/src/lib.rs
@@ -16,12 +16,13 @@ mod tests;
 mod types;
 
 use crate::{
-	default_weights::WeightInfo,
 	types::{AccountIdOf, Amount, BalanceOf, CurrencyIdOf},
 };
+
+pub use crate::default_weights::WeightInfo;
 use codec::{Decode, Encode};
 use frame_support::{
-	dispatch::{DispatchError, DispatchResult},
+	dispatch::DispatchResult,
 	ensure,
 	sp_runtime::SaturatedConversion,
 	traits::{Get, IsSubType},
@@ -29,15 +30,15 @@ use frame_support::{
 };
 use orml_traits::MultiCurrency;
 pub use pallet::*;
-use sp_arithmetic::traits::{CheckedAdd, CheckedMul, CheckedDiv, Saturating};
+use sp_arithmetic::traits::{CheckedAdd, CheckedDiv, CheckedMul, Saturating};
 use sp_runtime::{
 	traits::{DispatchInfoOf, One, SignedExtension, UniqueSaturatedInto, Zero},
 	transaction_validity::{
 		InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction,
 	},
-	ArithmeticError, FixedPointNumber, FixedU128,
+	ArithmeticError, DispatchError, FixedPointNumber, FixedU128,
 };
-use sp_std::{fmt::Debug, marker::PhantomData, vec::Vec};
+use sp_std::{fmt::Debug, marker::PhantomData, vec, vec::Vec};
 use spacewalk_primitives::DecimalsLookup;
 
 #[frame_support::pallet]
@@ -158,7 +159,6 @@ pub mod pallet {
 		pub allowed_currencies: Vec<CurrencyIdOf<T>>,
 	}
 
-	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
 			Self { allowed_currencies: vec![] }
@@ -166,7 +166,7 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			for i in &self.allowed_currencies.clone() {
 				AllowedCurrencies::<T>::insert(i, ());
diff --git a/pallets/treasury-buyout-extension/src/mock.rs b/pallets/treasury-buyout-extension/src/mock.rs
index 90ed6a834..4cb3e7cd4 100644
--- a/pallets/treasury-buyout-extension/src/mock.rs
+++ b/pallets/treasury-buyout-extension/src/mock.rs
@@ -2,7 +2,6 @@ use crate::{
 	self as treasury_buyout_extension, default_weights::SubstrateWeight, Config, PriceGetter,
 };
 use frame_support::{
-	pallet_prelude::GenesisBuild,
 	parameter_types,
 	traits::{ConstU32, Everything},
 };
@@ -11,37 +10,32 @@ use orml_traits::parameter_type_with_key;
 use sp_arithmetic::{FixedPointNumber, FixedU128, Permill};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup, One, Zero},
-	DispatchError,
+	BuildStorage, DispatchError,
 };
 use sp_std::fmt::Debug;
 use spacewalk_primitives::DecimalsLookup;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 pub const UNIT: Balance = 1_000_000_000_000;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Config<T>, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		Currencies: orml_currencies::{Pallet, Call},
-		TreasuryBuyoutExtension: treasury_buyout_extension::{Pallet, Storage, Call, Event<T>},
+		System: frame_system,
+		Tokens: orml_tokens,
+		Balances: pallet_balances,
+		Currencies: orml_currencies,
+		TreasuryBuyoutExtension: treasury_buyout_extension,
 	}
 );
 
 pub type AccountId = u64;
 pub type Balance = u128;
 pub type BlockNumber = u64;
-pub type Index = u64;
+pub type Nonce = u64;
 pub type Amount = i64;
 pub type CurrencyId = u64;
 
@@ -53,19 +47,18 @@ parameter_types! {
 pub type TestEvent = RuntimeEvent;
 
 impl frame_system::Config for Test {
+	type Block = Block;
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = Index;
-	type BlockNumber = BlockNumber;
+	type Nonce = Nonce;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
 	type RuntimeEvent = TestEvent;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
@@ -144,7 +137,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type MaxHolds = ConstU32<1>;
-	type HoldIdentifier = RuntimeHoldReason;
+	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
 impl orml_currencies::Config for Test {
@@ -227,7 +220,7 @@ pub struct ExtBuilder;
 
 impl ExtBuilder {
 	pub fn build() -> sp_io::TestExternalities {
-		let mut storage = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let mut storage = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 
 		let dot_currency_id = RelayChainCurrencyId::get();
 
diff --git a/pallets/treasury-buyout-extension/src/tests.rs b/pallets/treasury-buyout-extension/src/tests.rs
index 83d0ca525..09275c02f 100644
--- a/pallets/treasury-buyout-extension/src/tests.rs
+++ b/pallets/treasury-buyout-extension/src/tests.rs
@@ -2,7 +2,7 @@
 use crate::{
 	mock::*,
 	types::{Amount, CurrencyIdOf},
-	BuyoutLimit, Buyouts, Config, Error, PriceGetter, ValidityError, DecimalsLookup,
+	BuyoutLimit, Buyouts, Config, DecimalsLookup, Error, PriceGetter, ValidityError,
 };
 use frame_support::{assert_err, assert_noop, assert_ok};
 use orml_traits::MultiCurrency;
@@ -17,7 +17,7 @@ fn get_free_balance(currency_id: CurrencyIdOf<Test>, account: &AccountId) -> Bal
 	<orml_currencies::Pallet<Test> as MultiCurrency<AccountId>>::free_balance(currency_id, account)
 }
 
-fn run_to_block(new_block: <Test as frame_system::Config>::BlockNumber) {
+fn run_to_block(new_block: BlockNumber) {
 	frame_system::Pallet::<Test>::set_block_number(new_block);
 }
 
@@ -37,7 +37,7 @@ fn buyout_using_dot_given_exchange_amount_in_dot_succeeds() {
 
 		assert_eq!(initial_user_native_balance, USERS_INITIAL_NATIVE_BALANCE);
 		assert_eq!(initial_treasury_native_balance, TREASURY_INITIAL_BALANCE);
-		
+
 		// DOT has 10 decimals
 		let exchange_amount = 100_0000000000;
 		assert_ok!(crate::Pallet::<Test>::buyout(
@@ -137,7 +137,8 @@ fn buyout_using_dot_given_buyout_amount_in_native_succeeds() {
 			exchange_asset_price,
 			<DecimalsLookupImpl as DecimalsLookup>::decimals(native_currency_id),
 			<DecimalsLookupImpl as DecimalsLookup>::decimals(dot_currency_id),
-		).expect("This is mocked so it should not fail");
+		)
+		.expect("This is mocked so it should not fail");
 
 		let final_user_dot_balance = get_free_balance(dot_currency_id, &user);
 		let final_user_native_balance = get_free_balance(native_currency_id, &user);
diff --git a/pallets/vesting-manager/Cargo.toml b/pallets/vesting-manager/Cargo.toml
index 707011fb2..22b90799d 100644
--- a/pallets/vesting-manager/Cargo.toml
+++ b/pallets/vesting-manager/Cargo.toml
@@ -6,20 +6,20 @@ name = "vesting-manager"
 version = "0.0.1"
 
 [dependencies]
-log = "0.4.17"
+log = { version = "0.4.17", default-features = false }
 parity-scale-codec = {version = "3.1.5", default-features = false, features = ["derive"]}
 scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
-serde = {version = "1.0.142", optional = true}
-sp-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
+serde = {version = "1.0.142", default-features = false, optional = true}
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
-frame-support = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-pallet-vesting = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-sp-runtime = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
-sp-std = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
 # benchmarking
-frame-benchmarking = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true}
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true}
 
 [features]
 default = ["std"]
@@ -36,7 +36,7 @@ std = [
   "parity-scale-codec/std",
   "pallet-vesting/std",
   "scale-info/std",
-  "serde",
+  "serde/std",
   "sp-api/std",
   "sp-runtime/std",
   "sp-std/std",
diff --git a/runtime/amplitude/Cargo.toml b/runtime/amplitude/Cargo.toml
index b9652bb3a..7ff84380c 100644
--- a/runtime/amplitude/Cargo.toml
+++ b/runtime/amplitude/Cargo.toml
@@ -12,7 +12,7 @@ version = "0.1.0"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
 
 [dependencies]
 cfg-if = "1.0.0"
@@ -21,8 +21,8 @@ hex-literal = { version = "0.3.4", optional = true }
 log = { version = "0.4.17", default-features = false }
 paste = "1.0.14"
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.144", optional = true, features = ["derive"] }
-smallvec = "1.9.0"
+serde = { version = "1.0.144", default-features = false, features = ["derive"] }
+smallvec = {version = "1.9.0"}
 
 # Local
 runtime-common = { path = "../common", default-features = false }
@@ -30,79 +30,80 @@ token-chain-extension = { path = "../../chain-extensions/token", default-feature
 price-chain-extension = { path = "../../chain-extensions/price", default-features = false }
 
 # Custom libraries for Spacewalk
-clients-info = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-currency = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-security = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-staking = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-oracle = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-stellar-relay = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-fee = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-vault-registry = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-redeem = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-issue = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-nomination = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-replace = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-issue-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-redeem-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-replace-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-vault-registry-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+clients-info = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+currency = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+security = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+staking = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+oracle = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+stellar-relay = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+fee = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+vault-registry = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+redeem = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+issue = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+nomination = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+replace = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-issue-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-redeem-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-replace-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-vault-registry-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 module-pallet-staking-rpc-runtime-api = { path = "../../pallets/parachain-staking/rpc/runtime-api", default-features = false }
-pooled-rewards = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-reward-distribution = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+pooled-rewards = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+reward-distribution = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 
 
 # Substrate
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.42" }
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.42" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.42" }
-pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-bounties = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-child-bounties = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true }
+frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true }
+pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-bounties = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-child-bounties = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-contracts-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
 # Open Runtime Module Library
-orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.42" }
-orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.42" }
+orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
 
 
 # KILT
@@ -115,59 +116,63 @@ treasury-buyout-extension = { path = "../../pallets/treasury-buyout-extension",
 vesting-manager = { path = "../../pallets/vesting-manager", default-features = false }
 
 # DIA
-dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v0.9.42" }
-dia-oracle-runtime-api = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v0.9.42" }
+dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v1.1.0" }
+dia-oracle-runtime-api = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v1.1.0" }
 
 # Polkadot
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot-sdk", package = "polkadot-parachain-primitives", branch = "release-polkadot-v1.1.0", default-features = false }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm", branch = "release-polkadot-v1.1.0", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm-builder", branch = "release-polkadot-v1.1.0", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm-executor", branch = "release-polkadot-v1.1.0", default-features = false }
 
 # Cumulus
-cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
 # Zenlink
-zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", default-features = false, branch = "polkadot-v0.9.42" }
-zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", default-features = false, branch = "polkadot-v0.9.42" }
+zenlink-protocol = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", default-features = false, branch = "release-polkadot-v1.1.0" }
+zenlink-protocol-runtime-api = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", default-features = false, branch = "release-polkadot-v1.1.0" }
 
-bifrost-farming = { git = "https://github.com/pendulum-chain/bifrost", default-features = false, branch = "upgrade-v0.9.42" }
-bifrost-farming-rpc-runtime-api = { git = "https://github.com/pendulum-chain/bifrost", default-features = false, branch = "upgrade-v0.9.42" }
+bifrost-farming = { git = "https://github.com/bifrost-finance/bifrost", default-features = false, rev = "46ba3689c2fe1011cce0d752cb479e0e522e2e76" }
+bifrost-farming-rpc-runtime-api = { git = "https://github.com/bifrost-finance/bifrost", default-features = false, rev = "46ba3689c2fe1011cce0d752cb479e0e522e2e76" }
 
 [features]
 default = [
     "std",
 ]
 std = [
+    "serde/std",
     "codec/std",
     "log/std",
     "scale-info/std",
-    "serde",
     "cumulus-pallet-aura-ext/std",
     "cumulus-pallet-dmp-queue/std",
     "cumulus-pallet-parachain-system/std",
+    "cumulus-pallet-parachain-system/parameterized-consensus-hook",
     "cumulus-pallet-xcm/std",
     "cumulus-pallet-xcmp-queue/std",
     "cumulus-primitives-core/std",
     "cumulus-primitives-timestamp/std",
+    "cumulus-pallet-session-benchmarking/std",
     "cumulus-primitives-utility/std",
     "dia-oracle/std",
     "dia-oracle-runtime-api/std",
+    "frame-benchmarking/std",
     "frame-executive/std",
     "frame-support/std",
     "frame-system-rpc-runtime-api/std",
     "frame-system/std",
+    "frame-system-benchmarking/std",
     "frame-try-runtime/std",
     "orml-asset-registry/std",
     "orml-currencies/std",
@@ -175,6 +180,7 @@ std = [
     "orml-tokens/std",
     "orml-xtokens/std",
     "orml-xcm-support/std",
+    "orml-currencies-allowance-extension/std",
     "pallet-aura/std",
     "pallet-authorship/std",
     "pallet-balances/std",
@@ -196,11 +202,12 @@ std = [
     "pallet-transaction-payment/std",
     "pallet-treasury/std",
     "pooled-rewards/std",
+    "reward-distribution/std",
+    "polkadot-parachain/std",
     "pallet-utility/std",
     "pallet-vesting/std",
     "pallet-xcm/std",
     "parachain-info/std",
-    "polkadot-parachain/std",
     "polkadot-runtime-common/std",
     "runtime-common/std",
     "sp-api/std",
@@ -213,6 +220,7 @@ std = [
     "sp-runtime/std",
     "sp-session/std",
     "sp-std/std",
+    "sp-storage/std",
     "sp-transaction-pool/std",
     "sp-version/std",
     "xcm-builder/std",
@@ -223,6 +231,7 @@ std = [
     "bifrost-farming/std",
     "bifrost-farming-rpc-runtime-api/std",
     #custom libraries from spacewalk
+    "clients-info/std",
     "security/std",
     "staking/std",
     "oracle/std",
@@ -248,6 +257,7 @@ std = [
     "vesting-manager/std",
     "price-chain-extension/std",
     "token-chain-extension/std",
+
 ]
 
 runtime-benchmarks = [
@@ -276,7 +286,9 @@ runtime-benchmarks = [
     "runtime-common/runtime-benchmarks",
     "parachain-staking/runtime-benchmarks",
     "orml-currencies-allowance-extension/runtime-benchmarks",
-    "treasury-buyout-extension/runtime-benchmarks"
+    "treasury-buyout-extension/runtime-benchmarks",
+    "dia-oracle/runtime-benchmarks",
+    "dia-oracle-runtime-api/runtime-benchmarks"
 ]
 
 try-runtime = [
diff --git a/runtime/amplitude/src/lib.rs b/runtime/amplitude/src/lib.rs
index acfb3bd13..75d1c2764 100644
--- a/runtime/amplitude/src/lib.rs
+++ b/runtime/amplitude/src/lib.rs
@@ -1,6 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
-// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
+// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 512.
+#![recursion_limit = "512"]
 
 // Make the WASM binary available.
 #[cfg(feature = "std")]
@@ -34,8 +34,6 @@ use sp_runtime::{
 	ApplyExtrinsicResult, DispatchError, FixedPointNumber, SaturatedConversion,
 };
 
-const CONTRACTS_DEBUG_OUTPUT: bool = true;
-
 use sp_std::{fmt::Debug, marker::PhantomData, prelude::*};
 
 #[cfg(feature = "std")]
@@ -64,7 +62,7 @@ use frame_system::{
 pub use sp_runtime::{MultiAddress, Perbill, Permill, Perquintill};
 
 use runtime_common::{
-	asset_registry, opaque, AccountId, Amount, AuraId, Balance, BlockNumber, Hash, Index, PoolId,
+	asset_registry, AccountId, Amount, AuraId, Balance, BlockNumber, Hash, Index, PoolId,
 	ProxyType, ReserveIdentifier, Signature, EXISTENTIAL_DEPOSIT, MILLIUNIT, NANOUNIT, UNIT,
 };
 
@@ -98,7 +96,7 @@ use spacewalk_primitives::{
 	UnsignedFixedPoint, UnsignedInner,
 };
 
-#[cfg(any(feature = "runtime-benchmarks", feature = "testing-utils"))]
+#[cfg(any(feature = "runtime-benchmarks"))]
 use oracle::testing_utils::MockDataFeeder;
 
 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
@@ -139,6 +137,11 @@ pub type SignedExtra = (
 	treasury_buyout_extension::CheckBuyout<Runtime>,
 );
 
+type EventRecord = frame_system::EventRecord<
+	<Runtime as frame_system::Config>::RuntimeEvent,
+	<Runtime as frame_system::Config>::Hash,
+>;
+
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
@@ -148,62 +151,44 @@ pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
 
-use crate::sp_api_hidden_includes_construct_runtime::hidden_include::dispatch::GetStorageVersion;
-use frame_support::pallet_prelude::StorageVersion;
+use runtime_common::asset_registry::StringLimit;
 
 parameter_types! {
 	pub const InactiveAccounts: Vec<AccountId> = Vec::new();
 }
 
-// Temporary struct that defines the executions to be done upon upgrade,
-// Should be removed or at least checked on each upgrade to see if it is relevant,
-// given that these are "one-time" executions for particular upgrades
+// TODO remove contract migrations after update
+use pallet_contracts::migration::{v11, v12, v13, v14, v15};
+
+// Custom storage version bump
+use frame_support::{
+	pallet_prelude::StorageVersion,
+	traits::{GetStorageVersion, OnRuntimeUpgrade},
+};
+
 pub struct CustomOnRuntimeUpgrade;
-impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
+impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
 		log::info!("Custom on-runtime-upgrade function");
 
 		let mut writes = 0;
 		// WARNING: manually setting the storage version
-		if Contracts::on_chain_storage_version() == 0 {
-			log::info!("Upgrading pallet contract's storage version to 10");
-			StorageVersion::new(10).put::<Contracts>();
-			writes += 1;
-		}
-		if Democracy::on_chain_storage_version() == 0 {
-			log::info!("Upgrading pallet democracy's storage version to 1");
-			StorageVersion::new(1).put::<Democracy>();
-			writes += 1;
-		}
-		if Scheduler::on_chain_storage_version() == 3 {
-			log::info!("Upgrading pallet scheduler's storage version to 4");
-			StorageVersion::new(4).put::<Scheduler>();
-			writes += 1;
-		}
-		if Preimage::on_chain_storage_version() == 0 {
-			log::info!("Upgrading pallet preimage's storage version to 1");
-			StorageVersion::new(1).put::<Preimage>();
+		if ParachainStaking::on_chain_storage_version() == 0 {
+			log::info!("Upgrading parachain staking storage version to 7");
+			StorageVersion::new(7).put::<ParachainStaking>();
 			writes += 1;
 		}
-		if Multisig::on_chain_storage_version() == 0 {
-			log::info!("Upgrading pallet multisig's storage version to 1");
-			StorageVersion::new(1).put::<Multisig>();
-			writes += 1;
-		}
-		if PolkadotXcm::on_chain_storage_version() == 0 {
-			log::info!("Upgrading pallet xcm's storage version to 1");
-			StorageVersion::new(1).put::<PolkadotXcm>();
-			writes += 1;
-		}
-		if AssetRegistry::on_chain_storage_version() == 0 {
-			log::info!("Upgrading pallet asset registry's storage version to 2");
-			StorageVersion::new(2).put::<AssetRegistry>();
+
+		if Bounties::on_chain_storage_version() == 0 {
+			log::info!("Upgrading bounties storage version to 4");
+			StorageVersion::new(4).put::<Bounties>();
 			writes += 1;
 		}
-
-		<Runtime as frame_system::Config>::DbWeight::get().reads_writes(7, writes)
+		// not really a heavy operation
+		<Runtime as frame_system::Config>::DbWeight::get().reads_writes(2, writes)
 	}
 }
+
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,
@@ -211,12 +196,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	(
-		CustomOnRuntimeUpgrade,
-		pallet_balances::migration::MigrateManyToTrackInactive<Runtime, InactiveAccounts>,
-		pallet_vesting::migrations::v1::ForceSetVersionToV1<Runtime>,
-		pallet_transaction_payment::migrations::v1::ForceSetVersionToV2<Runtime>,
-	),
+	(CustomOnRuntimeUpgrade, pallet_contracts::migration::Migration<Runtime>),
 >;
 
 pub struct ConvertPrice;
@@ -275,7 +255,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("amplitude"),
 	impl_name: create_runtime_str!("amplitude"),
 	authoring_version: 1,
-	spec_version: 17,
+	spec_version: 18,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 13,
@@ -355,51 +335,54 @@ impl Contains<RuntimeCall> for BaseFilter {
 	fn contains(call: &RuntimeCall) -> bool {
 		match call {
 			// These modules are all allowed to be called by transactions:
-			RuntimeCall::Bounties(_)
-			| RuntimeCall::ChildBounties(_)
-			| RuntimeCall::ClientsInfo(_)
-			| RuntimeCall::Treasury(_)
-			| RuntimeCall::Tokens(_)
-			| RuntimeCall::Currencies(_)
-			| RuntimeCall::ParachainStaking(_)
-			| RuntimeCall::Democracy(_)
-			| RuntimeCall::Council(_)
-			| RuntimeCall::TechnicalCommittee(_)
-			| RuntimeCall::System(_)
-			| RuntimeCall::Scheduler(_)
-			| RuntimeCall::Preimage(_)
-			| RuntimeCall::Timestamp(_)
-			| RuntimeCall::Balances(_)
-			| RuntimeCall::Session(_)
-			| RuntimeCall::ParachainSystem(_)
-			| RuntimeCall::XcmpQueue(_)
-			| RuntimeCall::PolkadotXcm(_)
-			| RuntimeCall::DmpQueue(_)
-			| RuntimeCall::Utility(_)
-			| RuntimeCall::Vesting(_)
-			| RuntimeCall::XTokens(_)
-			| RuntimeCall::Multisig(_)
-			| RuntimeCall::Identity(_)
-			| RuntimeCall::Contracts(_)
-			| RuntimeCall::ZenlinkProtocol(_)
-			| RuntimeCall::VestingManager(_)
-			| RuntimeCall::DiaOracleModule(_)
-			| RuntimeCall::Fee(_)
-			| RuntimeCall::Issue(_)
-			| RuntimeCall::Nomination(_)
-			| RuntimeCall::Oracle(_)
-			| RuntimeCall::Redeem(_)
-			| RuntimeCall::Replace(_)
-			| RuntimeCall::Security(_)
-			| RuntimeCall::StellarRelay(_)
-			| RuntimeCall::VaultRegistry(_)
-			| RuntimeCall::PooledVaultRewards(_)
-			| RuntimeCall::Farming(_)
-			| RuntimeCall::TokenAllowance(_)
-			| RuntimeCall::AssetRegistry(_)
-			| RuntimeCall::Proxy(_)
-			| RuntimeCall::TreasuryBuyoutExtension(_)
-			| RuntimeCall::RewardDistribution(_) => true,
+			RuntimeCall::Bounties(_) |
+			RuntimeCall::ChildBounties(_) |
+			RuntimeCall::ClientsInfo(_) |
+			RuntimeCall::Treasury(_) |
+			RuntimeCall::Tokens(_) |
+			RuntimeCall::Currencies(_) |
+			RuntimeCall::ParachainStaking(_) |
+			RuntimeCall::Democracy(_) |
+			RuntimeCall::Council(_) |
+			RuntimeCall::TechnicalCommittee(_) |
+			RuntimeCall::System(_) |
+			RuntimeCall::Scheduler(_) |
+			RuntimeCall::Preimage(_) |
+			RuntimeCall::Timestamp(_) |
+			RuntimeCall::Balances(_) |
+			RuntimeCall::Session(_) |
+			RuntimeCall::ParachainSystem(_) |
+			RuntimeCall::XcmpQueue(_) |
+			RuntimeCall::PolkadotXcm(_) |
+			RuntimeCall::DmpQueue(_) |
+			RuntimeCall::Utility(_) |
+			RuntimeCall::Vesting(_) |
+			RuntimeCall::XTokens(_) |
+			RuntimeCall::Multisig(_) |
+			RuntimeCall::Identity(_) |
+			RuntimeCall::Contracts(_) |
+			RuntimeCall::ZenlinkProtocol(_) |
+			RuntimeCall::VestingManager(_) |
+			RuntimeCall::DiaOracleModule(_) |
+			RuntimeCall::Fee(_) |
+			RuntimeCall::Issue(_) |
+			RuntimeCall::Nomination(_) |
+			RuntimeCall::Oracle(_) |
+			RuntimeCall::Redeem(_) |
+			RuntimeCall::Replace(_) |
+			RuntimeCall::Security(_) |
+			RuntimeCall::StellarRelay(_) |
+			RuntimeCall::VaultRegistry(_) |
+			RuntimeCall::PooledVaultRewards(_) |
+			RuntimeCall::Farming(_) |
+			RuntimeCall::TokenAllowance(_) |
+			RuntimeCall::AssetRegistry(_) |
+			RuntimeCall::Proxy(_) |
+			RuntimeCall::TreasuryBuyoutExtension(_) |
+			RuntimeCall::RewardDistribution(_) |
+			RuntimeCall::ParachainInfo(_) |
+			RuntimeCall::CumulusXcm(_) |
+			RuntimeCall::VaultStaking(_) => true,
 			// All pallets are allowed, but exhaustive match is defensive
 			// in the case of adding new pallets.
 		}
@@ -409,22 +392,20 @@ impl Contains<RuntimeCall> for BaseFilter {
 // Configure FRAME pallets to include in runtime.
 
 impl frame_system::Config for Runtime {
+	/// The Block type used by the runtime. This is used by construct_runtime to retrieve the extrinsics or other block specific data as needed.
+	type Block = Block;
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
 	/// The aggregated dispatch type that is available for extrinsics.
 	type RuntimeCall = RuntimeCall;
 	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
 	type Lookup = AccountIdLookup<AccountId, ()>;
-	/// The index type for storing how many extrinsics an account has signed.
-	type Index = Index;
-	/// The index type for blocks.
-	type BlockNumber = BlockNumber;
+	/// This stores the number of previous transactions associated with a sender account.
+	type Nonce = Index;
 	/// The type for hashing blocks and tries.
 	type Hash = Hash;
 	/// The hashing algorithm used.
 	type Hashing = BlakeTwo256;
-	/// The header type.
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
@@ -520,7 +501,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type MaxHolds = ConstU32<1>;
-	type HoldIdentifier = RuntimeHoldReason;
+	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
 parameter_types! {
@@ -568,6 +549,8 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	#[cfg(feature = "std")]
+	type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
 }
 
 impl parachain_info::Config for Runtime {}
@@ -609,10 +592,16 @@ impl pallet_session::Config for Runtime {
 	type WeightInfo = pallet_session::weights::SubstrateWeight<Runtime>;
 }
 
+parameter_types! {
+	// as per documentation, typical value for this is false "unless this pallet is being augmented by another pallet"
+	// https://github.com/paritytech/polkadot-sdk/blob/release-polkadot-v1.1.0/substrate/frame/aura/src/lib.rs#L111
+	pub const AllowMultipleBlocksPerSlot: bool = false;
+}
 impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
 	type MaxAuthorities = MaxAuthorities;
+	type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot;
 }
 
 parameter_types! {
@@ -903,7 +892,8 @@ impl orml_asset_registry::Config for Runtime {
 	type AuthorityOrigin = asset_registry::AssetAuthority;
 	type AssetProcessor = asset_registry::CustomAssetProcessor;
 	type Balance = Balance;
-	type WeightInfo = weights::orml_asset_registry::WeightInfo<Runtime>;
+	type WeightInfo = weights::orml_asset_registry::SubstrateWeight<Runtime>;
+	type StringLimit = StringLimit;
 }
 
 parameter_types! {
@@ -1002,9 +992,11 @@ const fn deposit(items: u32, bytes: u32) -> Balance {
 
 parameter_types! {
 	pub const DepositPerItem: Balance = deposit(1, 0);
-	pub const DepositPerByte: Balance = deposit(0, 1);
-	pub const DefaultDepositLimit: Balance = deposit(1024, 1024 * 1024);
+    pub const DepositPerByte: Balance = deposit(0, 1);
+    pub const DefaultDepositLimit: Balance = deposit(1024, 1024 * 1024);
 	pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
+	pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30);
+	pub const MaxDelegateDependencies: u32 = 32;
 }
 
 impl pallet_contracts::Config for Runtime {
@@ -1028,6 +1020,18 @@ impl pallet_contracts::Config for Runtime {
 	type UnsafeUnstableInterface = ConstBool<true>;
 	type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
 	type DefaultDepositLimit = DefaultDepositLimit;
+	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
+	type MaxDelegateDependencies = MaxDelegateDependencies;
+	type RuntimeHoldReason = RuntimeHoldReason;
+	type Migrations = (
+		v11::Migration<Self>,
+		v12::Migration<Runtime, Balances>,
+		v13::Migration<Self>,
+		v14::Migration<Self, Balances>,
+		v15::Migration<Self>,
+	);
+	type Debug = ();
+	type Environment = ();
 }
 
 impl pallet_insecure_randomness_collective_flip::Config for Runtime {}
@@ -1065,7 +1069,7 @@ impl dia_oracle::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
 	type AuthorityId = dia_oracle::crypto::DiaAuthId;
-	type WeightInfo = dia_oracle::weights::DiaWeightInfo<Runtime>;
+	type WeightInfo = weights::dia_oracle::SubstrateWeight<Runtime>;
 }
 
 impl frame_system::offchain::SigningTypes for Runtime {
@@ -1175,7 +1179,7 @@ pub struct DataFeederBenchmark<K, V, A>(PhantomData<(K, V, A)>);
 
 #[cfg(feature = "runtime-benchmarks")]
 impl<K, V, A> orml_traits::DataFeeder<K, V, A> for DataFeederBenchmark<K, V, A> {
-	fn feed_value(_who: A, _key: K, _value: V) -> sp_runtime::DispatchResult {
+	fn feed_value(_who: Option<A>, _key: K, _value: V) -> sp_runtime::DispatchResult {
 		Ok(())
 	}
 }
@@ -1343,7 +1347,7 @@ impl farming::Config for Runtime {
 	type CurrencyId = CurrencyId;
 	type MultiCurrency = Currencies;
 	type ControlOrigin = EnsureRoot<AccountId>;
-	type WeightInfo = farming::weights::BifrostWeight<Runtime>;
+	type WeightInfo = ();
 	type TreasuryAccount = AmplitudeTreasuryAccount;
 	type Keeper = FarmingKeeperPalletId;
 	type RewardIssuer = FarmingRewardIssuerPalletId;
@@ -1445,88 +1449,83 @@ impl treasury_buyout_extension::Config for Runtime {
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = opaque::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Runtime
 	{
 		// System support stuff.
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
-		ParachainSystem: cumulus_pallet_parachain_system::{
-			Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned,
-		} = 1,
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
-		ParachainInfo: parachain_info::{Pallet, Storage, Config} = 3,
+		System: frame_system = 0,
+		ParachainSystem: cumulus_pallet_parachain_system = 1,
+		Timestamp: pallet_timestamp = 2,
+		ParachainInfo: parachain_info = 3,
 
 		// Monetary stuff.
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 10,
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 11,
+		Balances: pallet_balances = 10,
+		TransactionPayment: pallet_transaction_payment = 11,
 
 		// Governance
-		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>} = 13,
-		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Config<T>, Origin<T>, Event<T>} = 14,
-		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Config<T>, Origin<T>,  Event<T>} = 15,
-		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 16,
-		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 17,
-		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 18,
-		Treasury: pallet_treasury::{Pallet, Call, Storage, Event<T>} = 19,
-		Bounties: pallet_bounties::{Pallet, Call, Storage, Event<T>} = 20,
-		ChildBounties: pallet_child_bounties::{Pallet, Call, Storage, Event<T>} = 21,
-		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 22,
+		Democracy: pallet_democracy = 13,
+		Council: pallet_collective::<Instance1> = 14,
+		TechnicalCommittee: pallet_collective::<Instance2> = 15,
+		Scheduler: pallet_scheduler = 16,
+		Preimage: pallet_preimage = 17,
+		Multisig: pallet_multisig = 18,
+		Treasury: pallet_treasury = 19,
+		Bounties: pallet_bounties = 20,
+		ChildBounties: pallet_child_bounties = 21,
+		Proxy: pallet_proxy = 22,
 
 		// Consensus support.
 		// The following order MUST NOT be changed: Aura -> Session -> Staking -> Authorship -> AuraExt
 		// Dependencies: AuraExt on Aura, Authorship and Session on ParachainStaking
-		Aura: pallet_aura::{Pallet, Storage, Config<T>} = 33,
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 32,
-		ParachainStaking: parachain_staking::{Pallet, Call, Storage, Event<T>, Config<T>} = 35,
-		Authorship: pallet_authorship::{Pallet, Storage} = 30,
-		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 34,
+		Aura: pallet_aura = 33,
+		Session: pallet_session = 32,
+		ParachainStaking: parachain_staking = 35,
+		Authorship: pallet_authorship = 30,
+		AuraExt: cumulus_pallet_aura_ext = 34,
 
 		// XCM helpers.
-		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 40,
-		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config} = 41,
-		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 42,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 43,
+		XcmpQueue: cumulus_pallet_xcmp_queue = 40,
+		PolkadotXcm: pallet_xcm = 41,
+		CumulusXcm: cumulus_pallet_xcm = 42,
+		DmpQueue: cumulus_pallet_dmp_queue = 43,
 
 		// Amendments
-		Vesting: pallet_vesting::{Pallet, Call, Storage, Event<T>} = 50,
-		Utility: pallet_utility::{Pallet, Call, Event} = 51,
-		Currencies: orml_currencies::{Pallet, Call, Storage} = 52,
-		Tokens: orml_tokens::{Pallet, Call, Storage, Config<T>, Event<T>} = 53,
-		XTokens: orml_xtokens::{Pallet, Storage, Call, Event<T>} = 54,
-		Identity: pallet_identity::{Pallet, Storage, Call, Event<T>} = 55,
-		Contracts: pallet_contracts::{Pallet, Storage, Call, Event<T>} = 56,
-		RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip::{Pallet, Storage} = 57,
-		DiaOracleModule: dia_oracle::{Pallet, Storage, Call, Config<T>, Event<T>} = 58,
-
-		ZenlinkProtocol: zenlink_protocol::{Pallet, Call, Storage, Event<T>}  = 59,
+		Vesting: pallet_vesting = 50,
+		Utility: pallet_utility = 51,
+		Currencies: orml_currencies = 52,
+		Tokens: orml_tokens = 53,
+		XTokens: orml_xtokens = 54,
+		Identity: pallet_identity = 55,
+		Contracts: pallet_contracts = 56,
+		RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip = 57,
+		DiaOracleModule: dia_oracle = 58,
+
+		ZenlinkProtocol: zenlink_protocol  = 59,
 
 		// Spacewalk pallets
-		Currency: currency::{Pallet} = 60,
-		Fee: fee::{Pallet, Call, Config<T>, Storage} = 61,
-		Issue: issue::{Pallet, Call, Config<T>, Storage, Event<T>} = 62,
-		Nomination: nomination::{Pallet, Call, Config, Storage, Event<T>} = 63,
-		Oracle: oracle::{Pallet, Call, Config, Storage, Event<T>} = 64,
-		Redeem: redeem::{Pallet, Call, Config<T>, Storage, Event<T>} = 65,
-		Replace: replace::{Pallet, Call, Config<T>, Storage, Event<T>} = 66,
-		Security: security::{Pallet, Call, Config, Storage, Event<T>} = 67,
-		StellarRelay: stellar_relay::{Pallet, Call, Config<T>, Storage, Event<T>} = 68,
-		VaultRegistry: vault_registry::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned} = 69,
-		PooledVaultRewards: pooled_rewards::{Pallet, Call, Storage, Event<T>} = 70,
-		VaultStaking: staking::{Pallet, Storage, Event<T>} = 71,
-		ClientsInfo: clients_info::{Pallet, Call, Storage, Event<T>} = 72,
-		RewardDistribution: reward_distribution::{Pallet, Call, Storage, Event<T>} = 73,
-
-		TokenAllowance: orml_currencies_allowance_extension::{Pallet, Storage, Call, Event<T>} = 80,
-		TreasuryBuyoutExtension: treasury_buyout_extension::{Pallet, Storage, Call, Event<T>} = 82,
-
-		Farming: farming::{Pallet, Call, Storage, Event<T>} = 90,
+		Currency: currency = 60,
+		Fee: fee = 61,
+		Issue: issue = 62,
+		Nomination: nomination = 63,
+		Oracle: oracle = 64,
+		Redeem: redeem = 65,
+		Replace: replace = 66,
+		Security: security = 67,
+		StellarRelay: stellar_relay = 68,
+		VaultRegistry: vault_registry = 69,
+		PooledVaultRewards: pooled_rewards = 70,
+		VaultStaking: staking = 71,
+		ClientsInfo: clients_info = 72,
+		RewardDistribution: reward_distribution = 73,
+
+		TokenAllowance: orml_currencies_allowance_extension = 80,
+		TreasuryBuyoutExtension: treasury_buyout_extension = 82,
+
+		Farming: farming = 90,
 
 		// Asset Metadata
-		AssetRegistry: orml_asset_registry::{Pallet, Storage, Call, Event<T>, Config<T>} = 91,
+		AssetRegistry: orml_asset_registry = 91,
 
-		VestingManager: vesting_manager::{Pallet, Call, Event<T>} = 100
+		VestingManager: vesting_manager = 100
 	}
 );
 
@@ -1560,6 +1559,8 @@ mod benches {
 
 		[orml_currencies_allowance_extension, TokenAllowance]
 		[treasury_buyout_extension, TreasuryBuyoutExtension]
+
+		[dia_oracle, DiaOracleModule]
 	);
 }
 
@@ -1696,11 +1697,11 @@ impl_runtime_apis! {
 	}
 
 	impl dia_oracle_runtime_api::DiaOracleApi<Block> for Runtime{
-		fn get_value(blockchain: frame_support::sp_std::vec::Vec<u8>, symbol: frame_support::sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::PriceInfo, sp_runtime::DispatchError>{
+		fn get_value(blockchain: sp_std::vec::Vec<u8>, symbol: sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::PriceInfo, sp_runtime::DispatchError>{
 			DiaOracleModule::get_value(blockchain, symbol)
 		}
 
-		fn get_coin_info(blockchain: frame_support::sp_std::vec::Vec<u8>, symbol: frame_support::sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::CoinInfo,sp_runtime::DispatchError>{
+		fn get_coin_info(blockchain: sp_std::vec::Vec<u8>, symbol: sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::CoinInfo,sp_runtime::DispatchError>{
 			DiaOracleModule::get_coin_info(blockchain, symbol)
 		}
 	}
@@ -1819,8 +1820,8 @@ impl_runtime_apis! {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey};
-
+			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch};
+			use sp_storage::TrackedStorageKey;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use baseline::Pallet as BaselineBench;
 
@@ -1949,7 +1950,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_contracts::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>
+	impl pallet_contracts::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash, EventRecord>
 		for Runtime
 	{
 		fn call(
@@ -1959,7 +1960,7 @@ impl_runtime_apis! {
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			input_data: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractExecResult<Balance> {
+		) -> pallet_contracts_primitives::ContractExecResult<Balance, EventRecord> {
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
 			Contracts::bare_call(
 				origin,
@@ -1968,7 +1969,8 @@ impl_runtime_apis! {
 				gas_limit,
 				storage_deposit_limit,
 				input_data,
-				CONTRACTS_DEBUG_OUTPUT,
+				pallet_contracts::DebugInfo::UnsafeDebug,
+				pallet_contracts::CollectEvents::UnsafeCollect,
 				pallet_contracts::Determinism::Enforced,
 			)
 		}
@@ -1981,7 +1983,7 @@ impl_runtime_apis! {
 			code: pallet_contracts_primitives::Code<Hash>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance>
+		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance, EventRecord>
 		{
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
 			Contracts::bare_instantiate(
@@ -1992,7 +1994,8 @@ impl_runtime_apis! {
 				code,
 				data,
 				salt,
-				CONTRACTS_DEBUG_OUTPUT
+				pallet_contracts::DebugInfo::UnsafeDebug,
+				pallet_contracts::CollectEvents::UnsafeCollect,
 			)
 		}
 
@@ -2036,6 +2039,7 @@ impl_runtime_apis! {
 #[allow(dead_code)]
 struct CheckInherents;
 
+#[allow(deprecated)]
 impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
 	fn check_inherents(
 		block: &Block,
diff --git a/runtime/amplitude/src/weights/dia_oracle.rs b/runtime/amplitude/src/weights/dia_oracle.rs
new file mode 100644
index 000000000..de7cf5102
--- /dev/null
+++ b/runtime/amplitude/src/weights/dia_oracle.rs
@@ -0,0 +1,135 @@
+
+//! Autogenerated weights for dia_oracle
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+
+// Executed Command:
+// ../target/production/pendulum-node
+// benchmark
+// pallet
+// --chain
+// amplitude
+// --wasm-execution=compiled
+// --pallet
+// dia_oracle
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+// --output
+// ../runtime/amplitude/src/weights/dia_oracle.rs
+// --template
+// frame-weight-template.hbs
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for dia_oracle using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> dia_oracle::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::SupportedCurrencies` (r:1 w:1)
+	/// Proof: `DiaOracleModule::SupportedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn add_currency() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `438`
+		//  Estimated: `3903`
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 3903)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::SupportedCurrencies` (r:1 w:0)
+	/// Proof: `DiaOracleModule::SupportedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn remove_currency() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `438`
+		//  Estimated: `3903`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 3903)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:1)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn authorize_account() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `287`
+		//  Estimated: `3752`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 3752)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:2 w:1)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn authorize_account_signed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `324`
+		//  Estimated: `6264`
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 6264)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn deauthorize_account() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `287`
+		//  Estimated: `3752`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 3752)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:2 w:1)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn deauthorize_account_signed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `324`
+		//  Estimated: `6264`
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 6264)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::CoinInfosMap` (r:0 w:1)
+	/// Proof: `DiaOracleModule::CoinInfosMap` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn set_updated_coin_infos() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `324`
+		//  Estimated: `3789`
+		// Minimum execution time: 10_028_000_000 picoseconds.
+		Weight::from_parts(10_131_000_000, 3789)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::BatchingApi` (r:0 w:1)
+	/// Proof: `DiaOracleModule::BatchingApi` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn set_batching_api() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `324`
+		//  Estimated: `3789`
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 3789)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+}
\ No newline at end of file
diff --git a/runtime/amplitude/src/weights/fee.rs b/runtime/amplitude/src/weights/fee.rs
index 1112cc6b2..6d733defe 100644
--- a/runtime/amplitude/src/weights/fee.rs
+++ b/runtime/amplitude/src/weights/fee.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for fee
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // fee
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/
+// ../runtime/amplitude/src/weights/fee.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,64 +38,64 @@ use core::marker::PhantomData;
 /// Weights for fee using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> fee::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Fee IssueFee (r:0 w:1)
-	/// Proof Skipped: Fee IssueFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::IssueFee` (r:0 w:1)
+	/// Proof: `Fee::IssueFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_issue_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee IssueGriefingCollateral (r:0 w:1)
-	/// Proof Skipped: Fee IssueGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::IssueGriefingCollateral` (r:0 w:1)
+	/// Proof: `Fee::IssueGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_issue_griefing_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee RedeemFee (r:0 w:1)
-	/// Proof Skipped: Fee RedeemFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::RedeemFee` (r:0 w:1)
+	/// Proof: `Fee::RedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_redeem_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee PremiumRedeemFee (r:0 w:1)
-	/// Proof Skipped: Fee PremiumRedeemFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::PremiumRedeemFee` (r:0 w:1)
+	/// Proof: `Fee::PremiumRedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_premium_redeem_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee PunishmentFee (r:0 w:1)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::PunishmentFee` (r:0 w:1)
+	/// Proof: `Fee::PunishmentFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_punishment_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee ReplaceGriefingCollateral (r:0 w:1)
-	/// Proof Skipped: Fee ReplaceGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::ReplaceGriefingCollateral` (r:0 w:1)
+	/// Proof: `Fee::ReplaceGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_replace_griefing_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/amplitude/src/weights/issue.rs b/runtime/amplitude/src/weights/issue.rs
index 21cac350b..c5ac3fb47 100644
--- a/runtime/amplitude/src/weights/issue.rs
+++ b/runtime/amplitude/src/weights/issue.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for issue
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Marcels-MBP`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // issue
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/
+// ../runtime/amplitude/src/weights/issue.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,127 +38,127 @@ use core::marker::PhantomData;
 /// Weights for issue using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> issue::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Issue LimitVolumeAmount (r:1 w:0)
-	/// Proof: Issue LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:3 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee IssueGriefingCollateral (r:1 w:0)
-	/// Proof Skipped: Fee IssueGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Issue IssueMinimumTransferAmount (r:1 w:0)
-	/// Proof: Issue IssueMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee IssueFee (r:1 w:0)
-	/// Proof Skipped: Fee IssueFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Security Nonce (r:1 w:1)
-	/// Proof Skipped: Security Nonce (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry VaultStellarPublicKey (r:1 w:0)
-	/// Proof Skipped: VaultRegistry VaultStellarPublicKey (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Issue IssuePeriod (r:1 w:0)
-	/// Proof: Issue IssuePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Issue IssueRequests (r:0 w:1)
-	/// Proof: Issue IssueRequests (max_values: None, max_size: Some(339), added: 2814, mode: MaxEncodedLen)
+	/// Storage: `Issue::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Issue::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:3 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::IssueGriefingCollateral` (r:1 w:0)
+	/// Proof: `Fee::IssueGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IssueMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Issue::IssueMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Fee::IssueFee` (r:1 w:0)
+	/// Proof: `Fee::IssueFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::Nonce` (r:1 w:1)
+	/// Proof: `Security::Nonce` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::ParentHash` (r:1 w:0)
+	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::VaultStellarPublicKey` (r:1 w:0)
+	/// Proof: `VaultRegistry::VaultStellarPublicKey` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Issue::IssuePeriod` (r:1 w:0)
+	/// Proof: `Issue::IssuePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IssueRequests` (r:0 w:1)
+	/// Proof: `Issue::IssueRequests` (`max_values`: None, `max_size`: Some(339), added: 2814, mode: `MaxEncodedLen`)
 	fn request_issue() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1923`
-		//  Estimated: `10338`
-		// Minimum execution time: 102_000_000 picoseconds.
-		Weight::from_parts(105_000_000, 10338)
+		//  Estimated: `11106`
+		// Minimum execution time: 89_000_000 picoseconds.
+		Weight::from_parts(91_000_000, 11106)
 			.saturating_add(T::DbWeight::get().reads(18_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Issue IssueRequests (r:1 w:1)
-	/// Proof: Issue IssueRequests (max_values: None, max_size: Some(339), added: 2814, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:1 w:0)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Validators (r:1 w:0)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:0)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee IssueFee (r:1 w:0)
-	/// Proof Skipped: Fee IssueFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Issue LimitVolumeAmount (r:1 w:0)
-	/// Proof: Issue LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:1 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Issue::IssueRequests` (r:1 w:1)
+	/// Proof: `Issue::IssueRequests` (`max_values`: None, `max_size`: Some(339), added: 2814, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:1 w:0)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Validators` (r:1 w:0)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:0)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Fee::IssueFee` (r:1 w:0)
+	/// Proof: `Fee::IssueFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Issue::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Issue::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:2 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
 	fn execute_issue() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2498`
 		//  Estimated: `71867`
-		// Minimum execution time: 8_831_000_000 picoseconds.
-		Weight::from_parts(8_902_000_000, 71867)
+		// Minimum execution time: 7_993_000_000 picoseconds.
+		Weight::from_parts(8_184_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(11_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Issue IssueRequests (r:1 w:1)
-	/// Proof: Issue IssueRequests (max_values: None, max_size: Some(339), added: 2814, mode: MaxEncodedLen)
-	/// Storage: Issue IssuePeriod (r:1 w:0)
-	/// Proof: Issue IssuePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Issue::IssueRequests` (r:1 w:1)
+	/// Proof: `Issue::IssueRequests` (`max_values`: None, `max_size`: Some(339), added: 2814, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IssuePeriod` (r:1 w:0)
+	/// Proof: `Issue::IssuePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn cancel_issue() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1303`
 		//  Estimated: `4768`
-		// Minimum execution time: 38_000_000 picoseconds.
-		Weight::from_parts(39_000_000, 4768)
+		// Minimum execution time: 32_000_000 picoseconds.
+		Weight::from_parts(33_000_000, 4768)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Issue IssuePeriod (r:0 w:1)
-	/// Proof: Issue IssuePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Issue::IssuePeriod` (r:0 w:1)
+	/// Proof: `Issue::IssuePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_issue_period() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Issue LimitVolumeAmount (r:0 w:1)
-	/// Proof: Issue LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Issue LimitVolumeCurrencyId (r:0 w:1)
-	/// Proof: Issue LimitVolumeCurrencyId (max_values: Some(1), max_size: Some(46), added: 541, mode: MaxEncodedLen)
-	/// Storage: Issue IntervalLength (r:0 w:1)
-	/// Proof: Issue IntervalLength (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Issue::LimitVolumeAmount` (r:0 w:1)
+	/// Proof: `Issue::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::LimitVolumeCurrencyId` (r:0 w:1)
+	/// Proof: `Issue::LimitVolumeCurrencyId` (`max_values`: Some(1), `max_size`: Some(46), added: 541, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IntervalLength` (r:0 w:1)
+	/// Proof: `Issue::IntervalLength` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn rate_limit_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Issue IssueMinimumTransferAmount (r:0 w:1)
-	/// Proof: Issue IssueMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Issue::IssueMinimumTransferAmount` (r:0 w:1)
+	/// Proof: `Issue::IssueMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn minimum_transfer_amount_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/amplitude/src/weights/mod.rs b/runtime/amplitude/src/weights/mod.rs
index 8f02474aa..8ad802f7b 100644
--- a/runtime/amplitude/src/weights/mod.rs
+++ b/runtime/amplitude/src/weights/mod.rs
@@ -18,23 +18,24 @@
 //! Expose the auto generated weight files.
 
 pub mod block_weights;
+pub mod dia_oracle;
 pub mod extrinsic_weights;
-pub mod pallet_xcm;
-pub mod paritydb_weights;
-pub mod rocksdb_weights;
-pub mod parachain_staking;
-pub mod orml_asset_registry;
-pub mod orml_currencies_allowance_extension;
-pub mod treasury_buyout_extension;
 pub mod fee;
 pub mod issue;
 pub mod nomination;
 pub mod oracle;
+pub mod orml_asset_registry;
+pub mod orml_currencies_allowance_extension;
+pub mod pallet_xcm;
+pub mod parachain_staking;
+pub mod paritydb_weights;
 pub mod redeem;
 pub mod replace;
+pub mod rocksdb_weights;
 pub mod stellar_relay;
+pub mod treasury_buyout_extension;
 pub mod vault_registry;
 
 pub use block_weights::constants::BlockExecutionWeight;
 pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
-pub use rocksdb_weights::constants::RocksDbWeight;
\ No newline at end of file
+pub use rocksdb_weights::constants::RocksDbWeight;
diff --git a/runtime/amplitude/src/weights/nomination.rs b/runtime/amplitude/src/weights/nomination.rs
index 01f15c087..04c079682 100644
--- a/runtime/amplitude/src/weights/nomination.rs
+++ b/runtime/amplitude/src/weights/nomination.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for nomination
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // nomination
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/
+// ../runtime/amplitude/src/weights/nomination.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,190 +38,194 @@ use core::marker::PhantomData;
 /// Weights for nomination using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> nomination::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Nomination NominationEnabled (r:0 w:1)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Nomination::NominationEnabled` (r:0 w:1)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn set_nomination_enabled() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Nomination NominationEnabled (r:1 w:0)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Nomination Vaults (r:1 w:1)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::NominationEnabled` (r:1 w:0)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::Vaults` (r:1 w:1)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
 	fn opt_in_to_nomination() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `780`
 		//  Estimated: `4245`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(28_000_000, 4245)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 4245)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Nomination Vaults (r:1 w:1)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:1)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:2 w:2)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:2 w:2)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:2 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:2 w:2)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:2 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:2 w:2)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:2 w:2)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::Vaults` (r:1 w:1)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:1)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:2 w:2)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:2 w:2)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:2 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:2 w:2)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:2 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:2 w:2)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:2 w:2)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn opt_out_of_nomination() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2427`
-		//  Estimated: `8367`
-		// Minimum execution time: 214_000_000 picoseconds.
-		Weight::from_parts(226_000_000, 8367)
-			.saturating_add(T::DbWeight::get().reads(25_u64))
+		//  Measured:  `2531`
+		//  Estimated: `8471`
+		// Minimum execution time: 174_000_000 picoseconds.
+		Weight::from_parts(176_000_000, 8471)
+			.saturating_add(T::DbWeight::get().reads(27_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Nomination NominationEnabled (r:1 w:0)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Nomination Vaults (r:1 w:0)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:2 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:2 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::NominationEnabled` (r:1 w:0)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Nomination::Vaults` (r:1 w:0)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:2 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:2 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn deposit_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `3100`
 		//  Estimated: `9040`
-		// Minimum execution time: 208_000_000 picoseconds.
-		Weight::from_parts(216_000_000, 9040)
+		// Minimum execution time: 162_000_000 picoseconds.
+		Weight::from_parts(164_000_000, 9040)
 			.saturating_add(T::DbWeight::get().reads(28_u64))
 			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Nomination NominationEnabled (r:1 w:0)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Nomination Vaults (r:1 w:0)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Nomination::NominationEnabled` (r:1 w:0)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Nomination::Vaults` (r:1 w:0)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn withdraw_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3292`
-		//  Estimated: `6757`
-		// Minimum execution time: 195_000_000 picoseconds.
-		Weight::from_parts(200_000_000, 6757)
-			.saturating_add(T::DbWeight::get().reads(24_u64))
+		//  Measured:  `3396`
+		//  Estimated: `7734`
+		// Minimum execution time: 162_000_000 picoseconds.
+		Weight::from_parts(165_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(26_u64))
 			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/amplitude/src/weights/oracle.rs b/runtime/amplitude/src/weights/oracle.rs
index 6f60749fc..53dc61c46 100644
--- a/runtime/amplitude/src/weights/oracle.rs
+++ b/runtime/amplitude/src/weights/oracle.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for oracle
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // oracle
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/
+// ../runtime/amplitude/src/weights/oracle.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,36 +38,36 @@ use core::marker::PhantomData;
 /// Weights for oracle using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> oracle::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Timestamp Now (r:0 w:1)
-	/// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Timestamp DidUpdate (r:0 w:1)
-	/// Proof: Timestamp DidUpdate (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Timestamp::Now` (r:0 w:1)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Timestamp::DidUpdate` (r:0 w:1)
+	/// Proof: `Timestamp::DidUpdate` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn on_initialize() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 1_000_000 picoseconds.
-		Weight::from_parts(2_000_000, 0)
+		Weight::from_parts(1_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Oracle OracleKeys (r:0 w:1)
-	/// Proof Skipped: Oracle OracleKeys (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Oracle::OracleKeys` (r:0 w:1)
+	/// Proof: `Oracle::OracleKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn update_oracle_keys() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Oracle MaxDelay (r:0 w:1)
-	/// Proof Skipped: Oracle MaxDelay (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Oracle::MaxDelay` (r:0 w:1)
+	/// Proof: `Oracle::MaxDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_max_delay() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/amplitude/src/weights/orml_asset_registry.rs b/runtime/amplitude/src/weights/orml_asset_registry.rs
index 200ff9c48..818862fbe 100644
--- a/runtime/amplitude/src/weights/orml_asset_registry.rs
+++ b/runtime/amplitude/src/weights/orml_asset_registry.rs
@@ -1,22 +1,21 @@
 
-//! Autogenerated weights for `orml_asset_registry`
+//! Autogenerated weights for orml_asset_registry
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Marcels-MBP`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// orml-asset-registry
+// orml_asset_registry
 // --extrinsic
 // *
 // --steps
@@ -24,45 +23,46 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/orml_asset_registry.rs
+// ../runtime/amplitude/src/weights/orml_asset_registry.rs
+// --template
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
+#![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
 
-/// Weight functions for `orml_asset_registry`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> orml_asset_registry::WeightInfo for WeightInfo<T> {
-	/// Storage: AssetRegistry Metadata (r:1 w:1)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry LocationToAssetId (r:1 w:1)
-	/// Proof Skipped: AssetRegistry LocationToAssetId (max_values: None, max_size: None, mode: Measured)
+/// Weights for orml_asset_registry using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> orml_asset_registry::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:1)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationToAssetId` (r:1 w:1)
+	/// Proof: `AssetRegistry::LocationToAssetId` (`max_values`: None, `max_size`: Some(656), added: 3131, mode: `MaxEncodedLen`)
 	fn register_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `104`
-		//  Estimated: `7138`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 7138))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Estimated: `4362`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 4362)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: AssetRegistry Metadata (r:1 w:1)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry LocationToAssetId (r:1 w:2)
-	/// Proof Skipped: AssetRegistry LocationToAssetId (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:1)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationToAssetId` (r:1 w:2)
+	/// Proof: `AssetRegistry::LocationToAssetId` (`max_values`: None, `max_size`: Some(656), added: 3131, mode: `MaxEncodedLen`)
 	fn update_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `745`
-		//  Estimated: `8420`
-		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(26_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 8420))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `767`
+		//  Estimated: `4362`
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 4362)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	fn set_asset_location() -> Weight {
 		// Proof Size summary in bytes:
@@ -70,6 +70,5 @@ impl<T: frame_system::Config> orml_asset_registry::WeightInfo for WeightInfo<T>
 		//  Estimated: `0`
 		// Minimum execution time: 0_000 picoseconds.
 		Weight::from_parts(0, 0)
-			.saturating_add(Weight::from_parts(0, 0))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/amplitude/src/weights/orml_currencies_allowance_extension.rs b/runtime/amplitude/src/weights/orml_currencies_allowance_extension.rs
index 4eae616b7..ff05ef45f 100644
--- a/runtime/amplitude/src/weights/orml_currencies_allowance_extension.rs
+++ b/runtime/amplitude/src/weights/orml_currencies_allowance_extension.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for orml_currencies_allowance_extension
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // orml_currencies_allowance_extension
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/
+// ../runtime/amplitude/src/weights/orml_currencies_allowance_extension.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -38,59 +37,59 @@ use core::marker::PhantomData;
 
 /// Weights for orml_currencies_allowance_extension using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> orml_currencies_allowance_extension::default_weights::WeightInfo for SubstrateWeight<T> {
-	/// Storage: TokenAllowance AllowedCurrencies (r:2 w:1)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
+impl<T: frame_system::Config> orml_currencies_allowance_extension::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:2 w:1)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `n` is `[1, 256]`.
 	fn add_allowed_currencies(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `6082`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(20_059_699, 6082)
-			// Standard Error: 2_380
-			.saturating_add(Weight::from_parts(1_332_341, 0).saturating_mul(n.into()))
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_008_345, 6082)
+			// Standard Error: 2_122
+			.saturating_add(Weight::from_parts(1_012_948, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TokenAllowance AllowedCurrencies (r:0 w:1)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:0 w:1)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `n` is `[1, 256]`.
 	fn remove_allowed_currencies(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(10_779_821, 0)
-			// Standard Error: 4_298
-			.saturating_add(Weight::from_parts(1_334_011, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_434_399, 0)
+			// Standard Error: 1_272
+			.saturating_add(Weight::from_parts(999_387, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TokenAllowance AllowedCurrencies (r:1 w:0)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TokenAllowance Approvals (r:0 w:1)
-	/// Proof Skipped: TokenAllowance Approvals (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:1 w:0)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `TokenAllowance::Approvals` (r:0 w:1)
+	/// Proof: `TokenAllowance::Approvals` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn approve() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `184`
 		//  Estimated: `3649`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 3649)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 3649)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TokenAllowance AllowedCurrencies (r:1 w:0)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TokenAllowance Approvals (r:1 w:1)
-	/// Proof Skipped: TokenAllowance Approvals (max_values: None, max_size: None, mode: Measured)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:1 w:0)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `TokenAllowance::Approvals` (r:1 w:1)
+	/// Proof: `TokenAllowance::Approvals` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_from() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `561`
 		//  Estimated: `6196`
-		// Minimum execution time: 73_000_000 picoseconds.
-		Weight::from_parts(74_000_000, 6196)
+		// Minimum execution time: 54_000_000 picoseconds.
+		Weight::from_parts(55_000_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
diff --git a/runtime/amplitude/src/weights/pallet_xcm.rs b/runtime/amplitude/src/weights/pallet_xcm.rs
index d1c9d3932..6a6f21925 100644
--- a/runtime/amplitude/src/weights/pallet_xcm.rs
+++ b/runtime/amplitude/src/weights/pallet_xcm.rs
@@ -1,22 +1,21 @@
 
-//! Autogenerated weights for `pallet_xcm`
+//! Autogenerated weights for pallet_xcm
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `pop-os`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// pallet-xcm
+// pallet_xcm
 // --extrinsic
 // *
 // --steps
@@ -24,251 +23,237 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/
+// ../runtime/amplitude/src/weights/pallet_xcm.rs
+// --template
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_xcm`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+/// Weights for pallet_xcm using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_xcm::WeightInfo for SubstrateWeight<T> {
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `212`
-		//  Estimated: `3677`
-		// Minimum execution time: 38_682_000 picoseconds.
-		Weight::from_parts(39_311_000, 0)
-			.saturating_add(Weight::from_parts(0, 3677))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `245`
+		//  Estimated: `3710`
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 3710)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Benchmark Override (r:0 w:0)
-	/// Proof Skipped: Benchmark Override (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Benchmark::Override` (r:0 w:0)
+	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn teleport_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)
-			.saturating_add(Weight::from_parts(0, 0))
 	}
-	/// Storage: ParachainInfo ParachainId (r:1 w:0)
-	/// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `32`
 		//  Estimated: `1489`
-		// Minimum execution time: 49_359_000 picoseconds.
-		Weight::from_parts(63_536_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 1489)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_605_000 picoseconds.
-		Weight::from_parts(13_911_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 	}
-	/// Storage: PolkadotXcm SupportedVersion (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_xcm_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 14_367_000 picoseconds.
-		Weight::from_parts(14_725_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: PolkadotXcm SafeXcmVersion (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:0 w:1)
+	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn force_default_xcm_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_740_000 picoseconds.
-		Weight::from_parts(5_088_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm QueryCounter (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm Queries (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
+	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `212`
-		//  Estimated: `3677`
-		// Minimum execution time: 45_605_000 picoseconds.
-		Weight::from_parts(46_297_000, 0)
-			.saturating_add(Weight::from_parts(0, 3677))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
+		//  Measured:  `245`
+		//  Estimated: `3710`
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(25_000_000, 3710)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm Queries (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
+	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `395`
-		//  Estimated: `3860`
-		// Minimum execution time: 45_319_000 picoseconds.
-		Weight::from_parts(46_314_000, 0)
-			.saturating_add(Weight::from_parts(0, 3860))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `428`
+		//  Estimated: `3893`
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 3893)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
+	/// Proof: `PolkadotXcm::XcmExecutionSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn force_suspension() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_724_000 picoseconds.
-		Weight::from_parts(5_021_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: PolkadotXcm SupportedVersion (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:4 w:2)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `196`
-		//  Estimated: `11086`
-		// Minimum execution time: 22_211_000 picoseconds.
-		Weight::from_parts(22_666_000, 0)
-			.saturating_add(Weight::from_parts(0, 11086))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `254`
+		//  Estimated: `11144`
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 11144)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifiers (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:4 w:2)
+	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `200`
-		//  Estimated: `11090`
-		// Minimum execution time: 22_156_000 picoseconds.
-		Weight::from_parts(22_487_000, 0)
-			.saturating_add(Weight::from_parts(0, 11090))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `258`
+		//  Estimated: `11148`
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 11148)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:5 w:0)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `207`
-		//  Estimated: `13572`
-		// Minimum execution time: 23_349_000 picoseconds.
-		Weight::from_parts(24_075_000, 0)
-			.saturating_add(Weight::from_parts(0, 13572))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `265`
+		//  Estimated: `13630`
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 13630)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `279`
-		//  Estimated: `6219`
-		// Minimum execution time: 41_998_000 picoseconds.
-		Weight::from_parts(42_566_000, 0)
-			.saturating_add(Weight::from_parts(0, 6219))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `312`
+		//  Estimated: `6252`
+		// Minimum execution time: 23_000_000 picoseconds.
+		Weight::from_parts(25_000_000, 6252)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:3 w:0)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `239`
-		//  Estimated: `8654`
-		// Minimum execution time: 12_897_000 picoseconds.
-		Weight::from_parts(13_235_000, 0)
-			.saturating_add(Weight::from_parts(0, 8654))
-			.saturating_add(T::DbWeight::get().reads(3))
+		//  Measured:  `272`
+		//  Estimated: `8687`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 8687)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `207`
-		//  Estimated: `11097`
-		// Minimum execution time: 22_372_000 picoseconds.
-		Weight::from_parts(22_905_000, 0)
-			.saturating_add(Weight::from_parts(0, 11097))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `265`
+		//  Estimated: `11155`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 11155)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `283`
-		//  Estimated: `11173`
-		// Minimum execution time: 50_944_000 picoseconds.
-		Weight::from_parts(51_564_000, 0)
-			.saturating_add(Weight::from_parts(0, 11173))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `341`
+		//  Estimated: `11231`
+		// Minimum execution time: 30_000_000 picoseconds.
+		Weight::from_parts(31_000_000, 11231)
+			.saturating_add(T::DbWeight::get().reads(9_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/amplitude/src/weights/redeem.rs b/runtime/amplitude/src/weights/redeem.rs
index 72f447f6d..45a004a6e 100644
--- a/runtime/amplitude/src/weights/redeem.rs
+++ b/runtime/amplitude/src/weights/redeem.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for redeem
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ./target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // redeem
@@ -39,257 +38,267 @@ use core::marker::PhantomData;
 /// Weights for redeem using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> redeem::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Redeem LimitVolumeAmount (r:1 w:0)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: Fee RedeemFee (r:1 w:0)
-	/// Proof Skipped: Fee RedeemFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemMinimumTransferAmount (r:1 w:0)
-	/// Proof: Redeem RedeemMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Security Nonce (r:1 w:1)
-	/// Proof Skipped: Security Nonce (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PremiumRedeemFee (r:1 w:0)
-	/// Proof Skipped: Fee PremiumRedeemFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemRequests (r:0 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
+	/// Storage: `Redeem::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Redeem::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::RedeemFee` (r:1 w:0)
+	/// Proof: `Fee::RedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Redeem::RedeemMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Security::Nonce` (r:1 w:1)
+	/// Proof: `Security::Nonce` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::ParentHash` (r:1 w:0)
+	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::PremiumRedeemFee` (r:1 w:0)
+	/// Proof: `Fee::PremiumRedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemPeriod` (r:1 w:0)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::RedeemRequests` (r:0 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
 	fn request_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1527`
-		//  Estimated: `4992`
-		// Minimum execution time: 97_000_000 picoseconds.
-		Weight::from_parts(102_000_000, 4992)
-			.saturating_add(T::DbWeight::get().reads(14_u64))
+		//  Measured:  `1631`
+		//  Estimated: `7734`
+		// Minimum execution time: 90_000_000 picoseconds.
+		Weight::from_parts(151_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(16_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Tokens Accounts (r:3 w:3)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Tokens TotalIssuance (r:1 w:1)
-	/// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry LiquidationVault (r:1 w:1)
-	/// Proof Skipped: VaultRegistry LiquidationVault (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Tokens::Accounts` (r:3 w:3)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::LiquidationVault` (r:1 w:1)
+	/// Proof: `VaultRegistry::LiquidationVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn liquidation_redeem() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1346`
 		//  Estimated: `8865`
-		// Minimum execution time: 125_000_000 picoseconds.
-		Weight::from_parts(129_000_000, 8865)
+		// Minimum execution time: 101_000_000 picoseconds.
+		Weight::from_parts(105_000_000, 8865)
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:1 w:0)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Validators (r:1 w:0)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:0)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: Redeem LimitVolumeAmount (r:1 w:0)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:1 w:0)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Validators` (r:1 w:0)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:0)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Redeem::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn execute_redeem() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1731`
 		//  Estimated: `71867`
-		// Minimum execution time: 8_279_000_000 picoseconds.
-		Weight::from_parts(8_432_000_000, 71867)
+		// Minimum execution time: 8_235_000_000 picoseconds.
+		Weight::from_parts(8_350_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PunishmentFee (r:1 w:0)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PunishmentDelay (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Redeem CancelledRedeemAmount (r:0 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::RedeemPeriod` (r:1 w:0)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::PunishmentFee` (r:1 w:0)
+	/// Proof: `Fee::PunishmentFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PunishmentDelay` (r:1 w:0)
+	/// Proof: `VaultRegistry::PunishmentDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:2 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::CancelledRedeemAmount` (r:0 w:1)
+	/// Proof: `Redeem::CancelledRedeemAmount` (`max_values`: None, `max_size`: Some(110), added: 2585, mode: `MaxEncodedLen`)
 	fn cancel_redeem_reimburse() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2658`
-		//  Estimated: `6123`
-		// Minimum execution time: 156_000_000 picoseconds.
-		Weight::from_parts(160_000_000, 6123)
-			.saturating_add(T::DbWeight::get().reads(20_u64))
+		//  Measured:  `2762`
+		//  Estimated: `7734`
+		// Minimum execution time: 139_000_000 picoseconds.
+		Weight::from_parts(141_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(22_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PunishmentFee (r:1 w:0)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PunishmentDelay (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem CancelledRedeemAmount (r:0 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::RedeemPeriod` (r:1 w:0)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::PunishmentFee` (r:1 w:0)
+	/// Proof: `Fee::PunishmentFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PunishmentDelay` (r:1 w:0)
+	/// Proof: `VaultRegistry::PunishmentDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::CancelledRedeemAmount` (r:0 w:1)
+	/// Proof: `Redeem::CancelledRedeemAmount` (`max_values`: None, `max_size`: Some(110), added: 2585, mode: `MaxEncodedLen`)
 	fn cancel_redeem_retry() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2551`
-		//  Estimated: `6016`
-		// Minimum execution time: 133_000_000 picoseconds.
-		Weight::from_parts(145_000_000, 6016)
-			.saturating_add(T::DbWeight::get().reads(17_u64))
+		//  Measured:  `2655`
+		//  Estimated: `7734`
+		// Minimum execution time: 115_000_000 picoseconds.
+		Weight::from_parts(117_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(19_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Tokens TotalIssuance (r:1 w:1)
-	/// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:2 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
 	fn self_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1620`
+		//  Measured:  `1724`
 		//  Estimated: `6096`
-		// Minimum execution time: 98_000_000 picoseconds.
-		Weight::from_parts(105_000_000, 6096)
-			.saturating_add(T::DbWeight::get().reads(7_u64))
+		// Minimum execution time: 83_000_000 picoseconds.
+		Weight::from_parts(86_000_000, 6096)
+			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Redeem RedeemPeriod (r:0 w:1)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Redeem::RedeemPeriod` (r:0 w:1)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_redeem_period() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem CancelledRedeemAmount (r:1 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::CancelledRedeemAmount` (r:1 w:1)
+	/// Proof: `Redeem::CancelledRedeemAmount` (`max_values`: None, `max_size`: Some(110), added: 2585, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn mint_tokens_for_reimbursed_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1839`
-		//  Estimated: `5304`
-		// Minimum execution time: 76_000_000 picoseconds.
-		Weight::from_parts(80_000_000, 5304)
-			.saturating_add(T::DbWeight::get().reads(7_u64))
+		//  Measured:  `1943`
+		//  Estimated: `7734`
+		// Minimum execution time: 66_000_000 picoseconds.
+		Weight::from_parts(70_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Redeem LimitVolumeAmount (r:0 w:1)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Redeem LimitVolumeCurrencyId (r:0 w:1)
-	/// Proof: Redeem LimitVolumeCurrencyId (max_values: Some(1), max_size: Some(46), added: 541, mode: MaxEncodedLen)
-	/// Storage: Redeem IntervalLength (r:0 w:1)
-	/// Proof: Redeem IntervalLength (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Redeem::LimitVolumeAmount` (r:0 w:1)
+	/// Proof: `Redeem::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::LimitVolumeCurrencyId` (r:0 w:1)
+	/// Proof: `Redeem::LimitVolumeCurrencyId` (`max_values`: Some(1), `max_size`: Some(46), added: 541, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::IntervalLength` (r:0 w:1)
+	/// Proof: `Redeem::IntervalLength` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn rate_limit_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Redeem RedeemMinimumTransferAmount (r:0 w:1)
-	/// Proof: Redeem RedeemMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Redeem::RedeemMinimumTransferAmount` (r:0 w:1)
+	/// Proof: `Redeem::RedeemMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn minimum_transfer_amount_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(11_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/amplitude/src/weights/replace.rs b/runtime/amplitude/src/weights/replace.rs
index 6539d108b..60f610f3b 100644
--- a/runtime/amplitude/src/weights/replace.rs
+++ b/runtime/amplitude/src/weights/replace.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for replace
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // replace
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/
+// ../runtime/amplitude/src/weights/replace.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,185 +38,191 @@ use core::marker::PhantomData;
 /// Weights for replace using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> replace::WeightInfo for SubstrateWeight<T> {
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Nomination Vaults (r:1 w:0)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: Replace ReplaceMinimumTransferAmount (r:1 w:0)
-	/// Proof: Replace ReplaceMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Fee ReplaceGriefingCollateral (r:1 w:0)
-	/// Proof Skipped: Fee ReplaceGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::Vaults` (r:1 w:0)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `Replace::ReplaceMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Replace::ReplaceMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::ReplaceGriefingCollateral` (r:1 w:0)
+	/// Proof: `Fee::ReplaceGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn request_replace() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1498`
-		//  Estimated: `4963`
-		// Minimum execution time: 73_000_000 picoseconds.
-		Weight::from_parts(76_000_000, 4963)
-			.saturating_add(T::DbWeight::get().reads(6_u64))
+		//  Measured:  `1602`
+		//  Estimated: `7734`
+		// Minimum execution time: 59_000_000 picoseconds.
+		Weight::from_parts(62_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn withdraw_replace() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `650`
 		//  Estimated: `4115`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(31_000_000, 4115)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 4115)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:2 w:2)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Replace ReplaceMinimumTransferAmount (r:1 w:0)
-	/// Proof: Replace ReplaceMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Security Nonce (r:1 w:1)
-	/// Proof Skipped: Security Nonce (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Replace ReplacePeriod (r:1 w:0)
-	/// Proof: Replace ReplacePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Replace ReplaceRequests (r:0 w:1)
-	/// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(431), added: 2906, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::Vaults` (r:2 w:2)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Replace::ReplaceMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Replace::ReplaceMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Security::Nonce` (r:1 w:1)
+	/// Proof: `Security::Nonce` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::ParentHash` (r:1 w:0)
+	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Replace::ReplacePeriod` (r:1 w:0)
+	/// Proof: `Replace::ReplacePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Replace::ReplaceRequests` (r:0 w:1)
+	/// Proof: `Replace::ReplaceRequests` (`max_values`: None, `max_size`: Some(431), added: 2906, mode: `MaxEncodedLen`)
 	fn accept_replace() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3277`
-		//  Estimated: `9217`
-		// Minimum execution time: 233_000_000 picoseconds.
-		Weight::from_parts(248_000_000, 9217)
-			.saturating_add(T::DbWeight::get().reads(27_u64))
+		//  Measured:  `3379`
+		//  Estimated: `9319`
+		// Minimum execution time: 194_000_000 picoseconds.
+		Weight::from_parts(200_000_000, 9319)
+			.saturating_add(T::DbWeight::get().reads(29_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
-	/// Storage: Replace ReplaceRequests (r:1 w:1)
-	/// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(431), added: 2906, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:1 w:0)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Validators (r:1 w:0)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:0)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:2 w:2)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Replace::ReplaceRequests` (r:1 w:1)
+	/// Proof: `Replace::ReplaceRequests` (`max_values`: None, `max_size`: Some(431), added: 2906, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:1 w:0)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Validators` (r:1 w:0)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:0)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:2 w:2)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn execute_replace() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1968`
 		//  Estimated: `71867`
-		// Minimum execution time: 8_218_000_000 picoseconds.
-		Weight::from_parts(8_353_000_000, 71867)
+		// Minimum execution time: 7_936_000_000 picoseconds.
+		Weight::from_parts(8_126_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Replace ReplaceRequests (r:1 w:1)
-	/// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(431), added: 2906, mode: MaxEncodedLen)
-	/// Storage: Replace ReplacePeriod (r:1 w:0)
-	/// Proof: Replace ReplacePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:2 w:2)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Replace::ReplaceRequests` (r:1 w:1)
+	/// Proof: `Replace::ReplaceRequests` (`max_values`: None, `max_size`: Some(431), added: 2906, mode: `MaxEncodedLen`)
+	/// Storage: `Replace::ReplacePeriod` (r:1 w:0)
+	/// Proof: `Replace::ReplacePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:2 w:2)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn cancel_replace() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3080`
-		//  Estimated: `9020`
-		// Minimum execution time: 144_000_000 picoseconds.
-		Weight::from_parts(164_000_000, 9020)
-			.saturating_add(T::DbWeight::get().reads(20_u64))
+		//  Measured:  `3182`
+		//  Estimated: `9122`
+		// Minimum execution time: 118_000_000 picoseconds.
+		Weight::from_parts(123_000_000, 9122)
+			.saturating_add(T::DbWeight::get().reads(22_u64))
 			.saturating_add(T::DbWeight::get().writes(10_u64))
 	}
-	/// Storage: Replace ReplacePeriod (r:0 w:1)
-	/// Proof: Replace ReplacePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Replace::ReplacePeriod` (r:0 w:1)
+	/// Proof: `Replace::ReplacePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_replace_period() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Replace ReplaceMinimumTransferAmount (r:0 w:1)
-	/// Proof: Replace ReplaceMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Replace::ReplaceMinimumTransferAmount` (r:0 w:1)
+	/// Proof: `Replace::ReplaceMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn minimum_transfer_amount_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/amplitude/src/weights/stellar_relay.rs b/runtime/amplitude/src/weights/stellar_relay.rs
index cb81cc0d2..4ccf75b88 100644
--- a/runtime/amplitude/src/weights/stellar_relay.rs
+++ b/runtime/amplitude/src/weights/stellar_relay.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for stellar_relay
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // stellar_relay
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/
+// ../runtime/amplitude/src/weights/stellar_relay.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,22 +38,22 @@ use core::marker::PhantomData;
 /// Weights for stellar_relay using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> stellar_relay::WeightInfo for SubstrateWeight<T> {
-	/// Storage: StellarRelay Validators (r:1 w:1)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:1)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: StellarRelay OldValidators (r:0 w:1)
-	/// Proof: StellarRelay OldValidators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:0 w:1)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay OldOrganizations (r:0 w:1)
-	/// Proof: StellarRelay OldOrganizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
+	/// Storage: `StellarRelay::Validators` (r:1 w:1)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:1)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::OldValidators` (r:0 w:1)
+	/// Proof: `StellarRelay::OldValidators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:0 w:1)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::OldOrganizations` (r:0 w:1)
+	/// Proof: `StellarRelay::OldOrganizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
 	fn update_tier_1_validator_set() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2446`
 		//  Estimated: `71867`
-		// Minimum execution time: 150_000_000 picoseconds.
-		Weight::from_parts(152_000_000, 71867)
+		// Minimum execution time: 118_000_000 picoseconds.
+		Weight::from_parts(120_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
diff --git a/runtime/amplitude/src/weights/treasury_buyout_extension.rs b/runtime/amplitude/src/weights/treasury_buyout_extension.rs
index 3e32e3129..a9d419ed1 100644
--- a/runtime/amplitude/src/weights/treasury_buyout_extension.rs
+++ b/runtime/amplitude/src/weights/treasury_buyout_extension.rs
@@ -2,21 +2,20 @@
 //! Autogenerated weights for treasury_buyout_extension
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-05-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// treasury-buyout-extension
+// treasury_buyout_extension
 // --extrinsic
 // *
 // --steps
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/
+// ../runtime/amplitude/src/weights/treasury_buyout_extension.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -38,51 +37,51 @@ use core::marker::PhantomData;
 
 /// Weights for treasury_buyout_extension using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> treasury_buyout_extension::default_weights::WeightInfo for SubstrateWeight<T> {
-	/// Storage: TreasuryBuyoutExtension AllowedCurrencies (r:1 w:0)
-	/// Proof: TreasuryBuyoutExtension AllowedCurrencies (max_values: None, max_size: Some(62), added: 2537, mode: MaxEncodedLen)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: DiaOracleModule CoinInfosMap (r:1 w:0)
-	/// Proof Skipped: DiaOracleModule CoinInfosMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TreasuryBuyoutExtension BuyoutLimit (r:1 w:0)
-	/// Proof: TreasuryBuyoutExtension BuyoutLimit (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: TreasuryBuyoutExtension Buyouts (r:1 w:1)
-	/// Proof: TreasuryBuyoutExtension Buyouts (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+impl<T: frame_system::Config> treasury_buyout_extension::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `TreasuryBuyoutExtension::AllowedCurrencies` (r:1 w:0)
+	/// Proof: `TreasuryBuyoutExtension::AllowedCurrencies` (`max_values`: None, `max_size`: Some(62), added: 2537, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `DiaOracleModule::CoinInfosMap` (r:1 w:0)
+	/// Proof: `DiaOracleModule::CoinInfosMap` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `TreasuryBuyoutExtension::BuyoutLimit` (r:1 w:0)
+	/// Proof: `TreasuryBuyoutExtension::BuyoutLimit` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `TreasuryBuyoutExtension::Buyouts` (r:1 w:1)
+	/// Proof: `TreasuryBuyoutExtension::Buyouts` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn buyout() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `944`
-		//  Estimated: `6884`
-		// Minimum execution time: 118_000_000 picoseconds.
-		Weight::from_parts(121_000_000, 6884)
+		//  Estimated: `7734`
+		// Minimum execution time: 88_000_000 picoseconds.
+		Weight::from_parts(89_000_000, 7734)
 			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
-	/// Storage: TreasuryBuyoutExtension BuyoutLimit (r:0 w:1)
-	/// Proof: TreasuryBuyoutExtension BuyoutLimit (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `TreasuryBuyoutExtension::BuyoutLimit` (r:0 w:1)
+	/// Proof: `TreasuryBuyoutExtension::BuyoutLimit` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn update_buyout_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TreasuryBuyoutExtension AllowedCurrencies (r:1 w:1)
-	/// Proof: TreasuryBuyoutExtension AllowedCurrencies (max_values: None, max_size: Some(62), added: 2537, mode: MaxEncodedLen)
+	/// Storage: `TreasuryBuyoutExtension::AllowedCurrencies` (r:1 w:1)
+	/// Proof: `TreasuryBuyoutExtension::AllowedCurrencies` (`max_values`: None, `max_size`: Some(62), added: 2537, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 20]`.
 	fn update_allowed_assets(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3527`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(15_762_722, 3527)
-			// Standard Error: 4_500
-			.saturating_add(Weight::from_parts(1_228_071, 0).saturating_mul(n.into()))
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(11_278_751, 3527)
+			// Standard Error: 2_490
+			.saturating_add(Weight::from_parts(950_424, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/amplitude/src/weights/vault_registry.rs b/runtime/amplitude/src/weights/vault_registry.rs
index ea938346d..edd4897ab 100644
--- a/runtime/amplitude/src/weights/vault_registry.rs
+++ b/runtime/amplitude/src/weights/vault_registry.rs
@@ -2,21 +2,20 @@
 //! Autogenerated weights for vault_registry
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("amplitude"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // amplitude
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// vault-registry
+// vault_registry
 // --extrinsic
 // *
 // --steps
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/amplitude/src/weights/
+// ../runtime/amplitude/src/weights/vault_registry.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,343 +38,349 @@ use core::marker::PhantomData;
 /// Weights for vault_registry using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> vault_registry::WeightInfo for SubstrateWeight<T> {
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry LiquidationCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry LiquidationCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry MinimumCollateralVault (r:1 w:0)
-	/// Proof Skipped: VaultRegistry MinimumCollateralVault (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry VaultStellarPublicKey (r:1 w:0)
-	/// Proof Skipped: VaultRegistry VaultStellarPublicKey (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::LiquidationCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::LiquidationCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::MinimumCollateralVault` (r:1 w:0)
+	/// Proof: `VaultRegistry::MinimumCollateralVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::VaultStellarPublicKey` (r:1 w:0)
+	/// Proof: `VaultRegistry::VaultStellarPublicKey` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
 	fn register_vault() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1079`
 		//  Estimated: `4544`
-		// Minimum execution time: 154_000_000 picoseconds.
-		Weight::from_parts(159_000_000, 4544)
+		// Minimum execution time: 117_000_000 picoseconds.
+		Weight::from_parts(119_000_000, 4544)
 			.saturating_add(T::DbWeight::get().reads(24_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
 	fn deposit_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2501`
-		//  Estimated: `5966`
-		// Minimum execution time: 180_000_000 picoseconds.
-		Weight::from_parts(186_000_000, 5966)
-			.saturating_add(T::DbWeight::get().reads(21_u64))
+		//  Measured:  `2605`
+		//  Estimated: `7734`
+		// Minimum execution time: 143_000_000 picoseconds.
+		Weight::from_parts(146_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
 	fn withdraw_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2475`
-		//  Estimated: `5940`
-		// Minimum execution time: 182_000_000 picoseconds.
-		Weight::from_parts(188_000_000, 5940)
-			.saturating_add(T::DbWeight::get().reads(21_u64))
+		//  Measured:  `2579`
+		//  Estimated: `7734`
+		// Minimum execution time: 149_000_000 picoseconds.
+		Weight::from_parts(151_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: VaultRegistry VaultStellarPublicKey (r:1 w:1)
-	/// Proof Skipped: VaultRegistry VaultStellarPublicKey (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::VaultStellarPublicKey` (r:1 w:1)
+	/// Proof: `VaultRegistry::VaultStellarPublicKey` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_public_key() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `334`
 		//  Estimated: `3799`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 3799)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 3799)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn accept_new_issues() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1484`
 		//  Estimated: `4949`
-		// Minimum execution time: 59_000_000 picoseconds.
-		Weight::from_parts(61_000_000, 4949)
+		// Minimum execution time: 47_000_000 picoseconds.
+		Weight::from_parts(48_000_000, 4949)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_custom_secure_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `711`
 		//  Estimated: `4176`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 4176)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 4176)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry MinimumCollateralVault (r:0 w:1)
-	/// Proof Skipped: VaultRegistry MinimumCollateralVault (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::MinimumCollateralVault` (r:0 w:1)
+	/// Proof: `VaultRegistry::MinimumCollateralVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_minimum_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:0 w:1)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:0 w:1)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_system_collateral_ceiling() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:0 w:1)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:0 w:1)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_secure_collateral_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `80`
 		//  Estimated: `1565`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(11_000_000, 1565)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 1565)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:0 w:1)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:0 w:1)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_premium_redeem_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry LiquidationCollateralThreshold (r:0 w:1)
-	/// Proof Skipped: VaultRegistry LiquidationCollateralThreshold (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::LiquidationCollateralThreshold` (r:0 w:1)
+	/// Proof: `VaultRegistry::LiquidationCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_liquidation_collateral_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry LiquidationCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry LiquidationCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry LiquidationVault (r:1 w:1)
-	/// Proof Skipped: VaultRegistry LiquidationVault (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::LiquidationCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::LiquidationCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::LiquidationVault` (r:1 w:1)
+	/// Proof: `VaultRegistry::LiquidationVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn report_undercollateralized_vault() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2675`
-		//  Estimated: `6240`
-		// Minimum execution time: 330_000_000 picoseconds.
-		Weight::from_parts(336_000_000, 6240)
-			.saturating_add(T::DbWeight::get().reads(25_u64))
+		//  Measured:  `2779`
+		//  Estimated: `7734`
+		// Minimum execution time: 257_000_000 picoseconds.
+		Weight::from_parts(262_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(27_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn recover_vault_id() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `649`
 		//  Estimated: `4114`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 4114)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 4114)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry PunishmentDelay (r:0 w:1)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::PunishmentDelay` (r:0 w:1)
+	/// Proof: `VaultRegistry::PunishmentDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_punishment_delay() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/amplitude/src/xcm_config.rs b/runtime/amplitude/src/xcm_config.rs
index d38925420..3c59b4512 100644
--- a/runtime/amplitude/src/xcm_config.rs
+++ b/runtime/amplitude/src/xcm_config.rs
@@ -1,9 +1,10 @@
 use core::marker::PhantomData;
 
 use frame_support::{
-	log, match_types, parameter_types,
+	match_types, parameter_types,
 	traits::{ContainsPair, Everything, Nothing, ProcessMessageError},
 };
+use log;
 use orml_asset_registry::{AssetRegistryTrader, FixedRateAssetRegistryTrader};
 use orml_traits::{
 	location::{RelativeReserveProvider, Reserve},
@@ -20,7 +21,10 @@ use xcm_builder::{
 	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 };
-use xcm_executor::{traits::ShouldExecute, XcmExecutor};
+use xcm_executor::{
+	traits::{Properties, ShouldExecute},
+	XcmExecutor,
+};
 
 use runtime_common::{asset_registry::FixedConversionRateProvider, CurrencyIdConvert};
 
@@ -133,11 +137,11 @@ where
 	fn should_execute<RuntimeCall>(
 		origin: &MultiLocation,
 		instructions: &mut [Instruction<RuntimeCall>],
-		max_weight: XCMWeight,
-		weight_credit: &mut XCMWeight,
+		max_weight: Weight,
+		properties: &mut Properties,
 	) -> Result<(), ProcessMessageError> {
-		Deny::should_execute(origin, instructions, max_weight, weight_credit)?;
-		Allow::should_execute(origin, instructions, max_weight, weight_credit)
+		Deny::should_execute(origin, instructions, max_weight, properties)?;
+		Allow::should_execute(origin, instructions, max_weight, properties)
 	}
 }
 
@@ -147,8 +151,8 @@ impl ShouldExecute for DenyReserveTransferToRelayChain {
 	fn should_execute<RuntimeCall>(
 		origin: &MultiLocation,
 		instructions: &mut [Instruction<RuntimeCall>],
-		_max_weight: XCMWeight,
-		_weight_credit: &mut XCMWeight,
+		_max_weight: Weight,
+		_weight_credit: &mut Properties,
 	) -> Result<(), ProcessMessageError> {
 		if instructions.iter().any(|inst| {
 			matches!(
@@ -230,6 +234,7 @@ impl xcm_executor::Config for XcmConfig {
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
 	type SafeCallFilter = Everything;
+	type Aliasers = ();
 }
 
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.
@@ -268,10 +273,12 @@ impl pallet_xcm::Config for Runtime {
 	type TrustedLockers = ();
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
-	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::pallet_xcm::SubstrateWeight<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
 	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 }
 
 #[cfg(feature = "runtime-benchmarks")]
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index 471334ab0..3846abb9b 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -15,26 +15,26 @@ paste = "1.0.14"
 parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.42" }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
 
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
+xcm = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm", default-features = false, branch = "release-polkadot-v1.1.0" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm-executor", default-features = false, branch = "release-polkadot-v1.1.0" }
 
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.42" }
-orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.42" }
-orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.42" }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
 
-dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v0.9.42" }
-zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", default-features = false, branch = "polkadot-v0.9.42" }
+dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v1.1.0" }
+zenlink-protocol = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", default-features = false, branch = "release-polkadot-v1.1.0" }
 
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 treasury-buyout-extension = { path = "../../pallets/treasury-buyout-extension", default-features = false }
 
 [features]
@@ -71,4 +71,5 @@ runtime-benchmarks = [
     "frame-system/runtime-benchmarks",
     "orml-asset-registry/runtime-benchmarks",
     "treasury-buyout-extension/runtime-benchmarks",
+    "dia-oracle/runtime-benchmarks"
 ]
diff --git a/runtime/common/src/asset_registry.rs b/runtime/common/src/asset_registry.rs
index 3cabd43bd..e3f741612 100644
--- a/runtime/common/src/asset_registry.rs
+++ b/runtime/common/src/asset_registry.rs
@@ -9,10 +9,8 @@ use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_core::Get;
 use sp_runtime::{traits::PhantomData, BoundedVec, DispatchError};
-use sp_std::fmt::Debug;
-use sp_std::vec::Vec;
-use spacewalk_primitives::oracle::Key;
-use spacewalk_primitives::CurrencyId;
+use sp_std::{fmt::Debug, vec::Vec};
+use spacewalk_primitives::{oracle::Key, CurrencyId};
 use xcm::opaque::v3::MultiLocation;
 
 #[derive(Clone, PartialOrd, Ord, PartialEq, Eq, Debug, Encode, Decode, TypeInfo, MaxEncodedLen)]
@@ -40,11 +38,13 @@ pub struct DiaKeys<T: Get<u32> + TypeInfo + Clone + Eq + Debug + Send + Sync> {
 )]
 pub struct CustomAssetProcessor;
 
-impl AssetProcessor<CurrencyId, AssetMetadata<Balance, CustomMetadata>> for CustomAssetProcessor {
+impl AssetProcessor<CurrencyId, AssetMetadata<Balance, CustomMetadata, StringLimit>>
+	for CustomAssetProcessor
+{
 	fn pre_register(
 		id: Option<CurrencyId>,
-		metadata: AssetMetadata<Balance, CustomMetadata>,
-	) -> Result<(CurrencyId, AssetMetadata<Balance, CustomMetadata>), DispatchError> {
+		metadata: AssetMetadata<Balance, CustomMetadata, StringLimit>,
+	) -> Result<(CurrencyId, AssetMetadata<Balance, CustomMetadata, StringLimit>), DispatchError> {
 		match id {
 			Some(id) => Ok((id, metadata)),
 			None => Err(DispatchError::Other("asset-registry: AssetId is required")),
@@ -53,7 +53,7 @@ impl AssetProcessor<CurrencyId, AssetMetadata<Balance, CustomMetadata>> for Cust
 
 	fn post_register(
 		_id: CurrencyId,
-		_asset_metadata: AssetMetadata<Balance, CustomMetadata>,
+		_asset_metadata: AssetMetadata<Balance, CustomMetadata, StringLimit>,
 	) -> Result<(), DispatchError> {
 		Ok(())
 	}
diff --git a/runtime/common/src/benchmarking/orml_asset_registry.rs b/runtime/common/src/benchmarking/orml_asset_registry.rs
index a1d956132..f874c4e30 100644
--- a/runtime/common/src/benchmarking/orml_asset_registry.rs
+++ b/runtime/common/src/benchmarking/orml_asset_registry.rs
@@ -4,7 +4,7 @@ use frame_support::assert_ok;
 use frame_system::RawOrigin;
 use orml_asset_registry::AssetMetadata;
 use sp_runtime::BoundedVec;
-use sp_std::{vec, vec::Vec};
+use sp_std::vec;
 use spacewalk_primitives::CurrencyId;
 use xcm::{
 	latest::MultiLocation,
@@ -20,11 +20,13 @@ pub trait Config:
 #[benchmarks]
 pub mod benchmarks {
 	use super::{Config, Pallet, *};
+	use crate::asset_registry::StringLimit;
 	use orml_asset_registry::Call;
 
-	fn longest_vec() -> Vec<u8> {
+	fn longest_vec<T: sp_core::Get<u32>>() -> BoundedVec<u8, T> {
 		// there is no fixed upperbound, but all actions are root-only so an assumed upperbound of 128 will do
-		vec![b'a', 128]
+		let longest_vec = vec![b'a', 128];
+		BoundedVec::truncate_from(longest_vec)
 	}
 
 	fn longest_multilocation() -> MultiLocation {
@@ -32,17 +34,17 @@ pub mod benchmarks {
 		MultiLocation::new(1, X8(key, key, key, key, key, key, key, key))
 	}
 
-	fn get_asset_metadata() -> AssetMetadata<u128, CustomMetadata> {
-		AssetMetadata {
+	fn get_asset_metadata<T: sp_core::Get<u32>>() -> AssetMetadata<u128, CustomMetadata, T> {
+		AssetMetadata::<u128, CustomMetadata, T> {
 			decimals: 12,
-			name: longest_vec(),
-			symbol: longest_vec(),
+			name: longest_vec::<T>(),
+			symbol: longest_vec::<T>(),
 			existential_deposit: 0,
 			location: Some(longest_multilocation().into()),
 			additional: CustomMetadata {
 				dia_keys: DiaKeys {
-					blockchain: BoundedVec::truncate_from(longest_vec()),
-					symbol: BoundedVec::truncate_from(longest_vec()),
+					blockchain: longest_vec::<StringLimit>(),
+					symbol: longest_vec::<StringLimit>(),
 				},
 				fee_per_second: 123,
 			},
@@ -59,7 +61,7 @@ pub mod benchmarks {
 
 	#[benchmark]
 	fn update_asset() {
-		let metadata = get_asset_metadata();
+		let metadata = get_asset_metadata::<<T as orml_asset_registry::Config>::StringLimit>();
 
 		assert_ok!(orml_asset_registry::Pallet::<T>::register_asset(
 			RawOrigin::Root.into(),
@@ -76,15 +78,12 @@ pub mod benchmarks {
 			RawOrigin::Root,
 			CurrencyId::Native,
 			Some(123),
-			Some(vec![b'b', 128]),
-			Some(vec![b'b', 128]),
+			Some(BoundedVec::truncate_from(vec![b'b', 128])),
+			Some(BoundedVec::truncate_from(vec![b'b', 128])),
 			Some(1234),
 			Some(Some(location.into())),
 			Some(CustomMetadata {
-				dia_keys: DiaKeys {
-					blockchain: BoundedVec::truncate_from(longest_vec()),
-					symbol: BoundedVec::truncate_from(longest_vec()),
-				},
+				dia_keys: DiaKeys { blockchain: longest_vec(), symbol: longest_vec() },
 				fee_per_second: 123,
 			}),
 		);
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index 1ff272816..5f38f7f03 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -189,21 +189,6 @@ impl<
 	}
 }
 
-/// Convert an incoming `MultiLocation` into a `CurrencyId` if possible.
-/// Here we need to know the canonical representation of all the tokens we handle in order to
-/// correctly convert their `MultiLocation` representation into our internal `CurrencyId` type.
-impl<
-		AssetRegistry: Inspect<AssetId = CurrencyId, Balance = Balance, CustomMetadata = CustomMetadata>,
-	> xcm_executor::traits::Convert<MultiLocation, CurrencyId> for CurrencyIdConvert<AssetRegistry>
-{
-	fn convert(location: MultiLocation) -> Result<CurrencyId, MultiLocation> {
-		<CurrencyIdConvert<AssetRegistry> as Convert<MultiLocation, Option<CurrencyId>>>::convert(
-			location,
-		)
-		.ok_or(location)
-	}
-}
-
 pub struct OraclePriceGetter<Runtime>(PhantomData<Runtime>);
 impl<
 		Runtime: treasury_buyout_extension::Config
diff --git a/runtime/common/src/zenlink.rs b/runtime/common/src/zenlink.rs
index a61022acd..60b3cd974 100644
--- a/runtime/common/src/zenlink.rs
+++ b/runtime/common/src/zenlink.rs
@@ -42,24 +42,18 @@ pub fn zenlink_id_to_currency_id(
 		(1, LOCAL) => Some(CurrencyId::XCM(symbol)),
 		(2, LOCAL) => match symbol {
 			0 => Some(CurrencyId::Stellar(Asset::StellarNative)),
-			1 => {
-				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"USDC", issuer: USDC_ISSUER }))
-			},
-			2 => {
-				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"TZS\0", issuer: TZS_ISSUER }))
-			},
-			3 => {
-				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"BRL\0", issuer: BRL_ISSUER }))
-			},
-			4 => {
-				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"EURC", issuer: EURC_ISSUER }))
-			},
-			5 => {
-				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"AUDD", issuer: AUDD_ISSUER }))
-			},
-			6 => {
-				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"NGNC", issuer: NGNC_ISSUER }))
-			},
+			1 =>
+				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"USDC", issuer: USDC_ISSUER })),
+			2 =>
+				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"TZS\0", issuer: TZS_ISSUER })),
+			3 =>
+				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"BRL\0", issuer: BRL_ISSUER })),
+			4 =>
+				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"EURC", issuer: EURC_ISSUER })),
+			5 =>
+				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"AUDD", issuer: AUDD_ISSUER })),
+			6 =>
+				Some(CurrencyId::Stellar(Asset::AlphaNum4 { code: *b"NGNC", issuer: NGNC_ISSUER })),
 			_ => None,
 		},
 		(3, LOCAL) => {
@@ -81,9 +75,8 @@ pub fn currency_id_to_zenlink_id(
 ) -> Option<ZenlinkAssetId> {
 	let disc = discriminant(&currency_id) as u64;
 	match currency_id {
-		CurrencyId::Native => {
-			Some(ZenlinkAssetId { chain_id: parachain_id, asset_type: NATIVE, asset_index: 0 })
-		},
+		CurrencyId::Native =>
+			Some(ZenlinkAssetId { chain_id: parachain_id, asset_type: NATIVE, asset_index: 0 }),
 		CurrencyId::XCM(token_id) => Some(ZenlinkAssetId {
 			chain_id: parachain_id,
 			asset_type: LOCAL,
@@ -110,11 +103,11 @@ pub fn currency_id_to_zenlink_id(
 			})
 		},
 		CurrencyId::ZenlinkLPToken(token1_id, token1_type, token2_id, token2_type) => {
-			let index = (disc << 8)
-				+ ((token1_id as u64) << 16)
-				+ ((token1_type as u64) << 24)
-				+ ((token2_id as u64) << 32)
-				+ ((token2_type as u64) << 40);
+			let index = (disc << 8) +
+				((token1_id as u64) << 16) +
+				((token1_type as u64) << 24) +
+				((token2_id as u64) << 32) +
+				((token2_type as u64) << 40);
 			Some(ZenlinkAssetId { chain_id: parachain_id, asset_type: LOCAL, asset_index: index })
 		},
 		CurrencyId::Token(_) => None,
diff --git a/runtime/foucoco/Cargo.toml b/runtime/foucoco/Cargo.toml
index 816f8d5fb..f78d5b0e2 100644
--- a/runtime/foucoco/Cargo.toml
+++ b/runtime/foucoco/Cargo.toml
@@ -12,7 +12,7 @@ version = "0.1.0"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -30,79 +30,80 @@ token-chain-extension = { path = "../../chain-extensions/token", default-feature
 price-chain-extension = { path = "../../chain-extensions/price", default-features = false }
 
 # custom libraries from spacewalk
-clients-info = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-currency = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-security = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-staking = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-oracle = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-stellar-relay = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-fee = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-vault-registry = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-redeem = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-issue = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-nomination = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-replace = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-pooled-rewards = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-reward-distribution = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+clients-info = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+currency = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+security = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+staking = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+oracle = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+stellar-relay = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+fee = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+vault-registry = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+redeem = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+issue = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+nomination = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+replace = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+pooled-rewards = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+reward-distribution = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 
-module-issue-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-redeem-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-replace-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-vault-registry-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+module-issue-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-redeem-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-replace-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-vault-registry-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 module-pallet-staking-rpc-runtime-api = { path = "../../pallets/parachain-staking/rpc/runtime-api", default-features = false }
 
 # Substrate
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.42" }
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.42" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.42" }
-pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-bounties = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-child-bounties = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, optional = true, branch = "release-polkadot-v1.1.0" }
+frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, optional = true, branch = "release-polkadot-v1.1.0" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, optional = true, branch = "release-polkadot-v1.1.0" }
+pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-bounties = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-child-bounties = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-contracts-primitives = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-version = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
 
 # Open Runtime Module Library
-orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.42" }
-orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.42" }
+orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
 
 # KILT
 parachain-staking = { path = "../../pallets/parachain-staking", default-features = false }
@@ -112,37 +113,37 @@ orml-tokens-management-extension = { path = "../../pallets/orml-tokens-managemen
 treasury-buyout-extension = { path = "../../pallets/treasury-buyout-extension", default-features = false }
 
 # DIA
-dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v0.9.42" }
-dia-oracle-runtime-api = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v0.9.42" }
+dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v1.1.0" }
+dia-oracle-runtime-api = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v1.1.0" }
 
 # Polkadot
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot-sdk", package = "polkadot-parachain-primitives", default-features = false, branch = "release-polkadot-v1.1.0" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+xcm = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm", default-features = false, branch = "release-polkadot-v1.1.0" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm-builder", default-features = false, branch = "release-polkadot-v1.1.0" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm-executor", default-features = false, branch = "release-polkadot-v1.1.0" }
 
 # Cumulus
-cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
 
 #orml
-orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.42" }
+orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
 
-zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", default-features = false, branch = "polkadot-v0.9.42" }
-zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", default-features = false, branch = "polkadot-v0.9.42" }
+zenlink-protocol = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", default-features = false, branch = "release-polkadot-v1.1.0" }
+zenlink-protocol-runtime-api = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", default-features = false, branch = "release-polkadot-v1.1.0" }
 
-bifrost-farming = { git = "https://github.com/pendulum-chain/bifrost", default-features = false, branch = "upgrade-v0.9.42" }
-bifrost-farming-rpc-runtime-api = { git = "https://github.com/pendulum-chain/bifrost", default-features = false, branch = "upgrade-v0.9.42" }
+bifrost-farming = { git = "https://github.com/bifrost-finance/bifrost", default-features = false, rev = "46ba3689c2fe1011cce0d752cb479e0e522e2e76" }
+bifrost-farming-rpc-runtime-api = { git = "https://github.com/bifrost-finance/bifrost", default-features = false, rev = "46ba3689c2fe1011cce0d752cb479e0e522e2e76" }
 
 [features]
 default = [
@@ -156,6 +157,7 @@ std = [
     "cumulus-pallet-aura-ext/std",
     "cumulus-pallet-dmp-queue/std",
     "cumulus-pallet-parachain-system/std",
+    "cumulus-pallet-parachain-system/parameterized-consensus-hook",
     "cumulus-pallet-xcm/std",
     "cumulus-pallet-xcmp-queue/std",
     "cumulus-primitives-core/std",
@@ -203,7 +205,6 @@ std = [
     "orml-currencies-allowance-extension/std",
     "orml-tokens-management-extension/std",
     "pooled-rewards/std",
-    "polkadot-parachain/std",
     "polkadot-runtime-common/std",
     "runtime-common/std",
     "sp-api/std",
@@ -216,6 +217,7 @@ std = [
     "sp-runtime/std",
     "sp-session/std",
     "sp-std/std",
+    "sp-storage/std",
     "sp-transaction-pool/std",
     "sp-version/std",
     "xcm-builder/std",
@@ -278,6 +280,8 @@ runtime-benchmarks = [
     "parachain-staking/runtime-benchmarks",
     "orml-tokens-management-extension/runtime-benchmarks",
     "treasury-buyout-extension/runtime-benchmarks",
+    "dia-oracle/runtime-benchmarks",
+    "dia-oracle-runtime-api/runtime-benchmarks"
 ]
 
 try-runtime = [
diff --git a/runtime/foucoco/src/lib.rs b/runtime/foucoco/src/lib.rs
index 039a0c3fc..5e1f76784 100644
--- a/runtime/foucoco/src/lib.rs
+++ b/runtime/foucoco/src/lib.rs
@@ -1,6 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
-// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
+// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 512.
+#![recursion_limit = "512"]
 
 // Make the WASM binary available.
 #[cfg(feature = "std")]
@@ -62,11 +62,11 @@ use frame_system::{
 pub use sp_runtime::{MultiAddress, Perbill, Permill, Perquintill};
 
 use runtime_common::{
-	asset_registry, opaque, AccountId, Amount, AuraId, Balance, BlockNumber, Hash, Index, PoolId,
+	asset_registry, AccountId, Amount, AuraId, Balance, BlockNumber, Hash, Index, PoolId,
 	ProxyType, ReserveIdentifier, Signature, EXISTENTIAL_DEPOSIT, MILLIUNIT, NANOUNIT, UNIT,
 };
 
-#[cfg(any(feature = "runtime-benchmarks", feature = "testing-utils"))]
+#[cfg(any(feature = "runtime-benchmarks"))]
 use oracle::testing_utils::MockDataFeeder;
 
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
@@ -89,8 +89,6 @@ pub use replace::{Event as ReplaceEvent, ReplaceRequest};
 pub use security::StatusCode;
 pub use stellar_relay::traits::{FieldLength, Organization, Validator};
 
-const CONTRACTS_DEBUG_OUTPUT: bool = true;
-
 use module_oracle_rpc_runtime_api::BalanceWrapper;
 use oracle::dia::DiaOracleAdapter;
 
@@ -107,6 +105,8 @@ use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 use frame_support::traits::InstanceFilter;
 use sp_std::vec::Vec;
 
+use runtime_common::asset_registry::StringLimit;
+
 // XCM Imports
 use xcm_executor::XcmExecutor;
 
@@ -143,6 +143,11 @@ pub type SignedExtra = (
 	treasury_buyout_extension::CheckBuyout<Runtime>,
 );
 
+type EventRecord = frame_system::EventRecord<
+	<Runtime as frame_system::Config>::RuntimeEvent,
+	<Runtime as frame_system::Config>::Hash,
+>;
+
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
@@ -152,33 +157,36 @@ pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, Si
 
 pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
 
-use crate::sp_api_hidden_includes_construct_runtime::hidden_include::dispatch::GetStorageVersion;
-use frame_support::pallet_prelude::StorageVersion;
+// To be removed after contracts migrations executes.
+use pallet_contracts::migration::{v11, v12, v13, v14, v15};
+// Custom storage version bump
+use frame_support::{
+	pallet_prelude::StorageVersion,
+	traits::{GetStorageVersion, OnRuntimeUpgrade},
+};
 
-// Temporary struct that defines the executions to be done upon upgrade,
-// Should be removed or at least checked on each upgrade to see if it is relevant,
-// given that these are "one-time" executions for particular upgrades
 pub struct CustomOnRuntimeUpgrade;
-impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
+impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+		log::info!("Custom on-runtime-upgrade function");
+
 		let mut writes = 0;
 		// WARNING: manually setting the storage version
-		if Contracts::on_chain_storage_version() == 9 {
-			log::info!("Upgrading pallet contract's storage version to 10");
-			StorageVersion::new(10).put::<Contracts>();
+		if ParachainStaking::on_chain_storage_version() == 0 {
+			log::info!("Upgrading parachain staking storage version to 7");
+			StorageVersion::new(7).put::<ParachainStaking>();
 			writes += 1;
 		}
 
-		if AssetRegistry::on_chain_storage_version() == 0 {
-			log::info!("Upgrading pallet asset registry's storage version to 2");
-			StorageVersion::new(2).put::<AssetRegistry>();
+		if Bounties::on_chain_storage_version() == 0 {
+			log::info!("Upgrading bounties storage version to 4");
+			StorageVersion::new(4).put::<Bounties>();
 			writes += 1;
 		}
-
+		// not really a heavy operation
 		<Runtime as frame_system::Config>::DbWeight::get().reads_writes(2, writes)
 	}
 }
-
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,
@@ -186,11 +194,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	(
-		CustomOnRuntimeUpgrade,
-		pallet_vesting::migrations::v1::ForceSetVersionToV1<Runtime>,
-		pallet_transaction_payment::migrations::v1::ForceSetVersionToV2<Runtime>,
-	),
+	(CustomOnRuntimeUpgrade, pallet_contracts::migration::Migration<Runtime>),
 >;
 
 pub struct ConvertPrice;
@@ -249,7 +253,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("foucoco"),
 	impl_name: create_runtime_str!("foucoco"),
 	authoring_version: 1,
-	spec_version: 18,
+	spec_version: 19,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 8,
@@ -329,53 +333,56 @@ impl Contains<RuntimeCall> for BaseFilter {
 	fn contains(call: &RuntimeCall) -> bool {
 		match call {
 			// These modules are all allowed to be called by transactions:
-			RuntimeCall::Bounties(_)
-			| RuntimeCall::ChildBounties(_)
-			| RuntimeCall::ClientsInfo(_)
-			| RuntimeCall::Treasury(_)
-			| RuntimeCall::Tokens(_)
-			| RuntimeCall::Currencies(_)
-			| RuntimeCall::ParachainStaking(_)
-			| RuntimeCall::Democracy(_)
-			| RuntimeCall::Council(_)
-			| RuntimeCall::TechnicalCommittee(_)
-			| RuntimeCall::System(_)
-			| RuntimeCall::Scheduler(_)
-			| RuntimeCall::Preimage(_)
-			| RuntimeCall::Timestamp(_)
-			| RuntimeCall::Balances(_)
-			| RuntimeCall::Session(_)
-			| RuntimeCall::ParachainSystem(_)
-			| RuntimeCall::Sudo(_)
-			| RuntimeCall::XcmpQueue(_)
-			| RuntimeCall::PolkadotXcm(_)
-			| RuntimeCall::DmpQueue(_)
-			| RuntimeCall::Utility(_)
-			| RuntimeCall::Vesting(_)
-			| RuntimeCall::XTokens(_)
-			| RuntimeCall::Multisig(_)
-			| RuntimeCall::Identity(_)
-			| RuntimeCall::Contracts(_)
-			| RuntimeCall::ZenlinkProtocol(_)
-			| RuntimeCall::DiaOracleModule(_)
-			| RuntimeCall::Fee(_)
-			| RuntimeCall::Issue(_)
-			| RuntimeCall::Nomination(_)
-			| RuntimeCall::Oracle(_)
-			| RuntimeCall::Redeem(_)
-			| RuntimeCall::Replace(_)
-			| RuntimeCall::Security(_)
-			| RuntimeCall::StellarRelay(_)
-			| RuntimeCall::VaultRegistry(_)
-			| RuntimeCall::PooledVaultRewards(_)
-			| RuntimeCall::Farming(_)
-			| RuntimeCall::TokenAllowance(_)
-			| RuntimeCall::AssetRegistry(_)
-			| RuntimeCall::Proxy(_)
-			| RuntimeCall::OrmlExtension(_)
-			| RuntimeCall::TreasuryBuyoutExtension(_)
-			| RuntimeCall::RewardDistribution(_) => true, // All pallets are allowed, but exhaustive match is defensive
-			                                              // in the case of adding new pallets.
+			RuntimeCall::Bounties(_) |
+			RuntimeCall::ChildBounties(_) |
+			RuntimeCall::ClientsInfo(_) |
+			RuntimeCall::Treasury(_) |
+			RuntimeCall::Tokens(_) |
+			RuntimeCall::Currencies(_) |
+			RuntimeCall::ParachainStaking(_) |
+			RuntimeCall::Democracy(_) |
+			RuntimeCall::Council(_) |
+			RuntimeCall::TechnicalCommittee(_) |
+			RuntimeCall::System(_) |
+			RuntimeCall::Scheduler(_) |
+			RuntimeCall::Preimage(_) |
+			RuntimeCall::Timestamp(_) |
+			RuntimeCall::Balances(_) |
+			RuntimeCall::Session(_) |
+			RuntimeCall::ParachainSystem(_) |
+			RuntimeCall::Sudo(_) |
+			RuntimeCall::XcmpQueue(_) |
+			RuntimeCall::PolkadotXcm(_) |
+			RuntimeCall::DmpQueue(_) |
+			RuntimeCall::Utility(_) |
+			RuntimeCall::Vesting(_) |
+			RuntimeCall::XTokens(_) |
+			RuntimeCall::Multisig(_) |
+			RuntimeCall::Identity(_) |
+			RuntimeCall::Contracts(_) |
+			RuntimeCall::ZenlinkProtocol(_) |
+			RuntimeCall::DiaOracleModule(_) |
+			RuntimeCall::Fee(_) |
+			RuntimeCall::Issue(_) |
+			RuntimeCall::Nomination(_) |
+			RuntimeCall::Oracle(_) |
+			RuntimeCall::Redeem(_) |
+			RuntimeCall::Replace(_) |
+			RuntimeCall::Security(_) |
+			RuntimeCall::StellarRelay(_) |
+			RuntimeCall::VaultRegistry(_) |
+			RuntimeCall::PooledVaultRewards(_) |
+			RuntimeCall::Farming(_) |
+			RuntimeCall::TokenAllowance(_) |
+			RuntimeCall::AssetRegistry(_) |
+			RuntimeCall::Proxy(_) |
+			RuntimeCall::OrmlExtension(_) |
+			RuntimeCall::TreasuryBuyoutExtension(_) |
+			RuntimeCall::RewardDistribution(_) |
+			RuntimeCall::ParachainInfo(_) |
+			RuntimeCall::CumulusXcm(_) |
+			RuntimeCall::VaultStaking(_) => true, // All pallets are allowed, but exhaustive match is defensive
+			                                      // in the case of adding new pallets.
 		}
 	}
 }
@@ -383,22 +390,20 @@ impl Contains<RuntimeCall> for BaseFilter {
 // Configure FRAME pallets to include in runtime.
 
 impl frame_system::Config for Runtime {
+	/// The Block type used by the runtime. This is used by construct_runtime to retrieve the extrinsics or other block specific data as needed.
+	type Block = Block;
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
 	/// The aggregated dispatch type that is available for extrinsics.
 	type RuntimeCall = RuntimeCall;
 	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
 	type Lookup = AccountIdLookup<AccountId, ()>;
-	/// The index type for storing how many extrinsics an account has signed.
-	type Index = Index;
-	/// The index type for blocks.
-	type BlockNumber = BlockNumber;
+	/// This stores the number of previous transactions associated with a sender account.
+	type Nonce = Index;
 	/// The type for hashing blocks and tries.
 	type Hash = Hash;
 	/// The hashing algorithm used.
 	type Hashing = BlakeTwo256;
-	/// The header type.
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
@@ -474,7 +479,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type MaxHolds = ConstU32<1>;
-	type HoldIdentifier = RuntimeHoldReason;
+	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
 parameter_types! {
@@ -522,6 +527,8 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	#[cfg(feature = "std")]
+	type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
 }
 
 impl parachain_info::Config for Runtime {}
@@ -563,10 +570,17 @@ impl pallet_session::Config for Runtime {
 	type WeightInfo = pallet_session::weights::SubstrateWeight<Runtime>;
 }
 
+parameter_types! {
+	// as per documentation, typical value for this is false "unless this pallet is being augmented by another pallet"
+	// https://github.com/paritytech/polkadot-sdk/blob/release-polkadot-v1.1.0/substrate/frame/aura/src/lib.rs#L111
+	pub const AllowMultipleBlocksPerSlot: bool = false;
+}
+
 impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
 	type MaxAuthorities = MaxAuthorities;
+	type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot;
 }
 
 parameter_types! {
@@ -857,7 +871,8 @@ impl orml_asset_registry::Config for Runtime {
 	type AuthorityOrigin = asset_registry::AssetAuthority;
 	type AssetProcessor = asset_registry::CustomAssetProcessor;
 	type Balance = Balance;
-	type WeightInfo = weights::orml_asset_registry::WeightInfo<Runtime>;
+	type WeightInfo = weights::orml_asset_registry::SubstrateWeight<Runtime>;
+	type StringLimit = StringLimit;
 }
 
 parameter_types! {
@@ -910,6 +925,7 @@ impl parachain_staking::Config for Runtime {
 impl pallet_sudo::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
+	type WeightInfo = pallet_sudo::weights::SubstrateWeight<Self>;
 }
 
 parameter_types! {
@@ -1024,15 +1040,11 @@ const fn deposit(items: u32, bytes: u32) -> Balance {
 
 parameter_types! {
 	pub const DepositPerItem: Balance = deposit(1, 0);
-	pub const DepositPerByte: Balance = deposit(0, 1);
-	pub const DefaultDepositLimit: Balance = deposit(1024, 1024 * 1024);
-	pub Schedule: pallet_contracts::Schedule<Runtime> = pallet_contracts::Schedule::<Runtime>{
-		limits: pallet_contracts::Limits{
-			parameters: 256,
-			..Default::default()
-		},
-		..Default::default()
-	};
+    pub const DepositPerByte: Balance = deposit(0, 1);
+    pub const DefaultDepositLimit: Balance = deposit(1024, 1024 * 1024);
+	pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
+	pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30);
+	pub const MaxDelegateDependencies: u32 = 32;
 }
 
 impl pallet_contracts::Config for Runtime {
@@ -1056,6 +1068,18 @@ impl pallet_contracts::Config for Runtime {
 	type UnsafeUnstableInterface = ConstBool<true>;
 	type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
 	type DefaultDepositLimit = DefaultDepositLimit;
+	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
+	type MaxDelegateDependencies = MaxDelegateDependencies;
+	type RuntimeHoldReason = RuntimeHoldReason;
+	type Migrations = (
+		v11::Migration<Self>,
+		v12::Migration<Runtime, Balances>,
+		v13::Migration<Self>,
+		v14::Migration<Self, Balances>,
+		v15::Migration<Self>,
+	);
+	type Debug = ();
+	type Environment = ();
 }
 
 impl pallet_insecure_randomness_collective_flip::Config for Runtime {}
@@ -1099,7 +1123,7 @@ impl dia_oracle::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
 	type AuthorityId = dia_oracle::crypto::DiaAuthId;
-	type WeightInfo = dia_oracle::weights::DiaWeightInfo<Runtime>;
+	type WeightInfo = weights::dia_oracle::SubstrateWeight<Runtime>;
 }
 
 impl frame_system::offchain::SigningTypes for Runtime {
@@ -1192,7 +1216,7 @@ impl farming::Config for Runtime {
 	type CurrencyId = CurrencyId;
 	type MultiCurrency = Currencies;
 	type ControlOrigin = EnsureRoot<AccountId>;
-	type WeightInfo = farming::weights::BifrostWeight<Runtime>;
+	type WeightInfo = ();
 	type TreasuryAccount = FoucocoTreasuryAccount;
 	type Keeper = FarmingKeeperPalletId;
 	type RewardIssuer = FarmingRewardIssuerPalletId;
@@ -1423,89 +1447,84 @@ where
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = opaque::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Runtime
 	{
 		// System support stuff.
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
-		ParachainSystem: cumulus_pallet_parachain_system::{
-			Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned,
-		} = 1,
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
-		ParachainInfo: parachain_info::{Pallet, Storage, Config} = 3,
+		System: frame_system = 0,
+		ParachainSystem: cumulus_pallet_parachain_system = 1,
+		Timestamp: pallet_timestamp = 2,
+		ParachainInfo: parachain_info = 3,
 
 		// Monetary stuff.
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 10,
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 11,
+		Balances: pallet_balances = 10,
+		TransactionPayment: pallet_transaction_payment = 11,
 
 		// Governance
-		Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 12,
-		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>} = 13,
-		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Config<T>, Origin<T>, Event<T>} = 14,
-		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Config<T>, Origin<T>,  Event<T>} = 15,
-		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 16,
-		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 17,
-		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 18,
-		Treasury: pallet_treasury::{Pallet, Call, Storage, Event<T>} = 19,
-		Bounties: pallet_bounties::{Pallet, Call, Storage, Event<T>} = 20,
-		ChildBounties: pallet_child_bounties::{Pallet, Call, Storage, Event<T>} = 21,
-		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 22,
+		Sudo: pallet_sudo = 12,
+		Democracy: pallet_democracy = 13,
+		Council: pallet_collective::<Instance1> = 14,
+		TechnicalCommittee: pallet_collective::<Instance2> = 15,
+		Scheduler: pallet_scheduler = 16,
+		Preimage: pallet_preimage = 17,
+		Multisig: pallet_multisig = 18,
+		Treasury: pallet_treasury = 19,
+		Bounties: pallet_bounties = 20,
+		ChildBounties: pallet_child_bounties = 21,
+		Proxy: pallet_proxy = 22,
 
 		// Consensus support.
 		// The following order MUST NOT be changed: Aura -> Session -> Staking -> Authorship -> AuraExt
 		// Dependencies: AuraExt on Aura, Authorship and Session on ParachainStaking
-		Aura: pallet_aura::{Pallet, Storage, Config<T>} = 33,
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 32,
-		ParachainStaking: parachain_staking::{Pallet, Call, Storage, Event<T>, Config<T>} = 35,
-		Authorship: pallet_authorship::{Pallet, Storage} = 30,
-		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 34,
+		Aura: pallet_aura = 33,
+		Session: pallet_session = 32,
+		ParachainStaking: parachain_staking = 35,
+		Authorship: pallet_authorship = 30,
+		AuraExt: cumulus_pallet_aura_ext = 34,
 
 		// XCM helpers.
-		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 40,
-		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config} = 41,
-		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 42,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 43,
+		XcmpQueue: cumulus_pallet_xcmp_queue = 40,
+		PolkadotXcm: pallet_xcm = 41,
+		CumulusXcm: cumulus_pallet_xcm = 42,
+		DmpQueue: cumulus_pallet_dmp_queue = 43,
 
 		// Amendments
-		Vesting: pallet_vesting::{Pallet, Call, Storage, Event<T>} = 50,
-		Utility: pallet_utility::{Pallet, Call, Event} = 51,
-		Currencies: orml_currencies::{Pallet, Call, Storage} = 52,
-		Tokens: orml_tokens::{Pallet, Call, Storage, Config<T>, Event<T>} = 53,
-		XTokens: orml_xtokens::{Pallet, Storage, Call, Event<T>} = 54,
-		Identity: pallet_identity::{Pallet, Storage, Call, Event<T>} = 55,
-		Contracts: pallet_contracts::{Pallet, Storage, Call, Event<T>} = 56,
-		RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip::{Pallet, Storage} = 57,
-		DiaOracleModule: dia_oracle::{Pallet, Storage, Call, Config<T>, Event<T>} = 58,
-
-		ZenlinkProtocol: zenlink_protocol::{Pallet, Call, Storage, Event<T>}  = 59,
+		Vesting: pallet_vesting = 50,
+		Utility: pallet_utility = 51,
+		Currencies: orml_currencies = 52,
+		Tokens: orml_tokens = 53,
+		XTokens: orml_xtokens = 54,
+		Identity: pallet_identity = 55,
+		Contracts: pallet_contracts = 56,
+		RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip = 57,
+		DiaOracleModule: dia_oracle = 58,
+
+		ZenlinkProtocol: zenlink_protocol  = 59,
 
 		// Spacewalk pallets
-		Currency: currency::{Pallet} = 60,
-		Fee: fee::{Pallet, Call, Config<T>, Storage} = 61,
-		Issue: issue::{Pallet, Call, Config<T>, Storage, Event<T>} = 62,
-		Nomination: nomination::{Pallet, Call, Config, Storage, Event<T>} = 63,
-		Oracle: oracle::{Pallet, Call, Config, Storage, Event<T>} = 64,
-		Redeem: redeem::{Pallet, Call, Config<T>, Storage, Event<T>} = 65,
-		Replace: replace::{Pallet, Call, Config<T>, Storage, Event<T>} = 66,
-		Security: security::{Pallet, Call, Config, Storage, Event<T>} = 67,
-		StellarRelay: stellar_relay::{Pallet, Call, Config<T>, Storage, Event<T>} = 68,
-		VaultRegistry: vault_registry::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned} = 69,
-		PooledVaultRewards: pooled_rewards::{Pallet, Call, Storage, Event<T>} = 70,
-		VaultStaking: staking::{Pallet, Storage, Event<T>} = 71,
-		ClientsInfo: clients_info::{Pallet, Call, Storage, Event<T>} = 72,
-		RewardDistribution: reward_distribution::{Pallet, Call, Storage, Event<T>} = 73,
-
-		TokenAllowance: orml_currencies_allowance_extension::{Pallet, Storage, Call, Event<T>, Config<T>} = 80,
-		OrmlExtension: orml_tokens_management_extension::{Pallet, Storage, Call, Event<T>} = 81,
-
-		TreasuryBuyoutExtension: treasury_buyout_extension::{Pallet, Storage, Call, Event<T>} = 82,
-
-		Farming: farming::{Pallet, Call, Storage, Event<T>} = 90,
+		Currency: currency = 60,
+		Fee: fee = 61,
+		Issue: issue = 62,
+		Nomination: nomination = 63,
+		Oracle: oracle = 64,
+		Redeem: redeem = 65,
+		Replace: replace = 66,
+		Security: security = 67,
+		StellarRelay: stellar_relay = 68,
+		VaultRegistry: vault_registry = 69,
+		PooledVaultRewards: pooled_rewards = 70,
+		VaultStaking: staking = 71,
+		ClientsInfo: clients_info = 72,
+		RewardDistribution: reward_distribution = 73,
+
+		TokenAllowance: orml_currencies_allowance_extension = 80,
+		OrmlExtension: orml_tokens_management_extension = 81,
+
+		TreasuryBuyoutExtension: treasury_buyout_extension = 82,
+
+		Farming: farming = 90,
 
 		// Asset Metadata
-		AssetRegistry: orml_asset_registry::{Pallet, Storage, Call, Event<T>, Config<T>} = 91,
+		AssetRegistry: orml_asset_registry = 91,
 
 	}
 );
@@ -1541,6 +1560,8 @@ mod benches {
 		[orml_currencies_allowance_extension, TokenAllowance]
 		[orml_tokens_management_extension, OrmlExtension]
 		[treasury_buyout_extension, TreasuryBuyoutExtension]
+
+		[dia_oracle, DiaOracleModule]
 	);
 }
 
@@ -1677,11 +1698,11 @@ impl_runtime_apis! {
 	}
 
 	impl dia_oracle_runtime_api::DiaOracleApi<Block> for Runtime{
-		fn get_value(blockchain: frame_support::sp_std::vec::Vec<u8>, symbol: frame_support::sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::PriceInfo, sp_runtime::DispatchError>{
+		fn get_value(blockchain: sp_std::vec::Vec<u8>, symbol: sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::PriceInfo, sp_runtime::DispatchError>{
 			DiaOracleModule::get_value(blockchain, symbol)
 		}
 
-		fn get_coin_info(blockchain: frame_support::sp_std::vec::Vec<u8>, symbol: frame_support::sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::CoinInfo,sp_runtime::DispatchError>{
+		fn get_coin_info(blockchain: sp_std::vec::Vec<u8>, symbol: sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::CoinInfo,sp_runtime::DispatchError>{
 			DiaOracleModule::get_coin_info(blockchain, symbol)
 		}
 	}
@@ -1802,7 +1823,8 @@ impl_runtime_apis! {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey};
+			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch};
+			use sp_storage::TrackedStorageKey;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use baseline::Pallet as BaselineBench;
 
@@ -1947,7 +1969,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_contracts::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>
+	impl pallet_contracts::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash, EventRecord>
 		for Runtime
 	{
 		fn call(
@@ -1957,7 +1979,7 @@ impl_runtime_apis! {
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			input_data: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractExecResult<Balance> {
+		) -> pallet_contracts_primitives::ContractExecResult<Balance, EventRecord> {
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
 			Contracts::bare_call(
 				origin,
@@ -1966,7 +1988,8 @@ impl_runtime_apis! {
 				gas_limit,
 				storage_deposit_limit,
 				input_data,
-				CONTRACTS_DEBUG_OUTPUT,
+				pallet_contracts::DebugInfo::UnsafeDebug,
+				pallet_contracts::CollectEvents::UnsafeCollect,
 				pallet_contracts::Determinism::Enforced,
 			)
 		}
@@ -1979,7 +2002,7 @@ impl_runtime_apis! {
 			code: pallet_contracts_primitives::Code<Hash>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance>
+		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance, EventRecord>
 		{
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
 			Contracts::bare_instantiate(
@@ -1990,7 +2013,8 @@ impl_runtime_apis! {
 				code,
 				data,
 				salt,
-				CONTRACTS_DEBUG_OUTPUT
+				pallet_contracts::DebugInfo::UnsafeDebug,
+				pallet_contracts::CollectEvents::UnsafeCollect,
 			)
 		}
 
@@ -2034,6 +2058,7 @@ impl_runtime_apis! {
 #[allow(dead_code)]
 struct CheckInherents;
 
+#[allow(deprecated)]
 impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
 	fn check_inherents(
 		block: &Block,
diff --git a/runtime/foucoco/src/weights/dia_oracle.rs b/runtime/foucoco/src/weights/dia_oracle.rs
new file mode 100644
index 000000000..ef4d3760e
--- /dev/null
+++ b/runtime/foucoco/src/weights/dia_oracle.rs
@@ -0,0 +1,135 @@
+
+//! Autogenerated weights for dia_oracle
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+
+// Executed Command:
+// ../target/production/pendulum-node
+// benchmark
+// pallet
+// --chain
+// foucoco
+// --wasm-execution=compiled
+// --pallet
+// dia_oracle
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+// --output
+// ../runtime/foucoco/src/weights/dia_oracle.rs
+// --template
+// frame-weight-template.hbs
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for dia_oracle using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> dia_oracle::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::SupportedCurrencies` (r:1 w:1)
+	/// Proof: `DiaOracleModule::SupportedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn add_currency() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `472`
+		//  Estimated: `3937`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 3937)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::SupportedCurrencies` (r:1 w:0)
+	/// Proof: `DiaOracleModule::SupportedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn remove_currency() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `472`
+		//  Estimated: `3937`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 3937)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:1)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn authorize_account() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `305`
+		//  Estimated: `3770`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 3770)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:2 w:1)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn authorize_account_signed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `358`
+		//  Estimated: `6298`
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 6298)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn deauthorize_account() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `305`
+		//  Estimated: `3770`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 3770)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:2 w:1)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn deauthorize_account_signed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `358`
+		//  Estimated: `6298`
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 6298)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::CoinInfosMap` (r:0 w:1)
+	/// Proof: `DiaOracleModule::CoinInfosMap` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn set_updated_coin_infos() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `358`
+		//  Estimated: `3823`
+		// Minimum execution time: 9_840_000_000 picoseconds.
+		Weight::from_parts(9_938_000_000, 3823)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::BatchingApi` (r:0 w:1)
+	/// Proof: `DiaOracleModule::BatchingApi` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn set_batching_api() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `358`
+		//  Estimated: `3823`
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 3823)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+}
\ No newline at end of file
diff --git a/runtime/foucoco/src/weights/fee.rs b/runtime/foucoco/src/weights/fee.rs
index 8d83068e2..6780d1d9a 100644
--- a/runtime/foucoco/src/weights/fee.rs
+++ b/runtime/foucoco/src/weights/fee.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for fee
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // fee
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/
+// ../runtime/foucoco/src/weights/fee.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,64 +38,64 @@ use core::marker::PhantomData;
 /// Weights for fee using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> fee::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Fee IssueFee (r:0 w:1)
-	/// Proof Skipped: Fee IssueFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::IssueFee` (r:0 w:1)
+	/// Proof: `Fee::IssueFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_issue_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee IssueGriefingCollateral (r:0 w:1)
-	/// Proof Skipped: Fee IssueGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::IssueGriefingCollateral` (r:0 w:1)
+	/// Proof: `Fee::IssueGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_issue_griefing_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee RedeemFee (r:0 w:1)
-	/// Proof Skipped: Fee RedeemFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::RedeemFee` (r:0 w:1)
+	/// Proof: `Fee::RedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_redeem_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee PremiumRedeemFee (r:0 w:1)
-	/// Proof Skipped: Fee PremiumRedeemFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::PremiumRedeemFee` (r:0 w:1)
+	/// Proof: `Fee::PremiumRedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_premium_redeem_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee PunishmentFee (r:0 w:1)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::PunishmentFee` (r:0 w:1)
+	/// Proof: `Fee::PunishmentFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_punishment_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee ReplaceGriefingCollateral (r:0 w:1)
-	/// Proof Skipped: Fee ReplaceGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::ReplaceGriefingCollateral` (r:0 w:1)
+	/// Proof: `Fee::ReplaceGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_replace_griefing_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/foucoco/src/weights/issue.rs b/runtime/foucoco/src/weights/issue.rs
index cc465d375..0c5c81662 100644
--- a/runtime/foucoco/src/weights/issue.rs
+++ b/runtime/foucoco/src/weights/issue.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for issue
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Marcels-MBP`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // issue
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/
+// ../runtime/foucoco/src/weights/issue.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,127 +38,127 @@ use core::marker::PhantomData;
 /// Weights for issue using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> issue::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Issue LimitVolumeAmount (r:1 w:0)
-	/// Proof: Issue LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:3 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee IssueGriefingCollateral (r:1 w:0)
-	/// Proof Skipped: Fee IssueGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Issue IssueMinimumTransferAmount (r:1 w:0)
-	/// Proof: Issue IssueMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee IssueFee (r:1 w:0)
-	/// Proof Skipped: Fee IssueFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Security Nonce (r:1 w:1)
-	/// Proof Skipped: Security Nonce (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry VaultStellarPublicKey (r:1 w:0)
-	/// Proof Skipped: VaultRegistry VaultStellarPublicKey (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Issue IssuePeriod (r:1 w:0)
-	/// Proof: Issue IssuePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Issue IssueRequests (r:0 w:1)
-	/// Proof: Issue IssueRequests (max_values: None, max_size: Some(339), added: 2814, mode: MaxEncodedLen)
+	/// Storage: `Issue::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Issue::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:3 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::IssueGriefingCollateral` (r:1 w:0)
+	/// Proof: `Fee::IssueGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IssueMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Issue::IssueMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Fee::IssueFee` (r:1 w:0)
+	/// Proof: `Fee::IssueFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::Nonce` (r:1 w:1)
+	/// Proof: `Security::Nonce` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::ParentHash` (r:1 w:0)
+	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::VaultStellarPublicKey` (r:1 w:0)
+	/// Proof: `VaultRegistry::VaultStellarPublicKey` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Issue::IssuePeriod` (r:1 w:0)
+	/// Proof: `Issue::IssuePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IssueRequests` (r:0 w:1)
+	/// Proof: `Issue::IssueRequests` (`max_values`: None, `max_size`: Some(339), added: 2814, mode: `MaxEncodedLen`)
 	fn request_issue() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1962`
-		//  Estimated: `10377`
-		// Minimum execution time: 102_000_000 picoseconds.
-		Weight::from_parts(104_000_000, 10377)
+		//  Estimated: `11106`
+		// Minimum execution time: 89_000_000 picoseconds.
+		Weight::from_parts(90_000_000, 11106)
 			.saturating_add(T::DbWeight::get().reads(18_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Issue IssueRequests (r:1 w:1)
-	/// Proof: Issue IssueRequests (max_values: None, max_size: Some(339), added: 2814, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:1 w:0)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Validators (r:1 w:0)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:0)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee IssueFee (r:1 w:0)
-	/// Proof Skipped: Fee IssueFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Issue LimitVolumeAmount (r:1 w:0)
-	/// Proof: Issue LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:1 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Issue::IssueRequests` (r:1 w:1)
+	/// Proof: `Issue::IssueRequests` (`max_values`: None, `max_size`: Some(339), added: 2814, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:1 w:0)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Validators` (r:1 w:0)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:0)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Fee::IssueFee` (r:1 w:0)
+	/// Proof: `Fee::IssueFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Issue::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Issue::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:2 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
 	fn execute_issue() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2499`
 		//  Estimated: `71867`
-		// Minimum execution time: 8_834_000_000 picoseconds.
-		Weight::from_parts(8_916_000_000, 71867)
+		// Minimum execution time: 8_030_000_000 picoseconds.
+		Weight::from_parts(8_126_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(11_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Issue IssueRequests (r:1 w:1)
-	/// Proof: Issue IssueRequests (max_values: None, max_size: Some(339), added: 2814, mode: MaxEncodedLen)
-	/// Storage: Issue IssuePeriod (r:1 w:0)
-	/// Proof: Issue IssuePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Issue::IssueRequests` (r:1 w:1)
+	/// Proof: `Issue::IssueRequests` (`max_values`: None, `max_size`: Some(339), added: 2814, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IssuePeriod` (r:1 w:0)
+	/// Proof: `Issue::IssuePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn cancel_issue() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1270`
 		//  Estimated: `4735`
-		// Minimum execution time: 38_000_000 picoseconds.
-		Weight::from_parts(39_000_000, 4735)
+		// Minimum execution time: 33_000_000 picoseconds.
+		Weight::from_parts(35_000_000, 4735)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Issue IssuePeriod (r:0 w:1)
-	/// Proof: Issue IssuePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Issue::IssuePeriod` (r:0 w:1)
+	/// Proof: `Issue::IssuePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_issue_period() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Issue LimitVolumeAmount (r:0 w:1)
-	/// Proof: Issue LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Issue LimitVolumeCurrencyId (r:0 w:1)
-	/// Proof: Issue LimitVolumeCurrencyId (max_values: Some(1), max_size: Some(46), added: 541, mode: MaxEncodedLen)
-	/// Storage: Issue IntervalLength (r:0 w:1)
-	/// Proof: Issue IntervalLength (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Issue::LimitVolumeAmount` (r:0 w:1)
+	/// Proof: `Issue::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::LimitVolumeCurrencyId` (r:0 w:1)
+	/// Proof: `Issue::LimitVolumeCurrencyId` (`max_values`: Some(1), `max_size`: Some(46), added: 541, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IntervalLength` (r:0 w:1)
+	/// Proof: `Issue::IntervalLength` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn rate_limit_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Issue IssueMinimumTransferAmount (r:0 w:1)
-	/// Proof: Issue IssueMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Issue::IssueMinimumTransferAmount` (r:0 w:1)
+	/// Proof: `Issue::IssueMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn minimum_transfer_amount_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/foucoco/src/weights/mod.rs b/runtime/foucoco/src/weights/mod.rs
index 266270306..d8430393e 100644
--- a/runtime/foucoco/src/weights/mod.rs
+++ b/runtime/foucoco/src/weights/mod.rs
@@ -18,22 +18,23 @@
 //! Expose the auto generated weight files.
 
 pub mod block_weights;
+pub mod dia_oracle;
 pub mod extrinsic_weights;
-pub mod pallet_xcm;
-pub mod paritydb_weights;
-pub mod rocksdb_weights;
-pub mod parachain_staking;
-pub mod orml_asset_registry;
-pub mod orml_currencies_allowance_extension;
-pub mod orml_tokens_management_extension;
-pub mod treasury_buyout_extension;
 pub mod fee;
 pub mod issue;
 pub mod nomination;
 pub mod oracle;
+pub mod orml_asset_registry;
+pub mod orml_currencies_allowance_extension;
+pub mod orml_tokens_management_extension;
+pub mod pallet_xcm;
+pub mod parachain_staking;
+pub mod paritydb_weights;
 pub mod redeem;
 pub mod replace;
+pub mod rocksdb_weights;
 pub mod stellar_relay;
+pub mod treasury_buyout_extension;
 pub mod vault_registry;
 
 pub use block_weights::constants::BlockExecutionWeight;
diff --git a/runtime/foucoco/src/weights/nomination.rs b/runtime/foucoco/src/weights/nomination.rs
index 57118aba4..546eb4fb7 100644
--- a/runtime/foucoco/src/weights/nomination.rs
+++ b/runtime/foucoco/src/weights/nomination.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for nomination
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // nomination
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/
+// ../runtime/foucoco/src/weights/nomination.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,190 +38,194 @@ use core::marker::PhantomData;
 /// Weights for nomination using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> nomination::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Nomination NominationEnabled (r:0 w:1)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Nomination::NominationEnabled` (r:0 w:1)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn set_nomination_enabled() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Nomination NominationEnabled (r:1 w:0)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Nomination Vaults (r:1 w:1)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::NominationEnabled` (r:1 w:0)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::Vaults` (r:1 w:1)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
 	fn opt_in_to_nomination() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `747`
 		//  Estimated: `4212`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(28_000_000, 4212)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(21_000_000, 4212)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Nomination Vaults (r:1 w:1)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:1)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:2 w:2)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:2 w:2)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:2 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:2 w:2)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:2 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:2 w:2)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:2 w:2)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::Vaults` (r:1 w:1)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:1)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:2 w:2)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:2 w:2)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:2 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:2 w:2)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:2 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:2 w:2)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:2 w:2)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn opt_out_of_nomination() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2499`
-		//  Estimated: `8439`
-		// Minimum execution time: 218_000_000 picoseconds.
-		Weight::from_parts(227_000_000, 8439)
-			.saturating_add(T::DbWeight::get().reads(25_u64))
+		//  Measured:  `2570`
+		//  Estimated: `8510`
+		// Minimum execution time: 173_000_000 picoseconds.
+		Weight::from_parts(178_000_000, 8510)
+			.saturating_add(T::DbWeight::get().reads(27_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Nomination NominationEnabled (r:1 w:0)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Nomination Vaults (r:1 w:0)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:2 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:2 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::NominationEnabled` (r:1 w:0)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Nomination::Vaults` (r:1 w:0)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:2 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:2 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn deposit_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3564`
-		//  Estimated: `9504`
-		// Minimum execution time: 210_000_000 picoseconds.
-		Weight::from_parts(215_000_000, 9504)
+		//  Measured:  `3363`
+		//  Estimated: `9303`
+		// Minimum execution time: 163_000_000 picoseconds.
+		Weight::from_parts(166_000_000, 9303)
 			.saturating_add(T::DbWeight::get().reads(28_u64))
 			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Nomination NominationEnabled (r:1 w:0)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Nomination Vaults (r:1 w:0)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Nomination::NominationEnabled` (r:1 w:0)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Nomination::Vaults` (r:1 w:0)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn withdraw_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3576`
-		//  Estimated: `7041`
-		// Minimum execution time: 193_000_000 picoseconds.
-		Weight::from_parts(197_000_000, 7041)
-			.saturating_add(T::DbWeight::get().reads(24_u64))
+		//  Measured:  `3647`
+		//  Estimated: `7734`
+		// Minimum execution time: 161_000_000 picoseconds.
+		Weight::from_parts(165_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(26_u64))
 			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/foucoco/src/weights/oracle.rs b/runtime/foucoco/src/weights/oracle.rs
index 551fefef0..561dc731f 100644
--- a/runtime/foucoco/src/weights/oracle.rs
+++ b/runtime/foucoco/src/weights/oracle.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for oracle
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // oracle
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/
+// ../runtime/foucoco/src/weights/oracle.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,36 +38,36 @@ use core::marker::PhantomData;
 /// Weights for oracle using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> oracle::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Timestamp Now (r:0 w:1)
-	/// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Timestamp DidUpdate (r:0 w:1)
-	/// Proof: Timestamp DidUpdate (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Timestamp::Now` (r:0 w:1)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Timestamp::DidUpdate` (r:0 w:1)
+	/// Proof: `Timestamp::DidUpdate` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn on_initialize() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 1_000_000 picoseconds.
-		Weight::from_parts(2_000_000, 0)
+		Weight::from_parts(1_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Oracle OracleKeys (r:0 w:1)
-	/// Proof Skipped: Oracle OracleKeys (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Oracle::OracleKeys` (r:0 w:1)
+	/// Proof: `Oracle::OracleKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn update_oracle_keys() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(11_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Oracle MaxDelay (r:0 w:1)
-	/// Proof Skipped: Oracle MaxDelay (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Oracle::MaxDelay` (r:0 w:1)
+	/// Proof: `Oracle::MaxDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_max_delay() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/foucoco/src/weights/orml_asset_registry.rs b/runtime/foucoco/src/weights/orml_asset_registry.rs
index d29e2db73..7633f9311 100644
--- a/runtime/foucoco/src/weights/orml_asset_registry.rs
+++ b/runtime/foucoco/src/weights/orml_asset_registry.rs
@@ -1,22 +1,21 @@
 
-//! Autogenerated weights for `orml_asset_registry`
+//! Autogenerated weights for orml_asset_registry
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Marcels-MBP`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// orml-asset-registry
+// orml_asset_registry
 // --extrinsic
 // *
 // --steps
@@ -24,45 +23,46 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/orml_asset_registry.rs
+// ../runtime/foucoco/src/weights/orml_asset_registry.rs
+// --template
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
+#![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
 
-/// Weight functions for `orml_asset_registry`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> orml_asset_registry::WeightInfo for WeightInfo<T> {
-	/// Storage: AssetRegistry Metadata (r:1 w:1)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry LocationToAssetId (r:1 w:1)
-	/// Proof Skipped: AssetRegistry LocationToAssetId (max_values: None, max_size: None, mode: Measured)
+/// Weights for orml_asset_registry using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> orml_asset_registry::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:1)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationToAssetId` (r:1 w:1)
+	/// Proof: `AssetRegistry::LocationToAssetId` (`max_values`: None, `max_size`: Some(656), added: 3131, mode: `MaxEncodedLen`)
 	fn register_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `104`
-		//  Estimated: `7138`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(19_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 7138))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `138`
+		//  Estimated: `4362`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 4362)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: AssetRegistry Metadata (r:1 w:1)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry LocationToAssetId (r:1 w:2)
-	/// Proof Skipped: AssetRegistry LocationToAssetId (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:1)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationToAssetId` (r:1 w:2)
+	/// Proof: `AssetRegistry::LocationToAssetId` (`max_values`: None, `max_size`: Some(656), added: 3131, mode: `MaxEncodedLen`)
 	fn update_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `745`
-		//  Estimated: `8420`
-		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(26_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 8420))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `801`
+		//  Estimated: `4362`
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 4362)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	fn set_asset_location() -> Weight {
 		// Proof Size summary in bytes:
@@ -70,6 +70,5 @@ impl<T: frame_system::Config> orml_asset_registry::WeightInfo for WeightInfo<T>
 		//  Estimated: `0`
 		// Minimum execution time: 0_000 picoseconds.
 		Weight::from_parts(0, 0)
-			.saturating_add(Weight::from_parts(0, 0))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/foucoco/src/weights/orml_currencies_allowance_extension.rs b/runtime/foucoco/src/weights/orml_currencies_allowance_extension.rs
index a081fbd3f..a34599dda 100644
--- a/runtime/foucoco/src/weights/orml_currencies_allowance_extension.rs
+++ b/runtime/foucoco/src/weights/orml_currencies_allowance_extension.rs
@@ -2,21 +2,20 @@
 //! Autogenerated weights for orml_currencies_allowance_extension
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-03-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// orml-currencies-allowance-extension
+// orml_currencies_allowance_extension
 // --extrinsic
 // *
 // --steps
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/orml-currencies-allowance-extension.rs
+// ../runtime/foucoco/src/weights/orml_currencies_allowance_extension.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -38,59 +37,59 @@ use core::marker::PhantomData;
 
 /// Weights for orml_currencies_allowance_extension using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> orml_currencies_allowance_extension::default_weights::WeightInfo for SubstrateWeight<T> {
-	/// Storage: TokenAllowance AllowedCurrencies (r:2 w:1)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
+impl<T: frame_system::Config> orml_currencies_allowance_extension::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:2 w:1)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `n` is `[1, 256]`.
 	fn add_allowed_currencies(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `6082`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(16_786_577, 6082)
-			// Standard Error: 2_416
-			.saturating_add(Weight::from_parts(1_273_968, 0).saturating_mul(n.into()))
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_443_225, 6082)
+			// Standard Error: 1_398
+			.saturating_add(Weight::from_parts(994_975, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TokenAllowance AllowedCurrencies (r:0 w:1)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:0 w:1)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `n` is `[1, 256]`.
 	fn remove_allowed_currencies(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(11_332_861, 0)
-			// Standard Error: 1_861
-			.saturating_add(Weight::from_parts(1_244_517, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_573_827, 0)
+			// Standard Error: 1_352
+			.saturating_add(Weight::from_parts(993_783, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TokenAllowance AllowedCurrencies (r:1 w:0)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TokenAllowance Approvals (r:0 w:1)
-	/// Proof Skipped: TokenAllowance Approvals (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:1 w:0)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `TokenAllowance::Approvals` (r:0 w:1)
+	/// Proof: `TokenAllowance::Approvals` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn approve() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `184`
-		//  Estimated: `3833`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 3833)
+		//  Estimated: `3649`
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 3649)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TokenAllowance AllowedCurrencies (r:1 w:0)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TokenAllowance Approvals (r:1 w:1)
-	/// Proof Skipped: TokenAllowance Approvals (max_values: None, max_size: None, mode: Measured)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:1 w:0)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `TokenAllowance::Approvals` (r:1 w:1)
+	/// Proof: `TokenAllowance::Approvals` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_from() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `490`
-		//  Estimated: `14106`
-		// Minimum execution time: 49_000_000 picoseconds.
-		Weight::from_parts(50_000_000, 14106)
+		//  Estimated: `6196`
+		// Minimum execution time: 53_000_000 picoseconds.
+		Weight::from_parts(55_000_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
diff --git a/runtime/foucoco/src/weights/orml_tokens_management_extension.rs b/runtime/foucoco/src/weights/orml_tokens_management_extension.rs
index e8e3db70b..90a957615 100644
--- a/runtime/foucoco/src/weights/orml_tokens_management_extension.rs
+++ b/runtime/foucoco/src/weights/orml_tokens_management_extension.rs
@@ -2,21 +2,20 @@
 //! Autogenerated weights for orml_tokens_management_extension
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-03-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// orml-tokens-management-extension
+// orml_tokens_management_extension
 // --extrinsic
 // *
 // --steps
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/orml_tokens_management_extension.rs
+// ../runtime/foucoco/src/weights/orml_tokens_management_extension.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -38,67 +37,67 @@ use core::marker::PhantomData;
 
 /// Weights for orml_tokens_management_extension using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> orml_tokens_management_extension::default_weights::WeightInfo for SubstrateWeight<T> {
-	/// Storage: OrmlExtension CurrencyData (r:1 w:1)
-	/// Proof: OrmlExtension CurrencyData (max_values: None, max_size: Some(174), added: 2649, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+impl<T: frame_system::Config> orml_tokens_management_extension::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `OrmlExtension::CurrencyData` (r:1 w:1)
+	/// Proof: `OrmlExtension::CurrencyData` (`max_values`: None, `max_size`: Some(174), added: 2649, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn create() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `179`
-		//  Estimated: `7232`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(28_000_000, 7232)
+		//  Estimated: `3639`
+		// Minimum execution time: 23_000_000 picoseconds.
+		Weight::from_parts(23_000_000, 3639)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: OrmlExtension CurrencyData (r:1 w:0)
-	/// Proof: OrmlExtension CurrencyData (max_values: None, max_size: Some(174), added: 2649, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `OrmlExtension::CurrencyData` (r:1 w:0)
+	/// Proof: `OrmlExtension::CurrencyData` (`max_values`: None, `max_size`: Some(174), added: 2649, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn mint() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `233`
-		//  Estimated: `7232`
-		// Minimum execution time: 38_000_000 picoseconds.
-		Weight::from_parts(39_000_000, 7232)
+		//  Estimated: `3639`
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 3639)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: OrmlExtension CurrencyData (r:1 w:0)
-	/// Proof: OrmlExtension CurrencyData (max_values: None, max_size: Some(174), added: 2649, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `OrmlExtension::CurrencyData` (r:1 w:0)
+	/// Proof: `OrmlExtension::CurrencyData` (`max_values`: None, `max_size`: Some(174), added: 2649, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn burn() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `336`
-		//  Estimated: `7232`
-		// Minimum execution time: 31_000_000 picoseconds.
-		Weight::from_parts(32_000_000, 7232)
+		//  Estimated: `3639`
+		// Minimum execution time: 23_000_000 picoseconds.
+		Weight::from_parts(24_000_000, 3639)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: OrmlExtension CurrencyData (r:1 w:1)
-	/// Proof: OrmlExtension CurrencyData (max_values: None, max_size: Some(174), added: 2649, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `OrmlExtension::CurrencyData` (r:1 w:1)
+	/// Proof: `OrmlExtension::CurrencyData` (`max_values`: None, `max_size`: Some(174), added: 2649, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_ownership() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `439`
-		//  Estimated: `9835`
-		// Minimum execution time: 38_000_000 picoseconds.
-		Weight::from_parts(40_000_000, 9835)
+		//  Estimated: `6196`
+		// Minimum execution time: 31_000_000 picoseconds.
+		Weight::from_parts(32_000_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: OrmlExtension CurrencyData (r:1 w:1)
-	/// Proof: OrmlExtension CurrencyData (max_values: None, max_size: Some(174), added: 2649, mode: MaxEncodedLen)
+	/// Storage: `OrmlExtension::CurrencyData` (r:1 w:1)
+	/// Proof: `OrmlExtension::CurrencyData` (`max_values`: None, `max_size`: Some(174), added: 2649, mode: `MaxEncodedLen`)
 	fn set_managers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `233`
 		//  Estimated: `3639`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 3639)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 3639)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/foucoco/src/weights/pallet_xcm.rs b/runtime/foucoco/src/weights/pallet_xcm.rs
index 501edc7ea..fdaad8067 100644
--- a/runtime/foucoco/src/weights/pallet_xcm.rs
+++ b/runtime/foucoco/src/weights/pallet_xcm.rs
@@ -1,22 +1,21 @@
 
-//! Autogenerated weights for `pallet_xcm`
+//! Autogenerated weights for pallet_xcm
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `pop-os`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// pallet-xcm
+// pallet_xcm
 // --extrinsic
 // *
 // --steps
@@ -24,251 +23,237 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/
+// ../runtime/foucoco/src/weights/pallet_xcm.rs
+// --template
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_xcm`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+/// Weights for pallet_xcm using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_xcm::WeightInfo for SubstrateWeight<T> {
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `245`
 		//  Estimated: `3710`
-		// Minimum execution time: 37_037_000 picoseconds.
-		Weight::from_parts(37_780_000, 0)
-			.saturating_add(Weight::from_parts(0, 3710))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(21_000_000, 3710)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Benchmark Override (r:0 w:0)
-	/// Proof Skipped: Benchmark Override (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Benchmark::Override` (r:0 w:0)
+	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn teleport_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)
-			.saturating_add(Weight::from_parts(0, 0))
 	}
-	/// Storage: ParachainInfo ParachainId (r:1 w:0)
-	/// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `32`
 		//  Estimated: `1489`
-		// Minimum execution time: 32_612_000 picoseconds.
-		Weight::from_parts(59_114_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 1489)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_629_000 picoseconds.
-		Weight::from_parts(13_864_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 	}
-	/// Storage: PolkadotXcm SupportedVersion (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_xcm_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 14_727_000 picoseconds.
-		Weight::from_parts(16_019_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: PolkadotXcm SafeXcmVersion (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:0 w:1)
+	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn force_default_xcm_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_571_000 picoseconds.
-		Weight::from_parts(4_790_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm QueryCounter (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm Queries (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
+	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `245`
 		//  Estimated: `3710`
-		// Minimum execution time: 44_609_000 picoseconds.
-		Weight::from_parts(88_897_000, 0)
-			.saturating_add(Weight::from_parts(0, 3710))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(24_000_000, 3710)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm Queries (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
+	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `428`
 		//  Estimated: `3893`
-		// Minimum execution time: 45_297_000 picoseconds.
-		Weight::from_parts(45_947_000, 0)
-			.saturating_add(Weight::from_parts(0, 3893))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 3893)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
+	/// Proof: `PolkadotXcm::XcmExecutionSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn force_suspension() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_537_000 picoseconds.
-		Weight::from_parts(4_726_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: PolkadotXcm SupportedVersion (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:4 w:2)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `229`
-		//  Estimated: `11119`
-		// Minimum execution time: 21_923_000 picoseconds.
-		Weight::from_parts(22_440_000, 0)
-			.saturating_add(Weight::from_parts(0, 11119))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `254`
+		//  Estimated: `11144`
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 11144)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifiers (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:4 w:2)
+	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `233`
-		//  Estimated: `11123`
-		// Minimum execution time: 22_204_000 picoseconds.
-		Weight::from_parts(22_593_000, 0)
-			.saturating_add(Weight::from_parts(0, 11123))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `258`
+		//  Estimated: `11148`
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 11148)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:5 w:0)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `240`
-		//  Estimated: `13605`
-		// Minimum execution time: 23_228_000 picoseconds.
-		Weight::from_parts(23_713_000, 0)
-			.saturating_add(Weight::from_parts(0, 13605))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `265`
+		//  Estimated: `13630`
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 13630)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `312`
 		//  Estimated: `6252`
-		// Minimum execution time: 41_887_000 picoseconds.
-		Weight::from_parts(43_346_000, 0)
-			.saturating_add(Weight::from_parts(0, 6252))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(25_000_000, 6252)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:3 w:0)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `272`
 		//  Estimated: `8687`
-		// Minimum execution time: 13_190_000 picoseconds.
-		Weight::from_parts(13_674_000, 0)
-			.saturating_add(Weight::from_parts(0, 8687))
-			.saturating_add(T::DbWeight::get().reads(3))
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 8687)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `240`
-		//  Estimated: `11130`
-		// Minimum execution time: 22_721_000 picoseconds.
-		Weight::from_parts(23_207_000, 0)
-			.saturating_add(Weight::from_parts(0, 11130))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `265`
+		//  Estimated: `11155`
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 11155)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `316`
-		//  Estimated: `11206`
-		// Minimum execution time: 50_285_000 picoseconds.
-		Weight::from_parts(51_075_000, 0)
-			.saturating_add(Weight::from_parts(0, 11206))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `341`
+		//  Estimated: `11231`
+		// Minimum execution time: 30_000_000 picoseconds.
+		Weight::from_parts(32_000_000, 11231)
+			.saturating_add(T::DbWeight::get().reads(9_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/foucoco/src/weights/redeem.rs b/runtime/foucoco/src/weights/redeem.rs
index da4c4b23e..3b705d094 100644
--- a/runtime/foucoco/src/weights/redeem.rs
+++ b/runtime/foucoco/src/weights/redeem.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for redeem
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-03, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Marcels-MBP`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // redeem
@@ -24,564 +23,282 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/
+// ../runtime/foucoco/src/weights/redeem.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
-#![allow(dead_code)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions needed for redeem.
-pub trait WeightInfo {
-	fn request_redeem() -> Weight;
-	fn liquidation_redeem() -> Weight;
-	fn execute_redeem() -> Weight;
-	fn cancel_redeem_reimburse() -> Weight;
-	fn cancel_redeem_retry() -> Weight;
-	fn self_redeem() -> Weight;
-	fn set_redeem_period() -> Weight;
-	fn mint_tokens_for_reimbursed_redeem() -> Weight;
-	fn rate_limit_update() -> Weight;
-	fn minimum_transfer_amount_update() -> Weight;
-}
-
 /// Weights for redeem using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> redeem::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Redeem LimitVolumeAmount (r:1 w:0)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: Fee RedeemFee (r:1 w:0)
-	/// Proof Skipped: Fee RedeemFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemMinimumTransferAmount (r:1 w:0)
-	/// Proof: Redeem RedeemMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Security Nonce (r:1 w:1)
-	/// Proof Skipped: Security Nonce (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PremiumRedeemFee (r:1 w:0)
-	/// Proof Skipped: Fee PremiumRedeemFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemRequests (r:0 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
+	/// Storage: `Redeem::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Redeem::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::RedeemFee` (r:1 w:0)
+	/// Proof: `Fee::RedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Redeem::RedeemMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Security::Nonce` (r:1 w:1)
+	/// Proof: `Security::Nonce` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::ParentHash` (r:1 w:0)
+	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::PremiumRedeemFee` (r:1 w:0)
+	/// Proof: `Fee::PremiumRedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemPeriod` (r:1 w:0)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::RedeemRequests` (r:0 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
 	fn request_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1974`
-		//  Estimated: `7914`
-		// Minimum execution time: 95_000_000 picoseconds.
-		Weight::from_parts(97_000_000, 7914)
+		//  Measured:  `1907`
+		//  Estimated: `7734`
+		// Minimum execution time: 83_000_000 picoseconds.
+		Weight::from_parts(85_000_000, 7734)
 			.saturating_add(T::DbWeight::get().reads(16_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Tokens Accounts (r:3 w:3)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Tokens TotalIssuance (r:1 w:1)
-	/// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry LiquidationVault (r:1 w:1)
-	/// Proof Skipped: VaultRegistry LiquidationVault (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Tokens::Accounts` (r:3 w:3)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::LiquidationVault` (r:1 w:1)
+	/// Proof: `VaultRegistry::LiquidationVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn liquidation_redeem() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1495`
 		//  Estimated: `8865`
-		// Minimum execution time: 110_000_000 picoseconds.
-		Weight::from_parts(111_000_000, 8865)
+		// Minimum execution time: 96_000_000 picoseconds.
+		Weight::from_parts(97_000_000, 8865)
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:1 w:0)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Validators (r:1 w:0)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:0)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: Redeem LimitVolumeAmount (r:1 w:0)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:1 w:0)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Validators` (r:1 w:0)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:0)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Redeem::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn execute_redeem() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1698`
 		//  Estimated: `71867`
-		// Minimum execution time: 8_763_000_000 picoseconds.
-		Weight::from_parts(8_800_000_000, 71867)
+		// Minimum execution time: 8_003_000_000 picoseconds.
+		Weight::from_parts(8_175_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PunishmentFee (r:1 w:0)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PunishmentDelay (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Redeem CancelledRedeemAmount (r:0 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::RedeemPeriod` (r:1 w:0)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::PunishmentFee` (r:1 w:0)
+	/// Proof: `Fee::PunishmentFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PunishmentDelay` (r:1 w:0)
+	/// Proof: `VaultRegistry::PunishmentDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:2 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::CancelledRedeemAmount` (r:0 w:1)
+	/// Proof: `Redeem::CancelledRedeemAmount` (`max_values`: None, `max_size`: Some(110), added: 2585, mode: `MaxEncodedLen`)
 	fn cancel_redeem_reimburse() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2868`
-		//  Estimated: `8808`
-		// Minimum execution time: 153_000_000 picoseconds.
-		Weight::from_parts(156_000_000, 8808)
+		//  Measured:  `2801`
+		//  Estimated: `7734`
+		// Minimum execution time: 133_000_000 picoseconds.
+		Weight::from_parts(139_000_000, 7734)
 			.saturating_add(T::DbWeight::get().reads(22_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PunishmentFee (r:1 w:0)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PunishmentDelay (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem CancelledRedeemAmount (r:0 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::RedeemPeriod` (r:1 w:0)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::PunishmentFee` (r:1 w:0)
+	/// Proof: `Fee::PunishmentFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PunishmentDelay` (r:1 w:0)
+	/// Proof: `VaultRegistry::PunishmentDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::CancelledRedeemAmount` (r:0 w:1)
+	/// Proof: `Redeem::CancelledRedeemAmount` (`max_values`: None, `max_size`: Some(110), added: 2585, mode: `MaxEncodedLen`)
 	fn cancel_redeem_retry() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2656`
-		//  Estimated: `8596`
-		// Minimum execution time: 126_000_000 picoseconds.
-		Weight::from_parts(135_000_000, 8596)
+		//  Estimated: `7734`
+		// Minimum execution time: 111_000_000 picoseconds.
+		Weight::from_parts(116_000_000, 7734)
 			.saturating_add(T::DbWeight::get().reads(19_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Tokens TotalIssuance (r:1 w:1)
-	/// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:1 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:2 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
 	fn self_redeem() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1891`
 		//  Estimated: `6096`
-		// Minimum execution time: 90_000_000 picoseconds.
-		Weight::from_parts(91_000_000, 6096)
+		// Minimum execution time: 80_000_000 picoseconds.
+		Weight::from_parts(81_000_000, 6096)
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Redeem RedeemPeriod (r:0 w:1)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Redeem::RedeemPeriod` (r:0 w:1)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_redeem_period() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem CancelledRedeemAmount (r:1 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::CancelledRedeemAmount` (r:1 w:1)
+	/// Proof: `Redeem::CancelledRedeemAmount` (`max_values`: None, `max_size`: Some(110), added: 2585, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn mint_tokens_for_reimbursed_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2049`
-		//  Estimated: `7989`
-		// Minimum execution time: 76_000_000 picoseconds.
-		Weight::from_parts(78_000_000, 7989)
+		//  Measured:  `1982`
+		//  Estimated: `7734`
+		// Minimum execution time: 67_000_000 picoseconds.
+		Weight::from_parts(68_000_000, 7734)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Redeem LimitVolumeAmount (r:0 w:1)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Redeem LimitVolumeCurrencyId (r:0 w:1)
-	/// Proof: Redeem LimitVolumeCurrencyId (max_values: Some(1), max_size: Some(46), added: 541, mode: MaxEncodedLen)
-	/// Storage: Redeem IntervalLength (r:0 w:1)
-	/// Proof: Redeem IntervalLength (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Redeem::LimitVolumeAmount` (r:0 w:1)
+	/// Proof: `Redeem::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::LimitVolumeCurrencyId` (r:0 w:1)
+	/// Proof: `Redeem::LimitVolumeCurrencyId` (`max_values`: Some(1), `max_size`: Some(46), added: 541, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::IntervalLength` (r:0 w:1)
+	/// Proof: `Redeem::IntervalLength` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn rate_limit_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Redeem RedeemMinimumTransferAmount (r:0 w:1)
-	/// Proof: Redeem RedeemMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Redeem::RedeemMinimumTransferAmount` (r:0 w:1)
+	/// Proof: `Redeem::RedeemMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn minimum_transfer_amount_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-}
-
-// For backwards compatibility and tests
-impl WeightInfo for () {
-	/// Storage: Redeem LimitVolumeAmount (r:1 w:0)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: Fee RedeemFee (r:1 w:0)
-	/// Proof Skipped: Fee RedeemFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemMinimumTransferAmount (r:1 w:0)
-	/// Proof: Redeem RedeemMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Security Nonce (r:1 w:1)
-	/// Proof Skipped: Security Nonce (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PremiumRedeemFee (r:1 w:0)
-	/// Proof Skipped: Fee PremiumRedeemFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemRequests (r:0 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	fn request_redeem() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1974`
-		//  Estimated: `7914`
-		// Minimum execution time: 95_000_000 picoseconds.
-		Weight::from_parts(97_000_000, 7914)
-			.saturating_add(RocksDbWeight::get().reads(16_u64))
-			.saturating_add(RocksDbWeight::get().writes(4_u64))
-	}
-	/// Storage: Tokens Accounts (r:3 w:3)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Tokens TotalIssuance (r:1 w:1)
-	/// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry LiquidationVault (r:1 w:1)
-	/// Proof Skipped: VaultRegistry LiquidationVault (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	fn liquidation_redeem() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1495`
-		//  Estimated: `8865`
-		// Minimum execution time: 110_000_000 picoseconds.
-		Weight::from_parts(111_000_000, 8865)
-			.saturating_add(RocksDbWeight::get().reads(8_u64))
-			.saturating_add(RocksDbWeight::get().writes(8_u64))
-	}
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:1 w:0)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Validators (r:1 w:0)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:0)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: Redeem LimitVolumeAmount (r:1 w:0)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	fn execute_redeem() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1698`
-		//  Estimated: `71867`
-		// Minimum execution time: 8_763_000_000 picoseconds.
-		Weight::from_parts(8_800_000_000, 71867)
-			.saturating_add(RocksDbWeight::get().reads(7_u64))
-			.saturating_add(RocksDbWeight::get().writes(2_u64))
-	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PunishmentFee (r:1 w:0)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PunishmentDelay (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Redeem CancelledRedeemAmount (r:0 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
-	fn cancel_redeem_reimburse() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2868`
-		//  Estimated: `8808`
-		// Minimum execution time: 153_000_000 picoseconds.
-		Weight::from_parts(156_000_000, 8808)
-			.saturating_add(RocksDbWeight::get().reads(22_u64))
-			.saturating_add(RocksDbWeight::get().writes(7_u64))
-	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PunishmentFee (r:1 w:0)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PunishmentDelay (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem CancelledRedeemAmount (r:0 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
-	fn cancel_redeem_retry() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2656`
-		//  Estimated: `8596`
-		// Minimum execution time: 126_000_000 picoseconds.
-		Weight::from_parts(135_000_000, 8596)
-			.saturating_add(RocksDbWeight::get().reads(19_u64))
-			.saturating_add(RocksDbWeight::get().writes(7_u64))
-	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Tokens TotalIssuance (r:1 w:1)
-	/// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:1 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	fn self_redeem() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1891`
-		//  Estimated: `6096`
-		// Minimum execution time: 90_000_000 picoseconds.
-		Weight::from_parts(91_000_000, 6096)
-			.saturating_add(RocksDbWeight::get().reads(8_u64))
-			.saturating_add(RocksDbWeight::get().writes(4_u64))
-	}
-	/// Storage: Redeem RedeemPeriod (r:0 w:1)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn set_redeem_period() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
-			.saturating_add(RocksDbWeight::get().writes(1_u64))
-	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem CancelledRedeemAmount (r:1 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	fn mint_tokens_for_reimbursed_redeem() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2049`
-		//  Estimated: `7989`
-		// Minimum execution time: 76_000_000 picoseconds.
-		Weight::from_parts(78_000_000, 7989)
-			.saturating_add(RocksDbWeight::get().reads(9_u64))
-			.saturating_add(RocksDbWeight::get().writes(3_u64))
-	}
-	/// Storage: Redeem LimitVolumeAmount (r:0 w:1)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Redeem LimitVolumeCurrencyId (r:0 w:1)
-	/// Proof: Redeem LimitVolumeCurrencyId (max_values: Some(1), max_size: Some(46), added: 541, mode: MaxEncodedLen)
-	/// Storage: Redeem IntervalLength (r:0 w:1)
-	/// Proof: Redeem IntervalLength (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn rate_limit_update() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
-			.saturating_add(RocksDbWeight::get().writes(3_u64))
-	}
-	/// Storage: Redeem RedeemMinimumTransferAmount (r:0 w:1)
-	/// Proof: Redeem RedeemMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	fn minimum_transfer_amount_update() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
-			.saturating_add(RocksDbWeight::get().writes(1_u64))
-	}
 }
\ No newline at end of file
diff --git a/runtime/foucoco/src/weights/replace.rs b/runtime/foucoco/src/weights/replace.rs
index 55522da5c..1e2d18f90 100644
--- a/runtime/foucoco/src/weights/replace.rs
+++ b/runtime/foucoco/src/weights/replace.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for replace
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // replace
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/
+// ../runtime/foucoco/src/weights/replace.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,185 +38,191 @@ use core::marker::PhantomData;
 /// Weights for replace using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> replace::WeightInfo for SubstrateWeight<T> {
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Nomination Vaults (r:1 w:0)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: Replace ReplaceMinimumTransferAmount (r:1 w:0)
-	/// Proof: Replace ReplaceMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Fee ReplaceGriefingCollateral (r:1 w:0)
-	/// Proof Skipped: Fee ReplaceGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::Vaults` (r:1 w:0)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `Replace::ReplaceMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Replace::ReplaceMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::ReplaceGriefingCollateral` (r:1 w:0)
+	/// Proof: `Fee::ReplaceGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn request_replace() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1394`
-		//  Estimated: `4859`
-		// Minimum execution time: 71_000_000 picoseconds.
-		Weight::from_parts(73_000_000, 4859)
-			.saturating_add(T::DbWeight::get().reads(6_u64))
+		//  Measured:  `1532`
+		//  Estimated: `7734`
+		// Minimum execution time: 58_000_000 picoseconds.
+		Weight::from_parts(59_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn withdraw_replace() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `617`
 		//  Estimated: `4082`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(29_000_000, 4082)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 4082)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:2 w:2)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Replace ReplaceMinimumTransferAmount (r:1 w:0)
-	/// Proof: Replace ReplaceMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Security Nonce (r:1 w:1)
-	/// Proof Skipped: Security Nonce (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Replace ReplacePeriod (r:1 w:0)
-	/// Proof: Replace ReplacePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Replace ReplaceRequests (r:0 w:1)
-	/// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(431), added: 2906, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::Vaults` (r:2 w:2)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Replace::ReplaceMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Replace::ReplaceMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Security::Nonce` (r:1 w:1)
+	/// Proof: `Security::Nonce` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::ParentHash` (r:1 w:0)
+	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Replace::ReplacePeriod` (r:1 w:0)
+	/// Proof: `Replace::ReplacePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Replace::ReplaceRequests` (r:0 w:1)
+	/// Proof: `Replace::ReplaceRequests` (`max_values`: None, `max_size`: Some(431), added: 2906, mode: `MaxEncodedLen`)
 	fn accept_replace() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3686`
-		//  Estimated: `9626`
-		// Minimum execution time: 238_000_000 picoseconds.
-		Weight::from_parts(251_000_000, 9626)
-			.saturating_add(T::DbWeight::get().reads(27_u64))
+		//  Measured:  `3688`
+		//  Estimated: `9628`
+		// Minimum execution time: 195_000_000 picoseconds.
+		Weight::from_parts(199_000_000, 9628)
+			.saturating_add(T::DbWeight::get().reads(29_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
-	/// Storage: Replace ReplaceRequests (r:1 w:1)
-	/// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(431), added: 2906, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:1 w:0)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Validators (r:1 w:0)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:0)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:2 w:2)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Replace::ReplaceRequests` (r:1 w:1)
+	/// Proof: `Replace::ReplaceRequests` (`max_values`: None, `max_size`: Some(431), added: 2906, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:1 w:0)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Validators` (r:1 w:0)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:0)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:2 w:2)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn execute_replace() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1935`
 		//  Estimated: `71867`
-		// Minimum execution time: 8_210_000_000 picoseconds.
-		Weight::from_parts(8_314_000_000, 71867)
+		// Minimum execution time: 7_910_000_000 picoseconds.
+		Weight::from_parts(8_096_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Replace ReplaceRequests (r:1 w:1)
-	/// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(431), added: 2906, mode: MaxEncodedLen)
-	/// Storage: Replace ReplacePeriod (r:1 w:0)
-	/// Proof: Replace ReplacePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:2 w:2)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Replace::ReplaceRequests` (r:1 w:1)
+	/// Proof: `Replace::ReplaceRequests` (`max_values`: None, `max_size`: Some(431), added: 2906, mode: `MaxEncodedLen`)
+	/// Storage: `Replace::ReplacePeriod` (r:1 w:0)
+	/// Proof: `Replace::ReplacePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:2 w:2)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn cancel_replace() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3152`
-		//  Estimated: `9092`
-		// Minimum execution time: 145_000_000 picoseconds.
-		Weight::from_parts(155_000_000, 9092)
-			.saturating_add(T::DbWeight::get().reads(20_u64))
+		//  Measured:  `3221`
+		//  Estimated: `9161`
+		// Minimum execution time: 119_000_000 picoseconds.
+		Weight::from_parts(127_000_000, 9161)
+			.saturating_add(T::DbWeight::get().reads(22_u64))
 			.saturating_add(T::DbWeight::get().writes(10_u64))
 	}
-	/// Storage: Replace ReplacePeriod (r:0 w:1)
-	/// Proof: Replace ReplacePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Replace::ReplacePeriod` (r:0 w:1)
+	/// Proof: `Replace::ReplacePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_replace_period() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Replace ReplaceMinimumTransferAmount (r:0 w:1)
-	/// Proof: Replace ReplaceMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Replace::ReplaceMinimumTransferAmount` (r:0 w:1)
+	/// Proof: `Replace::ReplaceMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn minimum_transfer_amount_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/foucoco/src/weights/stellar_relay.rs b/runtime/foucoco/src/weights/stellar_relay.rs
index fc28fb1fe..328a99329 100644
--- a/runtime/foucoco/src/weights/stellar_relay.rs
+++ b/runtime/foucoco/src/weights/stellar_relay.rs
@@ -2,21 +2,20 @@
 //! Autogenerated weights for stellar_relay
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// stellar-relay
+// stellar_relay
 // --extrinsic
 // *
 // --steps
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/
+// ../runtime/foucoco/src/weights/stellar_relay.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,22 +38,22 @@ use core::marker::PhantomData;
 /// Weights for stellar_relay using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> stellar_relay::WeightInfo for SubstrateWeight<T> {
-	/// Storage: StellarRelay Validators (r:1 w:1)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:1)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: StellarRelay OldValidators (r:0 w:1)
-	/// Proof: StellarRelay OldValidators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:0 w:1)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay OldOrganizations (r:0 w:1)
-	/// Proof: StellarRelay OldOrganizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
+	/// Storage: `StellarRelay::Validators` (r:1 w:1)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:1)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::OldValidators` (r:0 w:1)
+	/// Proof: `StellarRelay::OldValidators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:0 w:1)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::OldOrganizations` (r:0 w:1)
+	/// Proof: `StellarRelay::OldOrganizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
 	fn update_tier_1_validator_set() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2446`
 		//  Estimated: `71867`
-		// Minimum execution time: 152_000_000 picoseconds.
-		Weight::from_parts(156_000_000, 71867)
+		// Minimum execution time: 117_000_000 picoseconds.
+		Weight::from_parts(118_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
diff --git a/runtime/foucoco/src/weights/treasury_buyout_extension.rs b/runtime/foucoco/src/weights/treasury_buyout_extension.rs
index 7034c7bc3..4eb429dd8 100644
--- a/runtime/foucoco/src/weights/treasury_buyout_extension.rs
+++ b/runtime/foucoco/src/weights/treasury_buyout_extension.rs
@@ -2,21 +2,20 @@
 //! Autogenerated weights for treasury_buyout_extension
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-05-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// treasury-buyout-extension
+// treasury_buyout_extension
 // --extrinsic
 // *
 // --steps
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/
+// ../runtime/foucoco/src/weights/treasury_buyout_extension.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -38,51 +37,51 @@ use core::marker::PhantomData;
 
 /// Weights for treasury_buyout_extension using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> treasury_buyout_extension::default_weights::WeightInfo for SubstrateWeight<T> {
-	/// Storage: TreasuryBuyoutExtension AllowedCurrencies (r:1 w:0)
-	/// Proof: TreasuryBuyoutExtension AllowedCurrencies (max_values: None, max_size: Some(62), added: 2537, mode: MaxEncodedLen)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: DiaOracleModule CoinInfosMap (r:1 w:0)
-	/// Proof Skipped: DiaOracleModule CoinInfosMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TreasuryBuyoutExtension BuyoutLimit (r:1 w:0)
-	/// Proof: TreasuryBuyoutExtension BuyoutLimit (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: TreasuryBuyoutExtension Buyouts (r:1 w:1)
-	/// Proof: TreasuryBuyoutExtension Buyouts (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+impl<T: frame_system::Config> treasury_buyout_extension::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `TreasuryBuyoutExtension::AllowedCurrencies` (r:1 w:0)
+	/// Proof: `TreasuryBuyoutExtension::AllowedCurrencies` (`max_values`: None, `max_size`: Some(62), added: 2537, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `DiaOracleModule::CoinInfosMap` (r:1 w:0)
+	/// Proof: `DiaOracleModule::CoinInfosMap` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `TreasuryBuyoutExtension::BuyoutLimit` (r:1 w:0)
+	/// Proof: `TreasuryBuyoutExtension::BuyoutLimit` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `TreasuryBuyoutExtension::Buyouts` (r:1 w:1)
+	/// Proof: `TreasuryBuyoutExtension::Buyouts` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn buyout() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1214`
-		//  Estimated: `7154`
-		// Minimum execution time: 115_000_000 picoseconds.
-		Weight::from_parts(117_000_000, 7154)
+		//  Estimated: `7734`
+		// Minimum execution time: 89_000_000 picoseconds.
+		Weight::from_parts(90_000_000, 7734)
 			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
-	/// Storage: TreasuryBuyoutExtension BuyoutLimit (r:0 w:1)
-	/// Proof: TreasuryBuyoutExtension BuyoutLimit (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `TreasuryBuyoutExtension::BuyoutLimit` (r:0 w:1)
+	/// Proof: `TreasuryBuyoutExtension::BuyoutLimit` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn update_buyout_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TreasuryBuyoutExtension AllowedCurrencies (r:1 w:1)
-	/// Proof: TreasuryBuyoutExtension AllowedCurrencies (max_values: None, max_size: Some(62), added: 2537, mode: MaxEncodedLen)
+	/// Storage: `TreasuryBuyoutExtension::AllowedCurrencies` (r:1 w:1)
+	/// Proof: `TreasuryBuyoutExtension::AllowedCurrencies` (`max_values`: None, `max_size`: Some(62), added: 2537, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 20]`.
 	fn update_allowed_assets(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3527`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(14_644_586, 3527)
-			// Standard Error: 8_919
-			.saturating_add(Weight::from_parts(1_324_292, 0).saturating_mul(n.into()))
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(11_476_948, 3527)
+			// Standard Error: 2_782
+			.saturating_add(Weight::from_parts(969_566, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/foucoco/src/weights/vault_registry.rs b/runtime/foucoco/src/weights/vault_registry.rs
index 761957680..a050f2a6d 100644
--- a/runtime/foucoco/src/weights/vault_registry.rs
+++ b/runtime/foucoco/src/weights/vault_registry.rs
@@ -2,21 +2,20 @@
 //! Autogenerated weights for vault_registry
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("foucoco"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // foucoco
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// vault-registry
+// vault_registry
 // --extrinsic
 // *
 // --steps
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/foucoco/src/weights/
+// ../runtime/foucoco/src/weights/vault_registry.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,343 +38,349 @@ use core::marker::PhantomData;
 /// Weights for vault_registry using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> vault_registry::WeightInfo for SubstrateWeight<T> {
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry LiquidationCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry LiquidationCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry MinimumCollateralVault (r:1 w:0)
-	/// Proof Skipped: VaultRegistry MinimumCollateralVault (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry VaultStellarPublicKey (r:1 w:0)
-	/// Proof Skipped: VaultRegistry VaultStellarPublicKey (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::LiquidationCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::LiquidationCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::MinimumCollateralVault` (r:1 w:0)
+	/// Proof: `VaultRegistry::MinimumCollateralVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::VaultStellarPublicKey` (r:1 w:0)
+	/// Proof: `VaultRegistry::VaultStellarPublicKey` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
 	fn register_vault() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1703`
-		//  Estimated: `5168`
-		// Minimum execution time: 151_000_000 picoseconds.
-		Weight::from_parts(154_000_000, 5168)
+		//  Measured:  `1435`
+		//  Estimated: `4900`
+		// Minimum execution time: 120_000_000 picoseconds.
+		Weight::from_parts(121_000_000, 4900)
 			.saturating_add(T::DbWeight::get().reads(24_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
 	fn deposit_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2915`
-		//  Estimated: `6380`
-		// Minimum execution time: 176_000_000 picoseconds.
-		Weight::from_parts(179_000_000, 6380)
-			.saturating_add(T::DbWeight::get().reads(21_u64))
+		//  Measured:  `2919`
+		//  Estimated: `7734`
+		// Minimum execution time: 145_000_000 picoseconds.
+		Weight::from_parts(148_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
 	fn withdraw_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2889`
-		//  Estimated: `6354`
-		// Minimum execution time: 187_000_000 picoseconds.
-		Weight::from_parts(191_000_000, 6354)
-			.saturating_add(T::DbWeight::get().reads(21_u64))
+		//  Measured:  `2893`
+		//  Estimated: `7734`
+		// Minimum execution time: 151_000_000 picoseconds.
+		Weight::from_parts(153_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: VaultRegistry VaultStellarPublicKey (r:1 w:1)
-	/// Proof Skipped: VaultRegistry VaultStellarPublicKey (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::VaultStellarPublicKey` (r:1 w:1)
+	/// Proof: `VaultRegistry::VaultStellarPublicKey` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_public_key() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `301`
 		//  Estimated: `3766`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 3766)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 3766)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn accept_new_issues() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1451`
 		//  Estimated: `4916`
-		// Minimum execution time: 60_000_000 picoseconds.
-		Weight::from_parts(61_000_000, 4916)
+		// Minimum execution time: 46_000_000 picoseconds.
+		Weight::from_parts(47_000_000, 4916)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_custom_secure_threshold() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `783`
-		//  Estimated: `4248`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 4248)
+		//  Measured:  `716`
+		//  Estimated: `4181`
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 4181)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry MinimumCollateralVault (r:0 w:1)
-	/// Proof Skipped: VaultRegistry MinimumCollateralVault (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::MinimumCollateralVault` (r:0 w:1)
+	/// Proof: `VaultRegistry::MinimumCollateralVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_minimum_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:0 w:1)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:0 w:1)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_system_collateral_ceiling() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:0 w:1)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:0 w:1)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_secure_collateral_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `80`
 		//  Estimated: `1565`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 1565)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 1565)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:0 w:1)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:0 w:1)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_premium_redeem_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry LiquidationCollateralThreshold (r:0 w:1)
-	/// Proof Skipped: VaultRegistry LiquidationCollateralThreshold (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::LiquidationCollateralThreshold` (r:0 w:1)
+	/// Proof: `VaultRegistry::LiquidationCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_liquidation_collateral_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry LiquidationCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry LiquidationCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry LiquidationVault (r:1 w:1)
-	/// Proof Skipped: VaultRegistry LiquidationVault (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::LiquidationCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::LiquidationCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::LiquidationVault` (r:1 w:1)
+	/// Proof: `VaultRegistry::LiquidationVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn report_undercollateralized_vault() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3018`
-		//  Estimated: `6483`
-		// Minimum execution time: 327_000_000 picoseconds.
-		Weight::from_parts(336_000_000, 6483)
-			.saturating_add(T::DbWeight::get().reads(25_u64))
+		//  Measured:  `3022`
+		//  Estimated: `7734`
+		// Minimum execution time: 256_000_000 picoseconds.
+		Weight::from_parts(259_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(27_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn recover_vault_id() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `616`
 		//  Estimated: `4081`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 4081)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 4081)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry PunishmentDelay (r:0 w:1)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::PunishmentDelay` (r:0 w:1)
+	/// Proof: `VaultRegistry::PunishmentDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_punishment_delay() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/foucoco/src/xcm_config.rs b/runtime/foucoco/src/xcm_config.rs
index 186faef95..1a82d7794 100644
--- a/runtime/foucoco/src/xcm_config.rs
+++ b/runtime/foucoco/src/xcm_config.rs
@@ -2,9 +2,10 @@ use core::marker::PhantomData;
 
 use cumulus_primitives_utility::XcmFeesTo32ByteAccount;
 use frame_support::{
-	log, match_types, parameter_types,
+	match_types, parameter_types,
 	traits::{ConstU32, ContainsPair, Everything, Nothing, ProcessMessageError},
 };
+use log;
 use orml_asset_registry::{AssetRegistryTrader, FixedRateAssetRegistryTrader};
 use orml_traits::{
 	location::{RelativeReserveProvider, Reserve},
@@ -22,7 +23,10 @@ use xcm_builder::{
 	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 };
-use xcm_executor::{traits::ShouldExecute, XcmExecutor};
+use xcm_executor::{
+	traits::{Properties, ShouldExecute},
+	XcmExecutor,
+};
 
 use super::{
 	AccountId, AssetRegistry, Balance, Balances, Currencies, CurrencyId, FoucocoTreasuryAccount,
@@ -128,8 +132,8 @@ where
 	fn should_execute<RuntimeCall>(
 		origin: &MultiLocation,
 		instructions: &mut [Instruction<RuntimeCall>],
-		max_weight: XCMWeight,
-		weight_credit: &mut XCMWeight,
+		max_weight: Weight,
+		weight_credit: &mut Properties,
 	) -> Result<(), ProcessMessageError> {
 		Deny::should_execute(origin, instructions, max_weight, weight_credit)?;
 		Allow::should_execute(origin, instructions, max_weight, weight_credit)
@@ -142,8 +146,8 @@ impl ShouldExecute for DenyReserveTransferToRelayChain {
 	fn should_execute<RuntimeCall>(
 		origin: &MultiLocation,
 		instructions: &mut [Instruction<RuntimeCall>],
-		_max_weight: XCMWeight,
-		_weight_credit: &mut XCMWeight,
+		_max_weight: Weight,
+		_weight_credit: &mut Properties,
 	) -> Result<(), ProcessMessageError> {
 		if instructions.iter().any(|inst| {
 			matches!(
@@ -225,6 +229,7 @@ impl xcm_executor::Config for XcmConfig {
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
 	type SafeCallFilter = Everything;
+	type Aliasers = ();
 }
 
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.
@@ -264,10 +269,12 @@ impl pallet_xcm::Config for Runtime {
 	type TrustedLockers = ();
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
-	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::pallet_xcm::SubstrateWeight<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
 	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 }
 
 #[cfg(feature = "runtime-benchmarks")]
diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml
index c86aeef00..1662350a0 100644
--- a/runtime/integration-tests/Cargo.toml
+++ b/runtime/integration-tests/Cargo.toml
@@ -12,52 +12,67 @@ serde = { version = "1.0.144", features = ["derive"] }
 paste = "1.0.14"
 
 # Spacewalk libraries
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # for events
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-debug-derive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # for events
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
+xcm = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm",  branch = "release-polkadot-v1.1.0" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm-executor", branch = "release-polkadot-v1.1.0" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm-builder", branch = "release-polkadot-v1.1.0" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot-sdk", package = "polkadot-parachain-primitives", branch = "release-polkadot-v1.1.0" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
-xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "d011e5ca62b93e8f688c2042c1f92cdbafc5d1d0" }
+xcm-emulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+integration-tests-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
+pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+#staging-parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+parachain-staking = { path = "../../pallets/parachain-staking"}
+pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
 
-statemint-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
+asset-hub-polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+asset-hub-kusama-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
-orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.42" }
-orml-xcm = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.42" }
-orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.42" }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.42" }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.42" }
-orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42" }
+kusama-runtime = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-kusama-runtime",  branch = "release-polkadot-v1.1.0" }
+
+orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0" }
+orml-xcm = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0" }
+orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0" }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0" }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0" }
+orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0" }
+
+pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
 # Local
-runtime-common = { path = "../common", default-features = false }
+runtime-common = { path = "../common" , default-features = false }
 
 pendulum-runtime = { path = "../pendulum" }
 amplitude-runtime = { path = "../amplitude" }
diff --git a/runtime/integration-tests/src/amplitude_tests.rs b/runtime/integration-tests/src/amplitude_tests.rs
index b9cb36440..c40d5af5d 100644
--- a/runtime/integration-tests/src/amplitude_tests.rs
+++ b/runtime/integration-tests/src/amplitude_tests.rs
@@ -1,5 +1,5 @@
 use crate::{
-	mock::{kusama_relay_ext, para_ext, ParachainType, USDT_ASSET_ID},
+	mock::{assets_metadata_for_registry_amplitude, USDT_ASSET_ID},
 	sibling,
 	test_macros::{
 		parachain1_transfer_asset_to_parachain2, parachain1_transfer_asset_to_parachain2_and_back,
@@ -11,73 +11,120 @@ use crate::{
 	AMPLITUDE_ID, ASSETHUB_ID, SIBLING_ID,
 };
 
+use asset_hub_kusama_runtime;
 use frame_support::assert_ok;
-use statemine_runtime as kusama_asset_hub_runtime;
+use integration_tests_common::constants::{asset_hub_kusama, kusama};
+
+use crate::genesis::{genesis_gen, genesis_sibling};
+use frame_support::traits::OnInitialize;
 use xcm::latest::NetworkId;
-use xcm_emulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt};
+use xcm_emulator::{
+	decl_test_networks, decl_test_parachains, decl_test_relay_chains, DefaultMessageProcessor,
+};
 
 // Native fee expected for each token according to the `fee_per_second` values defined in the mock
 const NATIVE_FEE_WHEN_TRANSFER_TO_PARACHAIN: polkadot_core_primitives::Balance = 4000000000;
+const BASE_FEE_WHEN_TRANSFER_NON_NATIVE_ASSET: polkadot_core_primitives::Balance = 5000000000;
 const KSM_FEE_WHEN_TRANSFER_TO_PARACHAIN: polkadot_core_primitives::Balance =
-	NATIVE_FEE_WHEN_TRANSFER_TO_PARACHAIN / 20;
+	BASE_FEE_WHEN_TRANSFER_NON_NATIVE_ASSET / 20;
 const USDT_FEE_WHEN_TRANSFER_TO_PARACHAIN: polkadot_core_primitives::Balance =
-	NATIVE_FEE_WHEN_TRANSFER_TO_PARACHAIN / 10;
+	BASE_FEE_WHEN_TRANSFER_NON_NATIVE_ASSET / 10;
 
-decl_test_relay_chain! {
-	pub struct KusamaRelay {
-		Runtime = kusama_runtime::Runtime,
-		XcmConfig = kusama_runtime::xcm_config::XcmConfig,
-		new_ext = kusama_relay_ext(),
-	}
+decl_test_relay_chains! {
+	#[api_version(5)]
+	pub struct Kusama {
+		genesis = kusama::genesis(),
+		on_init = (),
+		runtime = kusama_runtime,
+		core = {
+			MessageProcessor: DefaultMessageProcessor<Kusama>,
+			SovereignAccountOf: kusama_runtime::xcm_config::SovereignAccountOf,
+		},
+		pallets = {
+			XcmPallet: kusama_runtime::XcmPallet,
+			Balances: kusama_runtime::Balances,
+			Hrmp: kusama_runtime::Hrmp,
+		}
+	},
 }
 
-decl_test_parachain! {
+decl_test_parachains! {
+	pub struct AssetHubKusama {
+		genesis = asset_hub_kusama::genesis(),
+		on_init = {
+			asset_hub_kusama_runtime::AuraExt::on_initialize(1);
+		},
+		runtime = asset_hub_kusama_runtime,
+		core = {
+			XcmpMessageHandler: asset_hub_kusama_runtime::XcmpQueue,
+			DmpMessageHandler: asset_hub_kusama_runtime::DmpQueue,
+			LocationToAccountId: asset_hub_kusama_runtime::xcm_config::LocationToAccountId,
+			ParachainInfo: asset_hub_kusama_runtime::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: asset_hub_kusama_runtime::PolkadotXcm,
+			Assets: asset_hub_kusama_runtime::Assets,
+			Balances: asset_hub_kusama_runtime::Balances,
+		}
+	},
 	pub struct AmplitudeParachain {
-		Runtime = amplitude_runtime::Runtime,
-		RuntimeOrigin = amplitude_runtime::RuntimeOrigin,
-		XcmpMessageHandler = amplitude_runtime::XcmpQueue,
-		DmpMessageHandler = amplitude_runtime::DmpQueue,
-		new_ext = para_ext(ParachainType::Amplitude),
-	}
-}
-
-decl_test_parachain! {
-	pub struct SiblingParachain {
-		Runtime = sibling::Runtime,
-		RuntimeOrigin = sibling::RuntimeOrigin,
-		XcmpMessageHandler = sibling::XcmpQueue,
-		DmpMessageHandler = sibling::DmpQueue,
-		new_ext = para_ext(ParachainType::Sibling),
-	}
-}
-
-decl_test_parachain! {
-	pub struct AssetHubParachain {
-		Runtime = kusama_asset_hub_runtime::Runtime,
-		RuntimeOrigin = kusama_asset_hub_runtime::RuntimeOrigin,
-		XcmpMessageHandler = kusama_asset_hub_runtime::XcmpQueue,
-		DmpMessageHandler = kusama_asset_hub_runtime::DmpQueue,
-		new_ext = para_ext(ParachainType::KusamaAssetHub),
-	}
+		genesis = genesis_gen!(amplitude_runtime, AMPLITUDE_ID, assets_metadata_for_registry_amplitude),
+		on_init = {
+			amplitude_runtime::AuraExt::on_initialize(1);
+		},
+		runtime = amplitude_runtime,
+		core = {
+			XcmpMessageHandler: amplitude_runtime::XcmpQueue,
+			DmpMessageHandler: amplitude_runtime::DmpQueue,
+			LocationToAccountId: amplitude_runtime::xcm_config::LocationToAccountId,
+			ParachainInfo: amplitude_runtime::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: amplitude_runtime::PolkadotXcm,
+			Tokens: amplitude_runtime::Tokens,
+			Balances: amplitude_runtime::Balances,
+			AssetRegistry: amplitude_runtime::AssetRegistry,
+			XTokens: amplitude_runtime::XTokens,
+		}
+	},
+	pub struct SiblingParachainAmplitude {
+		genesis = genesis_sibling(SIBLING_ID),
+		on_init = {
+			sibling::AuraExt::on_initialize(1);
+		},
+		runtime = sibling,
+		core = {
+			XcmpMessageHandler: sibling::XcmpQueue,
+			DmpMessageHandler: sibling::DmpQueue,
+			LocationToAccountId: sibling::LocationToAccountId,
+			ParachainInfo: sibling::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: sibling::PolkadotXcm,
+			Tokens: sibling::Tokens,
+			Balances: sibling::Balances,
+			XTokens: sibling::XTokens,
+		}
+	},
 }
 
-decl_test_network! {
+decl_test_networks! {
 	pub struct KusamaMockNet {
-		relay_chain = KusamaRelay,
+		relay_chain = Kusama,
 		parachains = vec![
-			(1000, AssetHubParachain),
-			(2124, AmplitudeParachain),
-			(9999, SiblingParachain),
+			AssetHubKusama,
+			AmplitudeParachain,
+			SiblingParachainAmplitude,
 		],
-	}
+		bridge = ()
+	},
 }
-
 #[test]
 fn transfer_ksm_from_kusama_to_amplitude() {
 	transfer_20_relay_token_from_relay_chain_to_parachain!(
 		KusamaMockNet,
 		kusama_runtime,
-		KusamaRelay,
+		Kusama,
 		amplitude_runtime,
 		AmplitudeParachain,
 		AMPLITUDE_ID,
@@ -90,17 +137,18 @@ fn transfer_ksm_from_amplitude_to_kusama() {
 	transfer_10_relay_token_from_parachain_to_relay_chain!(
 		KusamaMockNet,
 		kusama_runtime,
-		KusamaRelay,
+		Kusama,
 		amplitude_runtime,
-		AmplitudeParachain
+		AmplitudeParachain,
+		AMPLITUDE_ID,
+		KSM_FEE_WHEN_TRANSFER_TO_PARACHAIN
 	);
 }
-
 #[test]
 fn assethub_transfer_incorrect_asset_to_amplitude_should_fail() {
 	parachain1_transfer_incorrect_asset_to_parachain2_should_fail!(
-		kusama_asset_hub_runtime,
-		AssetHubParachain,
+		asset_hub_kusama_runtime,
+		AssetHubKusama,
 		amplitude_runtime,
 		AmplitudeParachain,
 		AMPLITUDE_ID
@@ -110,8 +158,8 @@ fn assethub_transfer_incorrect_asset_to_amplitude_should_fail() {
 #[test]
 fn assethub_transfer_asset_to_amplitude() {
 	parachain1_transfer_asset_to_parachain2!(
-		kusama_asset_hub_runtime,
-		AssetHubParachain,
+		asset_hub_kusama_runtime,
+		AssetHubKusama,
 		USDT_ASSET_ID,
 		amplitude_runtime,
 		AmplitudeParachain,
@@ -125,8 +173,8 @@ fn assethub_transfer_asset_to_amplitude_and_back() {
 	let network_id = NetworkId::Kusama;
 
 	parachain1_transfer_asset_to_parachain2_and_back!(
-		kusama_asset_hub_runtime,
-		AssetHubParachain,
+		asset_hub_kusama_runtime,
+		AssetHubKusama,
 		ASSETHUB_ID,
 		USDT_ASSET_ID,
 		amplitude_runtime,
@@ -144,7 +192,7 @@ fn transfer_native_token_from_amplitude_to_sibling_parachain_and_back() {
 		amplitude_runtime,
 		AmplitudeParachain,
 		sibling,
-		SiblingParachain,
+		SiblingParachainAmplitude,
 		AMPLITUDE_ID,
 		SIBLING_ID,
 		NATIVE_FEE_WHEN_TRANSFER_TO_PARACHAIN
diff --git a/runtime/integration-tests/src/genesis.rs b/runtime/integration-tests/src/genesis.rs
new file mode 100644
index 000000000..84abb30a3
--- /dev/null
+++ b/runtime/integration-tests/src/genesis.rs
@@ -0,0 +1,129 @@
+use crate::*;
+// Substrate
+use sp_core::storage::Storage;
+pub const SAFE_XCM_VERSION: u32 = 3;
+// Cumulus
+use integration_tests_common::constants::{accounts, collators};
+
+use crate::mock::units;
+
+#[macro_export]
+macro_rules! genesis_gen {
+	($runtime:ident, $para_account_id: ident, $asset_metadata: ident) => {{
+		use crate::mock::units;
+		use integration_tests_common::constants::{accounts, collators};
+		use spacewalk_primitives::CurrencyId;
+		use $runtime::BuildStorage;
+		use crate::genesis::SAFE_XCM_VERSION;
+
+		let token_balances = accounts::init_balances()
+			.iter()
+			.flat_map(|k| vec![(k.clone(), CurrencyId::XCM(0), units(1000))])
+			.collect();
+
+		let stakers: Vec<_> = accounts::init_balances()
+			.iter()
+			.cloned()
+			.map(|account_id| (account_id, None, units(10_000_000)))
+			.collect();
+
+		let genesis_config = $runtime::RuntimeGenesisConfig {
+			system: $runtime::SystemConfig {
+				code: $runtime::WASM_BINARY
+					.expect("WASM binary was not build, please build it!")
+					.to_vec(),
+				..Default::default()
+			},
+			balances: $runtime::BalancesConfig {
+				balances: accounts::init_balances()
+					.iter()
+					.cloned()
+					.map(|k| (k, units(10_001_000)))
+					.collect(),
+			},
+			tokens: $runtime::TokensConfig { balances: token_balances },
+			parachain_info: $runtime::ParachainInfoConfig {
+				parachain_id: $para_account_id.into(),
+				..Default::default()
+			},
+			session: $runtime::SessionConfig {
+				keys: collators::invulnerables()
+					.into_iter()
+					.map(|(acc, aura)| {
+						(
+							acc.clone(),                    // account id
+							acc,                            // validator id
+							$runtime::SessionKeys { aura }, // session keys
+						)
+					})
+					.collect(),
+			},
+			polkadot_xcm: $runtime::PolkadotXcmConfig {
+				safe_xcm_version: Some(SAFE_XCM_VERSION),
+				..Default::default()
+			},
+			asset_registry: $runtime::AssetRegistryConfig {
+				assets: $asset_metadata(),
+				last_asset_id: CurrencyId::Native,
+			},
+			parachain_staking: $runtime::ParachainStakingConfig {
+				stakers,
+				inflation_config: Default::default(),
+				max_candidate_stake: units(100_000_000_000),
+				max_selected_candidates: 40,
+			},
+			..Default::default()
+		};
+
+		genesis_config.build_storage().unwrap()
+	}};
+}
+
+pub fn genesis_sibling(para_id: u32) -> Storage {
+	use sibling::BuildStorage;
+	use crate::genesis::SAFE_XCM_VERSION;
+
+	let token_balances = accounts::init_balances()
+		.iter()
+		.flat_map(|k| vec![(k.clone(), sibling::CurrencyId::XCM(0), units(100))])
+		.collect();
+
+	let genesis_config = sibling::RuntimeGenesisConfig {
+		system: sibling::SystemConfig {
+			code: pendulum_runtime::WASM_BINARY
+				.expect("WASM binary was not build, please build it!")
+				.to_vec(),
+			..Default::default()
+		},
+		balances: sibling::BalancesConfig {
+			balances: accounts::init_balances().iter().cloned().map(|k| (k, units(100))).collect(),
+		},
+		tokens: sibling::TokensConfig { balances: token_balances },
+		parachain_info: sibling::ParachainInfoConfig {
+			parachain_id: para_id.into(),
+			..Default::default()
+		},
+		session: sibling::SessionConfig {
+			keys: collators::invulnerables()
+				.into_iter()
+				.map(|(acc, aura)| {
+					(
+						acc.clone(),                   // account id
+						acc,                           // validator id
+						sibling::SessionKeys { aura }, // session keys
+					)
+				})
+				.collect(),
+		},
+		polkadot_xcm: sibling::PolkadotXcmConfig {
+			safe_xcm_version: Some(SAFE_XCM_VERSION),
+			..Default::default()
+		},
+
+		..Default::default()
+	};
+
+	genesis_config.build_storage().unwrap()
+}
+
+pub(super) use crate::genesis_gen;
diff --git a/runtime/integration-tests/src/lib.rs b/runtime/integration-tests/src/lib.rs
index 39c762950..5f4b82297 100644
--- a/runtime/integration-tests/src/lib.rs
+++ b/runtime/integration-tests/src/lib.rs
@@ -16,6 +16,9 @@ mod sibling;
 #[cfg(test)]
 mod definitions;
 
+#[cfg(test)]
+mod genesis;
+
 pub const PENDULUM_ID: u32 = 2094;
 pub const AMPLITUDE_ID: u32 = 2124;
 pub const ASSETHUB_ID: u32 = 1000;
diff --git a/runtime/integration-tests/src/mock.rs b/runtime/integration-tests/src/mock.rs
index ac29012b2..a9d973e06 100644
--- a/runtime/integration-tests/src/mock.rs
+++ b/runtime/integration-tests/src/mock.rs
@@ -1,230 +1,29 @@
-use crate::{definitions::asset_hub, sibling, AMPLITUDE_ID, ASSETHUB_ID, PENDULUM_ID, SIBLING_ID};
+use crate::definitions::asset_hub;
 use amplitude_runtime::CurrencyId as AmplitudeCurrencyId;
-use frame_support::traits::GenesisBuild;
-use pendulum_runtime::CurrencyId as PendulumCurrencyId;
-use polkadot_core_primitives::{AccountId, Balance, BlockNumber};
-use polkadot_parachain::primitives::Id as ParaId;
-use polkadot_primitives::v4::{MAX_CODE_SIZE, MAX_POV_SIZE};
-use polkadot_runtime_parachains::configuration::HostConfiguration;
-use sibling::CurrencyId as SiblingCurrencyId;
-use sp_io::TestExternalities;
-use sp_runtime::traits::AccountIdConversion;
-use xcm_emulator::Weight;
-
 use codec::Encode;
 use frame_support::BoundedVec;
+use pendulum_runtime::{definitions::moonbeam, CurrencyId as PendulumCurrencyId};
+use polkadot_core_primitives::Balance;
 use runtime_common::asset_registry::{CustomMetadata, DiaKeys, StringLimit};
-
 use xcm::{v3::MultiLocation, VersionedMultiLocation};
 
-use pendulum_runtime::definitions::{moonbeam, moonbeam::PARA_ID as MOONBEAM_PARA_ID};
-use statemine_runtime as kusama_asset_hub_runtime;
-use statemint_runtime as polkadot_asset_hub_runtime;
-
-pub const ALICE: [u8; 32] = [4u8; 32];
-pub const BOB: [u8; 32] = [5u8; 32];
-
 pub const UNIT: Balance = 1_000_000_000_000;
 pub const TEN_UNITS: Balance = 10_000_000_000_000;
 
 pub const USDT_ASSET_ID: u32 = 1984; //Real USDT Asset ID of both Polkadot's and Kusama's Asset Hub
 pub const INCORRECT_ASSET_ID: u32 = 0; //asset id that pendulum/amplitude does NOT SUPPORT
 
-pub const NATIVE_INITIAL_BALANCE: Balance = TEN_UNITS;
-pub const ORML_INITIAL_BALANCE: Balance = TEN_UNITS;
-
-macro_rules! create_test_externalities {
-	($runtime:ty, $system:ident, $storage:ident) => {{
-		<pallet_xcm::GenesisConfig as GenesisBuild<$runtime>>::assimilate_storage(
-			&pallet_xcm::GenesisConfig { safe_xcm_version: Some(2) },
-			&mut $storage,
-		)
-		.unwrap();
-		let mut ext = sp_io::TestExternalities::new($storage);
-		ext.execute_with(|| $system::set_block_number(1));
-		ext
-	}};
-}
-
-macro_rules! build_relaychain {
-	($runtime:ty, $system:tt, $para_account_id: ident) => {{
-		let mut t = frame_system::GenesisConfig::default().build_storage::<$runtime>().unwrap();
-		pallet_balances::GenesisConfig::<$runtime> {
-			balances: vec![
-				(AccountId::from(ALICE), units(100000)),
-				(AccountId::from(BOB), units(100)),
-				(para_account_id($para_account_id), 10 * units(100000)),
-			],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-		polkadot_runtime_parachains::configuration::GenesisConfig::<$runtime> {
-			config: default_parachains_host_configuration(),
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		create_test_externalities!($runtime, $system, t)
-	}};
-}
-
-macro_rules! build_parachain_with_orml {
-	($self:ident, $runtime:ty, $system:tt, $balance:tt, $orml_balance:tt, $currency_id_type:ty) => {{
-		let mut t = frame_system::GenesisConfig::default().build_storage::<$runtime>().unwrap();
-		pallet_balances::GenesisConfig::<$runtime> {
-			balances: vec![(AccountId::from(ALICE), $balance), (AccountId::from(BOB), $balance)],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		type CurrencyId = $currency_id_type;
-		orml_tokens::GenesisConfig::<$runtime> {
-			balances: vec![
-				(AccountId::from(BOB), CurrencyId::XCM(0), units($orml_balance)),
-				(AccountId::from(ALICE), CurrencyId::XCM(0), units($orml_balance)),
-			],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		build_parachain!($self, $runtime, $system, t)
-	}};
-}
-
-macro_rules! build_parachain_with_orml_and_asset_registry {
-	($self:ident, $runtime:ty, $system:tt, $balance:tt, $orml_balance:tt, $currency_id_type:ty, $registry_assets:tt) => {{
-		let mut t = frame_system::GenesisConfig::default().build_storage::<$runtime>().unwrap();
-		pallet_balances::GenesisConfig::<$runtime> {
-			balances: vec![(AccountId::from(ALICE), $balance), (AccountId::from(BOB), $balance)],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		type CurrencyId = $currency_id_type;
-		orml_tokens::GenesisConfig::<$runtime> {
-			balances: vec![
-				(AccountId::from(BOB), CurrencyId::XCM(0), units($orml_balance)),
-				(AccountId::from(ALICE), CurrencyId::XCM(0), units($orml_balance)),
-			],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		orml_asset_registry::GenesisConfig::<$runtime> {
-			assets: $registry_assets,
-			last_asset_id: CurrencyId::Native,
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		build_parachain!($self, $runtime, $system, t)
-	}};
-}
-
-macro_rules! build_parachain {
-	($self:ident, $runtime:ty, $system:tt) => {{
-		let mut t = frame_system::GenesisConfig::default().build_storage::<$runtime>().unwrap();
-
-		pallet_balances::GenesisConfig::<$runtime> { balances: vec![] }
-			.assimilate_storage(&mut t)
-			.unwrap();
-
-		build_parachain!($self, $runtime, $system, t)
-	}};
-
-	($self:ident, $runtime:ty, $system:tt, $storage:ident) => {{
-		<parachain_info::GenesisConfig as GenesisBuild<$runtime>>::assimilate_storage(
-			&parachain_info::GenesisConfig { parachain_id: $self.get_parachain_id().into() },
-			&mut $storage,
-		)
-		.unwrap();
-
-		create_test_externalities!($runtime, $system, $storage)
-	}};
-}
-
-pub trait Builder<Currency> {
-	fn balances(self, balances: Vec<(AccountId, Currency, Balance)>) -> Self;
-	fn build(self) -> TestExternalities;
-}
-
-pub enum ParachainType {
-	PolkadotAssetHub,
-	KusamaAssetHub,
-	Pendulum,
-	Amplitude,
-	Sibling,
-	Moonbeam,
-}
-
-pub struct ExtBuilderParachain<Currency> {
-	balances: Vec<(AccountId, Currency, Balance)>,
-	chain: ParachainType,
-}
-
 pub fn units(amount: Balance) -> Balance {
 	amount * 10u128.saturating_pow(9)
 }
-
-pub fn para_account_id(id: u32) -> polkadot_core_primitives::AccountId {
-	ParaId::from(id).into_account_truncating()
-}
-
-pub fn polkadot_relay_ext() -> sp_io::TestExternalities {
-	use polkadot_runtime::{Runtime, System};
-	build_relaychain!(Runtime, System, PENDULUM_ID)
-}
-
-pub fn kusama_relay_ext() -> sp_io::TestExternalities {
-	use kusama_runtime::{Runtime, System};
-	build_relaychain!(Runtime, System, AMPLITUDE_ID)
-}
-
-fn default_parachains_host_configuration() -> HostConfiguration<BlockNumber> {
-	HostConfiguration {
-		minimum_validation_upgrade_delay: 5,
-		validation_upgrade_cooldown: 5u32,
-		validation_upgrade_delay: 5,
-		code_retention_period: 1200,
-		max_code_size: MAX_CODE_SIZE,
-		max_pov_size: MAX_POV_SIZE,
-		max_head_data_size: 32 * 1024,
-		group_rotation_frequency: 20,
-		chain_availability_period: 4,
-		thread_availability_period: 4,
-		max_upward_queue_count: 8,
-		max_upward_queue_size: 1024 * 1024,
-		max_downward_message_size: 1024,
-		ump_service_total_weight: Weight::from_parts(4 * 1_000_000_000, 0),
-		max_upward_message_size: 50 * 1024,
-		max_upward_message_num_per_candidate: 5,
-		hrmp_sender_deposit: 0,
-		hrmp_recipient_deposit: 0,
-		hrmp_channel_max_capacity: 8,
-		hrmp_channel_max_total_size: 8 * 1024,
-		hrmp_max_parachain_inbound_channels: 4,
-		hrmp_max_parathread_inbound_channels: 4,
-		hrmp_channel_max_message_size: 1024 * 1024,
-		hrmp_max_parachain_outbound_channels: 4,
-		hrmp_max_parathread_outbound_channels: 4,
-		hrmp_max_message_num_per_candidate: 5,
-		dispute_period: 6,
-		no_show_slots: 2,
-		n_delay_tranches: 25,
-		needed_approvals: 2,
-		relay_vrf_modulo_samples: 2,
-		zeroth_delay_tranche_width: 0,
-		..Default::default()
-	}
-}
-fn assets_metadata_for_registry_pendulum() -> Vec<(PendulumCurrencyId, Vec<u8>)> {
+pub fn assets_metadata_for_registry_pendulum() -> Vec<(PendulumCurrencyId, Vec<u8>)> {
 	vec![
 		(
 			PendulumCurrencyId::Native,
 			orml_asset_registry::AssetMetadata {
 				decimals: 12u32,
-				name: "Pendulum".as_bytes().to_vec(),
-				symbol: "PEN".as_bytes().to_vec(),
+				name: BoundedVec::<u8, StringLimit>::truncate_from("Pendulum".as_bytes().to_vec()),
+				symbol: BoundedVec::<u8, StringLimit>::truncate_from("PEN".as_bytes().to_vec()),
 				existential_deposit: 1_000u128,
 				location: Some(VersionedMultiLocation::V3(MultiLocation::new(
 					0u8,
@@ -244,8 +43,10 @@ fn assets_metadata_for_registry_pendulum() -> Vec<(PendulumCurrencyId, Vec<u8>)>
 			PendulumCurrencyId::XCM(1),
 			orml_asset_registry::AssetMetadata {
 				decimals: 12u32,
-				name: "USDT Assethub".as_bytes().to_vec(),
-				symbol: "USDT".as_bytes().to_vec(),
+				name: BoundedVec::<u8, StringLimit>::truncate_from(
+					"USDT Assethub".as_bytes().to_vec(),
+				),
+				symbol: BoundedVec::<u8, StringLimit>::truncate_from("USDT".as_bytes().to_vec()),
 				existential_deposit: 1_000u128,
 				location: Some(VersionedMultiLocation::V3(asset_hub::USDT_location())),
 				additional: CustomMetadata {
@@ -262,8 +63,8 @@ fn assets_metadata_for_registry_pendulum() -> Vec<(PendulumCurrencyId, Vec<u8>)>
 			PendulumCurrencyId::XCM(0),
 			orml_asset_registry::AssetMetadata {
 				decimals: 12u32,
-				name: "Polkadot".as_bytes().to_vec(),
-				symbol: "DOT".as_bytes().to_vec(),
+				name: BoundedVec::<u8, StringLimit>::truncate_from("Polkadot".as_bytes().to_vec()),
+				symbol: BoundedVec::<u8, StringLimit>::truncate_from("DOT".as_bytes().to_vec()),
 				existential_deposit: 1_000u128,
 				location: Some(VersionedMultiLocation::V3(MultiLocation::parent())),
 				additional: CustomMetadata {
@@ -280,8 +81,10 @@ fn assets_metadata_for_registry_pendulum() -> Vec<(PendulumCurrencyId, Vec<u8>)>
 			PendulumCurrencyId::XCM(6),
 			orml_asset_registry::AssetMetadata {
 				decimals: 12u32,
-				name: "Moonbeam BRZ".as_bytes().to_vec(),
-				symbol: "BRZ".as_bytes().to_vec(),
+				name: BoundedVec::<u8, StringLimit>::truncate_from(
+					"Moonbeam BRZ".as_bytes().to_vec(),
+				),
+				symbol: BoundedVec::<u8, StringLimit>::truncate_from("BRZ".as_bytes().to_vec()),
 				existential_deposit: 1_000u128,
 				location: Some(xcm::VersionedMultiLocation::V3(moonbeam::BRZ_location())),
 				additional: CustomMetadata {
@@ -297,14 +100,14 @@ fn assets_metadata_for_registry_pendulum() -> Vec<(PendulumCurrencyId, Vec<u8>)>
 	]
 }
 
-fn assets_metadata_for_registry_amplitude() -> Vec<(AmplitudeCurrencyId, Vec<u8>)> {
+pub fn assets_metadata_for_registry_amplitude() -> Vec<(AmplitudeCurrencyId, Vec<u8>)> {
 	vec![
 		(
 			AmplitudeCurrencyId::Native,
 			orml_asset_registry::AssetMetadata {
 				decimals: 12u32,
-				name: "Amplitude".as_bytes().to_vec(),
-				symbol: "AMPE".as_bytes().to_vec(),
+				name: BoundedVec::<u8, StringLimit>::truncate_from("Amplitude".as_bytes().to_vec()),
+				symbol: BoundedVec::<u8, StringLimit>::truncate_from("AMPE".as_bytes().to_vec()),
 				existential_deposit: 1_000u128,
 				location: Some(VersionedMultiLocation::V3(MultiLocation::new(
 					0u8,
@@ -324,8 +127,10 @@ fn assets_metadata_for_registry_amplitude() -> Vec<(AmplitudeCurrencyId, Vec<u8>
 			AmplitudeCurrencyId::XCM(1),
 			orml_asset_registry::AssetMetadata {
 				decimals: 12u32,
-				name: "USDT Assethub".as_bytes().to_vec(),
-				symbol: "USDT".as_bytes().to_vec(),
+				name: BoundedVec::<u8, StringLimit>::truncate_from(
+					"USDT Assethub".as_bytes().to_vec(),
+				),
+				symbol: BoundedVec::<u8, StringLimit>::truncate_from("USDT".as_bytes().to_vec()),
 				existential_deposit: 1_000u128,
 				location: Some(VersionedMultiLocation::V3(asset_hub::USDT_location())),
 				additional: CustomMetadata {
@@ -342,8 +147,8 @@ fn assets_metadata_for_registry_amplitude() -> Vec<(AmplitudeCurrencyId, Vec<u8>
 			AmplitudeCurrencyId::XCM(0),
 			orml_asset_registry::AssetMetadata {
 				decimals: 12u32,
-				name: "Kusama".as_bytes().to_vec(),
-				symbol: "KSM".as_bytes().to_vec(),
+				name: BoundedVec::<u8, StringLimit>::truncate_from("Kusama".as_bytes().to_vec()),
+				symbol: BoundedVec::<u8, StringLimit>::truncate_from("KSM".as_bytes().to_vec()),
 				existential_deposit: 1_000u128,
 				location: Some(VersionedMultiLocation::V3(MultiLocation::parent())),
 				additional: CustomMetadata {
@@ -358,158 +163,3 @@ fn assets_metadata_for_registry_amplitude() -> Vec<(AmplitudeCurrencyId, Vec<u8>
 		),
 	]
 }
-
-pub fn para_ext(chain: ParachainType) -> sp_io::TestExternalities {
-	match chain {
-		ParachainType::PolkadotAssetHub =>
-			ExtBuilderParachain::polkadot_asset_hub_default().balances(vec![]).build(),
-		ParachainType::KusamaAssetHub =>
-			ExtBuilderParachain::kusama_asset_hub_default().balances(vec![]).build(),
-		ParachainType::Pendulum => ExtBuilderParachain::pendulum_default().balances(vec![]).build(),
-		ParachainType::Amplitude =>
-			ExtBuilderParachain::amplitude_default().balances(vec![]).build(),
-		ParachainType::Sibling => ExtBuilderParachain::sibling_default().balances(vec![]).build(),
-		ParachainType::Moonbeam => ExtBuilderParachain::moonbeam_default().balances(vec![]).build(),
-	}
-}
-
-impl<Currency> ExtBuilderParachain<Currency> {
-	fn get_parachain_id(&self) -> u32 {
-		match self.chain {
-			ParachainType::PolkadotAssetHub => ASSETHUB_ID,
-			ParachainType::KusamaAssetHub => ASSETHUB_ID,
-			ParachainType::Pendulum => PENDULUM_ID,
-			ParachainType::Sibling => SIBLING_ID,
-			ParachainType::Amplitude => AMPLITUDE_ID,
-			ParachainType::Moonbeam => MOONBEAM_PARA_ID,
-		}
-	}
-}
-
-// ------------------- for Pendulum and Amplitude -------------------
-impl ExtBuilderParachain<PendulumCurrencyId> {
-	pub fn pendulum_default() -> Self {
-		Self { balances: vec![], chain: ParachainType::Pendulum }
-	}
-
-	pub fn amplitude_default() -> Self {
-		Self { balances: vec![], chain: ParachainType::Amplitude }
-	}
-}
-
-impl Builder<PendulumCurrencyId> for ExtBuilderParachain<PendulumCurrencyId> {
-	fn balances(mut self, balances: Vec<(AccountId, PendulumCurrencyId, Balance)>) -> Self {
-		self.balances = balances;
-		self
-	}
-
-	fn build(self) -> TestExternalities {
-		let assets_metadata_pendulum = assets_metadata_for_registry_pendulum();
-		let assets_metadata_amplitude = assets_metadata_for_registry_amplitude();
-		match self.chain {
-			ParachainType::Pendulum => {
-				use pendulum_runtime::{Runtime, System};
-				build_parachain_with_orml_and_asset_registry!(
-					self,
-					Runtime,
-					System,
-					NATIVE_INITIAL_BALANCE,
-					ORML_INITIAL_BALANCE,
-					PendulumCurrencyId,
-					assets_metadata_pendulum
-				)
-			},
-			ParachainType::Amplitude => {
-				use amplitude_runtime::{Runtime, System};
-				build_parachain_with_orml_and_asset_registry!(
-					self,
-					Runtime,
-					System,
-					NATIVE_INITIAL_BALANCE,
-					ORML_INITIAL_BALANCE,
-					AmplitudeCurrencyId,
-					assets_metadata_amplitude
-				)
-			},
-			_ => panic!("cannot use this chain to build"),
-		}
-	}
-}
-
-// ------------------- for Sibling -------------------
-impl ExtBuilderParachain<SiblingCurrencyId> {
-	pub fn sibling_default() -> Self {
-		Self { balances: vec![], chain: ParachainType::Sibling }
-	}
-
-	pub fn moonbeam_default() -> Self {
-		Self { balances: vec![], chain: ParachainType::Moonbeam }
-	}
-}
-
-impl Builder<SiblingCurrencyId> for ExtBuilderParachain<SiblingCurrencyId> {
-	fn balances(mut self, balances: Vec<(AccountId, SiblingCurrencyId, Balance)>) -> Self {
-		self.balances = balances;
-		self
-	}
-
-	fn build(self) -> TestExternalities {
-		match self.chain {
-			ParachainType::Sibling => {
-				use sibling::{Runtime, System};
-				build_parachain_with_orml!(
-					self,
-					Runtime,
-					System,
-					NATIVE_INITIAL_BALANCE,
-					ORML_INITIAL_BALANCE,
-					SiblingCurrencyId
-				)
-			},
-			ParachainType::Moonbeam => {
-				use sibling::{Runtime, System};
-				build_parachain_with_orml!(
-					self,
-					Runtime,
-					System,
-					NATIVE_INITIAL_BALANCE,
-					ORML_INITIAL_BALANCE,
-					SiblingCurrencyId
-				)
-			},
-			_ => panic!("cannot use this chain to build"),
-		}
-	}
-}
-
-// ------------------- for Statemint and Statemine -------------------
-impl ExtBuilderParachain<u128> {
-	pub fn polkadot_asset_hub_default() -> Self {
-		Self { balances: vec![], chain: ParachainType::PolkadotAssetHub }
-	}
-
-	pub fn kusama_asset_hub_default() -> Self {
-		Self { balances: vec![], chain: ParachainType::KusamaAssetHub }
-	}
-}
-
-impl Builder<u128> for ExtBuilderParachain<u128> {
-	fn balances(mut self, balances: Vec<(AccountId, u128, Balance)>) -> Self {
-		self.balances = balances;
-		self
-	}
-
-	fn build(self) -> TestExternalities {
-		match self.chain {
-			ParachainType::PolkadotAssetHub => {
-				use polkadot_asset_hub_runtime::{Runtime, System};
-				build_parachain!(self, Runtime, System)
-			},
-			ParachainType::KusamaAssetHub => {
-				use kusama_asset_hub_runtime::{Runtime, System};
-				build_parachain!(self, Runtime, System)
-			},
-			_ => panic!("cannot use this chain to build"),
-		}
-	}
-}
diff --git a/runtime/integration-tests/src/pendulum_tests.rs b/runtime/integration-tests/src/pendulum_tests.rs
index d193c05ba..36c7be1e5 100644
--- a/runtime/integration-tests/src/pendulum_tests.rs
+++ b/runtime/integration-tests/src/pendulum_tests.rs
@@ -1,5 +1,5 @@
 use crate::{
-	mock::{para_ext, polkadot_relay_ext, ParachainType, USDT_ASSET_ID},
+	mock::{assets_metadata_for_registry_pendulum, USDT_ASSET_ID},
 	sibling,
 	test_macros::{
 		moonbeam_transfers_token_and_handle_automation, parachain1_transfer_asset_to_parachain2,
@@ -12,80 +12,135 @@ use crate::{
 	ASSETHUB_ID, PENDULUM_ID, SIBLING_ID,
 };
 
-use frame_support::assert_ok;
+use crate::genesis::{genesis_gen, genesis_sibling};
+use frame_support::{assert_ok, traits::OnInitialize};
+use integration_tests_common::constants::{asset_hub_polkadot, polkadot};
 #[allow(unused_imports)]
 use pendulum_runtime::definitions::moonbeam::PARA_ID as MOONBEAM_PARA_ID;
-use statemint_runtime as polkadot_asset_hub_runtime;
 use xcm::latest::NetworkId;
-use xcm_emulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt};
+use xcm_emulator::{
+	decl_test_networks, decl_test_parachains, decl_test_relay_chains, DefaultMessageProcessor,
+};
 
 // Native fee expected for each token according to the `fee_per_second` values defined in the mock
+
+const BASE_FEE_WHEN_TRANSFER_NON_NATIVE_ASSET: polkadot_core_primitives::Balance = 5000000000;
 const NATIVE_FEE_WHEN_TRANSFER_TO_PARACHAIN: polkadot_core_primitives::Balance = 4000000000;
 const DOT_FEE_WHEN_TRANSFER_TO_PARACHAIN: polkadot_core_primitives::Balance =
-	NATIVE_FEE_WHEN_TRANSFER_TO_PARACHAIN / 4;
+	BASE_FEE_WHEN_TRANSFER_NON_NATIVE_ASSET / 4;
 const MOONBEAM_BRZ_FEE_WHEN_TRANSFER_TO_PARACHAIN: polkadot_core_primitives::Balance =
 	2 * NATIVE_FEE_WHEN_TRANSFER_TO_PARACHAIN;
 const USDT_FEE_WHEN_TRANSFER_TO_PARACHAIN: polkadot_core_primitives::Balance =
-	NATIVE_FEE_WHEN_TRANSFER_TO_PARACHAIN / 2;
-
-decl_test_relay_chain! {
-	pub struct PolkadotRelay {
-		Runtime = polkadot_runtime::Runtime,
-		XcmConfig = polkadot_runtime::xcm_config::XcmConfig,
-		new_ext = polkadot_relay_ext(),
-	}
+	BASE_FEE_WHEN_TRANSFER_NON_NATIVE_ASSET / 2;
+
+decl_test_relay_chains! {
+	#[api_version(5)]
+	pub struct Polkadot {
+		genesis = polkadot::genesis(),
+		on_init = (),
+		runtime = polkadot_runtime,
+		core = {
+			MessageProcessor: DefaultMessageProcessor<Polkadot>,
+			SovereignAccountOf: polkadot_runtime::xcm_config::SovereignAccountOf,
+		},
+		pallets = {
+			XcmPallet: polkadot_runtime::XcmPallet,
+			Balances: polkadot_runtime::Balances,
+			Hrmp: polkadot_runtime::Hrmp,
+		}
+	},
 }
 
-decl_test_parachain! {
+decl_test_parachains! {
+	pub struct AssetHubPolkadot {
+		genesis = asset_hub_polkadot::genesis(),
+		on_init = {
+			asset_hub_polkadot_runtime::AuraExt::on_initialize(1);
+		},
+		runtime = asset_hub_polkadot_runtime,
+		core = {
+			XcmpMessageHandler: asset_hub_polkadot_runtime::XcmpQueue,
+			DmpMessageHandler: asset_hub_polkadot_runtime::DmpQueue,
+			LocationToAccountId: asset_hub_polkadot_runtime::xcm_config::LocationToAccountId,
+			ParachainInfo: asset_hub_polkadot_runtime::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: asset_hub_polkadot_runtime::PolkadotXcm,
+			Assets: asset_hub_polkadot_runtime::Assets,
+			Balances: asset_hub_polkadot_runtime::Balances,
+		}
+	},
 	pub struct PendulumParachain {
-		Runtime = pendulum_runtime::Runtime,
-		RuntimeOrigin = pendulum_runtime::RuntimeOrigin,
-		XcmpMessageHandler = pendulum_runtime::XcmpQueue,
-		DmpMessageHandler = pendulum_runtime::DmpQueue,
-		new_ext = para_ext(ParachainType::Pendulum),
-	}
-}
-
-decl_test_parachain! {
+		genesis = genesis_gen!(pendulum_runtime, PENDULUM_ID, assets_metadata_for_registry_pendulum),
+		on_init = {
+			pendulum_runtime::AuraExt::on_initialize(1);
+		},
+		runtime = pendulum_runtime,
+		core = {
+			XcmpMessageHandler: pendulum_runtime::XcmpQueue,
+			DmpMessageHandler: pendulum_runtime::DmpQueue,
+			LocationToAccountId: pendulum_runtime::xcm_config::LocationToAccountId,
+			ParachainInfo: pendulum_runtime::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: pendulum_runtime::PolkadotXcm,
+			Tokens: pendulum_runtime::Tokens,
+			Balances: pendulum_runtime::Balances,
+			AssetRegistry: pendulum_runtime::AssetRegistry,
+			XTokens: pendulum_runtime::XTokens,
+		}
+	},
 	pub struct SiblingParachain {
-		Runtime = sibling::Runtime,
-		RuntimeOrigin = sibling::RuntimeOrigin,
-		XcmpMessageHandler = sibling::XcmpQueue,
-		DmpMessageHandler = sibling::DmpQueue,
-		new_ext = para_ext(ParachainType::Sibling),
-	}
-}
-
-decl_test_parachain! {
-	pub struct AssetHubParachain {
-		Runtime = polkadot_asset_hub_runtime::Runtime,
-		RuntimeOrigin = polkadot_asset_hub_runtime::RuntimeOrigin,
-		XcmpMessageHandler = polkadot_asset_hub_runtime::XcmpQueue,
-		DmpMessageHandler = polkadot_asset_hub_runtime::DmpQueue,
-		new_ext = para_ext(ParachainType::PolkadotAssetHub),
-	}
-}
-
-decl_test_parachain! {
+		genesis = genesis_sibling(SIBLING_ID),
+		on_init = {
+			sibling::AuraExt::on_initialize(1);
+		},
+		runtime = sibling,
+		core = {
+			XcmpMessageHandler: sibling::XcmpQueue,
+			DmpMessageHandler: sibling::DmpQueue,
+			LocationToAccountId: sibling::LocationToAccountId,
+			ParachainInfo: sibling::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: sibling::PolkadotXcm,
+			Tokens: sibling::Tokens,
+			Balances: sibling::Balances,
+			XTokens: sibling::XTokens,
+		}
+	},
 	pub struct MoonbeamParachain {
-		Runtime = sibling::Runtime,
-		RuntimeOrigin = sibling::RuntimeOrigin,
-		XcmpMessageHandler = sibling::XcmpQueue,
-		DmpMessageHandler = sibling::DmpQueue,
-		new_ext = para_ext(ParachainType::Moonbeam),
-	}
+		genesis = genesis_sibling(MOONBEAM_PARA_ID),
+		on_init = {
+			sibling::AuraExt::on_initialize(1);
+		},
+		runtime = sibling,
+		core = {
+			XcmpMessageHandler: sibling::XcmpQueue,
+			DmpMessageHandler: sibling::DmpQueue,
+			LocationToAccountId: sibling::LocationToAccountId,
+			ParachainInfo: sibling::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: sibling::PolkadotXcm,
+			Tokens: sibling::Tokens,
+			Balances: sibling::Balances,
+			XTokens: sibling::XTokens,
+		}
+	},
 }
 
-decl_test_network! {
+decl_test_networks! {
 	pub struct PolkadotMockNet {
-		relay_chain = PolkadotRelay,
+		relay_chain = Polkadot,
 		parachains = vec![
-			(1000, AssetHubParachain),
-			(2094, PendulumParachain),
-			(2004, MoonbeamParachain),
-			(9999, SiblingParachain),
+			AssetHubPolkadot,
+			PendulumParachain,
+			MoonbeamParachain,
+			SiblingParachain,
 		],
-	}
+		bridge = ()
+	},
 }
 
 #[test]
@@ -93,12 +148,12 @@ fn transfer_dot_from_polkadot_to_pendulum() {
 	transfer_20_relay_token_from_relay_chain_to_parachain!(
 		PolkadotMockNet,
 		polkadot_runtime,
-		PolkadotRelay,
+		Polkadot,
 		pendulum_runtime,
 		PendulumParachain,
 		PENDULUM_ID,
 		DOT_FEE_WHEN_TRANSFER_TO_PARACHAIN
-	)
+	);
 }
 
 #[test]
@@ -106,17 +161,19 @@ fn transfer_dot_from_pendulum_to_polkadot() {
 	transfer_10_relay_token_from_parachain_to_relay_chain!(
 		PolkadotMockNet,
 		polkadot_runtime,
-		PolkadotRelay,
+		Polkadot,
 		pendulum_runtime,
-		PendulumParachain
+		PendulumParachain,
+		PENDULUM_ID,
+		DOT_FEE_WHEN_TRANSFER_TO_PARACHAIN
 	);
 }
 
 #[test]
 fn assethub_transfer_incorrect_asset_to_pendulum_should_fail() {
 	parachain1_transfer_incorrect_asset_to_parachain2_should_fail!(
-		polkadot_asset_hub_runtime,
-		AssetHubParachain,
+		asset_hub_polkadot_runtime,
+		AssetHubPolkadot,
 		pendulum_runtime,
 		PendulumParachain,
 		PENDULUM_ID
@@ -126,8 +183,8 @@ fn assethub_transfer_incorrect_asset_to_pendulum_should_fail() {
 #[test]
 fn assethub_transfer_asset_to_pendulum() {
 	parachain1_transfer_asset_to_parachain2!(
-		polkadot_asset_hub_runtime,
-		AssetHubParachain,
+		asset_hub_polkadot_runtime,
+		AssetHubPolkadot,
 		USDT_ASSET_ID,
 		pendulum_runtime,
 		PendulumParachain,
@@ -141,8 +198,8 @@ fn assethub_transfer_asset_to_pendulum_and_back() {
 	let network_id = NetworkId::Polkadot;
 
 	parachain1_transfer_asset_to_parachain2_and_back!(
-		polkadot_asset_hub_runtime,
-		AssetHubParachain,
+		asset_hub_polkadot_runtime,
+		AssetHubPolkadot,
 		ASSETHUB_ID,
 		USDT_ASSET_ID,
 		pendulum_runtime,
diff --git a/runtime/integration-tests/src/sibling.rs b/runtime/integration-tests/src/sibling.rs
index 9809a89e0..f696f9a5c 100644
--- a/runtime/integration-tests/src/sibling.rs
+++ b/runtime/integration-tests/src/sibling.rs
@@ -3,8 +3,9 @@
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use core::marker::PhantomData;
+use cumulus_pallet_parachain_system::{self, RelayNumberStrictlyIncreases};
 use frame_support::{
-	log, match_types, parameter_types,
+	match_types, parameter_types,
 	traits::{ConstU32, ContainsPair, Everything, Nothing, ProcessMessageError},
 };
 use frame_system::EnsureRoot;
@@ -18,22 +19,21 @@ use polkadot_runtime_common::MAXIMUM_BLOCK_WEIGHT;
 use scale_info::TypeInfo;
 use serde::{Deserialize, Serialize};
 use sp_core::H256;
-use sp_debug_derive::RuntimeDebug;
 use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, Convert, IdentityLookup, Zero},
-	AccountId32,
+	generic, impl_opaque_keys,
+	traits::{BlakeTwo256, Convert, ConvertInto, IdentityLookup, MaybeEquivalence, Zero},
+	AccountId32, Permill, Perquintill, RuntimeDebug,
 };
 use xcm::v3::prelude::*;
-use xcm_emulator::{
-	cumulus_pallet_parachain_system::{self, RelayNumberStrictlyIncreases},
-	Weight,
-};
+use xcm_emulator::Weight;
 use xcm_executor::{
 	traits::{JustTry, ShouldExecute, WeightTrader},
 	Assets, XcmExecutor,
 };
 
+use crate::{definitions::asset_hub, AMPLITUDE_ID, ASSETHUB_ID, PENDULUM_ID};
+use pendulum_runtime::definitions::moonbeam::BRZ_location;
+use runtime_common::AuraId;
 use xcm::latest::Weight as XCMWeight;
 use xcm_builder::{
 	AccountId32Aliases, AllowUnpaidExecutionFrom, ConvertedConcreteId, EnsureXcmOrigin,
@@ -41,16 +41,32 @@ use xcm_builder::{
 	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
 	SignedToAccountId32, SovereignSignedViaLocation,
 };
+use xcm_executor::traits::Properties;
 
-use crate::{definitions::asset_hub, AMPLITUDE_ID, ASSETHUB_ID, PENDULUM_ID};
+#[cfg(any(feature = "std", test))]
+pub use sp_runtime::BuildStorage;
 
-use pendulum_runtime::definitions::moonbeam::BRZ_location;
+pub const UNIT: runtime_common::Balance = 1_000_000_000_000;
+pub const MILLISECS_PER_BLOCK: u64 = 12000;
+
+// NOTE: Currently it is not possible to change the slot duration after the chain has started.
+//       Attempting to do so will brick block production.
+pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
+
+// Time is measured by number of blocks.
+pub const MINUTES: runtime_common::BlockNumber =
+	60_000 / (MILLISECS_PER_BLOCK as runtime_common::BlockNumber);
+pub const HOURS: runtime_common::BlockNumber = MINUTES * 60;
+pub const DAYS: runtime_common::BlockNumber = HOURS * 24;
+pub const BLOCKS_PER_YEAR: runtime_common::BlockNumber = DAYS * 36525 / 100;
 
 const XCM_ASSET_RELAY_DOT: u8 = 0;
 const XCM_ASSET_ASSETHUB_USDT: u8 = 1;
 
 pub type AccountId = AccountId32;
 
+pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+
 parameter_types! {
 	pub const RelayLocation: MultiLocation = MultiLocation::parent();
 	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
@@ -167,20 +183,20 @@ impl Convert<MultiLocation, Option<CurrencyId>> for CurrencyIdConvert {
 impl Convert<MultiAsset, Option<CurrencyId>> for CurrencyIdConvert {
 	fn convert(a: MultiAsset) -> Option<CurrencyId> {
 		if let MultiAsset { id: AssetId::Concrete(id), fun: _ } = a {
-			Self::convert(id)
+			<Self as Convert<MultiLocation, Option<CurrencyId>>>::convert(id)
 		} else {
 			None
 		}
 	}
 }
 
-/// Convert an incoming `MultiLocation` into a `CurrencyId` if possible.
-/// Here we need to know the canonical representation of all the tokens we handle in order to
-/// correctly convert their `MultiLocation` representation into our internal `CurrencyId` type.
-impl xcm_executor::traits::Convert<MultiLocation, CurrencyId> for CurrencyIdConvert {
-	fn convert(location: MultiLocation) -> Result<CurrencyId, MultiLocation> {
-		<CurrencyIdConvert as Convert<MultiLocation, Option<CurrencyId>>>::convert(location)
-			.ok_or(location)
+// Required this now for FungiblesAdapter.
+impl MaybeEquivalence<MultiLocation, CurrencyId> for CurrencyIdConvert {
+	fn convert(id: &MultiLocation) -> Option<CurrencyId> {
+		<CurrencyIdConvert as Convert<MultiLocation, Option<CurrencyId>>>::convert(*id)
+	}
+	fn convert_back(what: &CurrencyId) -> Option<MultiLocation> {
+		<CurrencyIdConvert as Convert<CurrencyId, Option<MultiLocation>>>::convert(*what)
 	}
 }
 
@@ -273,8 +289,8 @@ where
 	fn should_execute<RuntimeCall>(
 		origin: &MultiLocation,
 		instructions: &mut [Instruction<RuntimeCall>],
-		max_weight: XCMWeight,
-		weight_credit: &mut XCMWeight,
+		max_weight: Weight,
+		weight_credit: &mut Properties,
 	) -> Result<(), ProcessMessageError> {
 		Deny::should_execute(origin, instructions, max_weight, weight_credit)?;
 		Allow::should_execute(origin, instructions, max_weight, weight_credit)
@@ -288,8 +304,8 @@ impl ShouldExecute for DenyReserveTransferToRelayChain {
 	fn should_execute<RuntimeCall>(
 		origin: &MultiLocation,
 		instructions: &mut [Instruction<RuntimeCall>],
-		_max_weight: XCMWeight,
-		_weight_credit: &mut XCMWeight,
+		_max_weight: Weight,
+		_weight_credit: &mut Properties,
 	) -> Result<(), ProcessMessageError> {
 		if instructions.iter().any(|inst| {
 			matches!(
@@ -311,10 +327,7 @@ impl ShouldExecute for DenyReserveTransferToRelayChain {
 		if matches!(origin, MultiLocation { parents: 1, interior: Here }) &&
 			instructions.iter().any(|inst| matches!(inst, ReserveAssetDeposited { .. }))
 		{
-			log::trace!(
-				target: "xcm::barriers",
-				"Unexpected ReserveAssetDeposited from the relay chain",
-			);
+			println! {"Unexpected ReserveAssetDeposited from the relay chain"};
 		}
 		// Permit everything else
 		Ok(())
@@ -350,6 +363,7 @@ impl xcm_executor::Config for XcmConfig {
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
 	type SafeCallFilter = Everything;
+	type Aliasers = ();
 }
 
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.
@@ -389,14 +403,9 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 }
 
 parameter_type_with_key! {
@@ -422,6 +431,37 @@ impl orml_xtokens::Config for Runtime {
 	type UniversalLocation = UniversalLocation;
 }
 
+parameter_types! {
+	pub const ProposalBond: Permill = Permill::from_percent(5);
+	pub const ProposalBondMinimum: Balance = 10 * UNIT;
+	pub const SpendPeriod: BlockNumber = 7 * DAYS;
+	pub const Burn: Permill = Permill::from_percent(0);
+	pub const TreasuryPalletId: frame_support::PalletId = frame_support::PalletId(*b"py/trsry");
+	pub const MaxApprovals: u32 = 100;
+}
+
+type TreasuryApproveOrigin = EnsureRoot<runtime_common::AccountId>;
+
+type TreasuryRejectOrigin = EnsureRoot<runtime_common::AccountId>;
+
+impl pallet_treasury::Config for Runtime {
+	type PalletId = TreasuryPalletId;
+	type Currency = Balances;
+	type ApproveOrigin = TreasuryApproveOrigin;
+	type RejectOrigin = TreasuryRejectOrigin;
+	type RuntimeEvent = RuntimeEvent;
+	type OnSlash = Treasury;
+	type ProposalBond = ProposalBond;
+	type ProposalBondMinimum = ProposalBondMinimum;
+	type ProposalBondMaximum = ();
+	type SpendPeriod = SpendPeriod;
+	type Burn = Burn;
+	type BurnDestination = ();
+	type SpendFunds = ();
+	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
+	type MaxApprovals = MaxApprovals;
+	type SpendOrigin = frame_support::traits::NeverEnsureOrigin<u128>;
+}
 pub struct AccountIdToMultiLocation;
 impl Convert<AccountId, MultiLocation> for AccountIdToMultiLocation {
 	fn convert(account: AccountId) -> MultiLocation {
@@ -437,59 +477,59 @@ impl cumulus_pallet_xcm::Config for Runtime {
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
-type Block = frame_system::mocking::MockBlock<Runtime>;
+pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Runtime
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Config<T>, Event<T>},
-		XTokens: orml_xtokens::{Pallet, Storage, Call, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Event<T>},
+		System: frame_system,
+		Tokens: orml_tokens,
+		Timestamp: pallet_timestamp,
+		XTokens: orml_xtokens,
+		Balances: pallet_balances,
 		PolkadotXcm: pallet_xcm,
-		ParachainSystem: cumulus_pallet_parachain_system::{
-			Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned,
-		},
-		ParachainInfo: parachain_info::{Pallet, Storage, Config},
-		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>},
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>},
-		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin},
+		ParachainSystem: cumulus_pallet_parachain_system,
+		ParachainInfo: parachain_info,
+		XcmpQueue: cumulus_pallet_xcmp_queue,
+		DmpQueue: cumulus_pallet_dmp_queue,
+		CumulusXcm: cumulus_pallet_xcm,
+
+		Treasury: pallet_treasury,
+
+		Aura: pallet_aura = 33,
+		Session: pallet_session = 32,
+		ParachainStaking: parachain_staking = 35,
+		Authorship: pallet_authorship = 30,
+		AuraExt: cumulus_pallet_aura_ext = 34,
+
+
 	}
 );
 
 pub type Balance = u128;
-pub type BlockNumber = u64;
-pub type Index = u64;
+pub type BlockNumber = u32;
+pub type Index = u32;
 pub type Amount = i64;
 
 parameter_types! {
-	pub const BlockHashCount: u64 = 250;
+	pub const BlockHashCount: u32 = 250;
 	pub const SS58Prefix: u8 = 42;
 }
 impl frame_system::Config for Runtime {
+	type Block = Block;
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = Index;
-	type BlockNumber = BlockNumber;
+	type Nonce = Index;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
@@ -561,7 +601,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type MaxHolds = ConstU32<1>;
-	type HoldIdentifier = RuntimeHoldReason;
+	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
 parameter_types! {
@@ -579,10 +619,10 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	#[cfg(feature = "std")]
+	type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
 }
 
-impl parachain_info::Config for Runtime {}
-
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
@@ -601,6 +641,110 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
 	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
 }
 
+parameter_types! {
+	// as per documentation, typical value for this is false "unless this pallet is being augmented by another pallet"
+	// https://github.com/paritytech/polkadot-sdk/blob/release-polkadot-v1.1.0/substrate/frame/aura/src/lib.rs#L111
+	pub const AllowMultipleBlocksPerSlot: bool = false;
+	pub const MaxAuthorities: u32 = 200;
+}
+
+impl pallet_aura::Config for Runtime {
+	type AuthorityId = AuraId;
+	type DisabledValidators = ();
+	type MaxAuthorities = MaxAuthorities;
+	type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot;
+}
+
+parameter_types! {
+	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
+}
+
+impl pallet_timestamp::Config for Runtime {
+	/// A timestamp: milliseconds since the unix epoch.
+	type Moment = u64;
+	type OnTimestampSet = ();
+	type MinimumPeriod = MinimumPeriod;
+	type WeightInfo = pallet_timestamp::weights::SubstrateWeight<Runtime>;
+}
+
+parameter_types! {
+	pub const Offset: u32 = 0;
+}
+
+impl pallet_authorship::Config for Runtime {
+	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Aura>;
+	type EventHandler = ParachainStaking;
+}
+
+impl_opaque_keys! {
+	pub struct SessionKeys {
+		pub aura: Aura,
+	}
+}
+
+parameter_types! {
+	pub const MinBlocksPerRound: BlockNumber = HOURS;
+	pub const DefaultBlocksPerRound: BlockNumber = 2 * HOURS;
+	pub const StakeDuration: BlockNumber = 7 * DAYS;
+	pub const ExitQueueDelay: u32 = 2;
+	pub const MinCollators: u32 = 8;
+	pub const MinRequiredCollators: u32 = 2;
+	pub const MaxDelegationsPerRound: u32 = 1;
+	#[derive(Debug, Eq, PartialEq)]
+	pub const MaxDelegatorsPerCollator: u32 = 40;
+	pub const MinCollatorStake: Balance = 5_000 * UNIT;
+	pub const MinDelegatorStake: Balance = 10 * UNIT;
+	#[derive(Debug, Eq, PartialEq)]
+	pub const MaxCollatorCandidates: u32 = 40;
+	pub const MaxUnstakeRequests: u32 = 10;
+	pub const NetworkRewardStart: BlockNumber = BlockNumber::MAX;
+	pub const NetworkRewardRate: Perquintill = Perquintill::from_percent(0);
+	pub const CollatorRewardRateDecay: Perquintill = Perquintill::from_parts(936_879_853_200_000_000u64);
+}
+
+impl parachain_staking::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type Currency = Balances;
+	type CurrencyBalance = runtime_common::Balance;
+
+	type MinBlocksPerRound = MinBlocksPerRound;
+	type DefaultBlocksPerRound = DefaultBlocksPerRound;
+	type StakeDuration = StakeDuration;
+	type ExitQueueDelay = ExitQueueDelay;
+	type MinCollators = MinCollators;
+	type MinRequiredCollators = MinRequiredCollators;
+	type MaxDelegationsPerRound = MaxDelegationsPerRound;
+	type MaxDelegatorsPerCollator = MaxDelegatorsPerCollator;
+	type MinCollatorStake = MinCollatorStake;
+	type MinCollatorCandidateStake = MinCollatorStake;
+	type MaxTopCandidates = MaxCollatorCandidates;
+	type MinDelegatorStake = MinDelegatorStake;
+	type MaxUnstakeRequests = MaxUnstakeRequests;
+	type NetworkRewardRate = NetworkRewardRate;
+	type NetworkRewardStart = NetworkRewardStart;
+	type NetworkRewardBeneficiary = Treasury;
+	type CollatorRewardRateDecay = CollatorRewardRateDecay;
+	type WeightInfo = parachain_staking::default_weights::SubstrateWeight<Runtime>;
+
+	const BLOCKS_PER_YEAR: runtime_common::BlockNumber = BLOCKS_PER_YEAR;
+}
+
+impl pallet_session::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type ValidatorId = <Self as frame_system::Config>::AccountId;
+	type ValidatorIdOf = ConvertInto;
+	type ShouldEndSession = ParachainStaking;
+	type NextSessionRotation = ParachainStaking;
+	type SessionManager = ParachainStaking;
+	type SessionHandler = <SessionKeys as sp_runtime::traits::OpaqueKeys>::KeyTypeIdProviders;
+	type Keys = SessionKeys;
+	type WeightInfo = pallet_session::weights::SubstrateWeight<Runtime>;
+}
+
+impl parachain_info::Config for Runtime {}
+
+impl cumulus_pallet_aura_ext::Config for Runtime {}
+
 /// A trader who believes all tokens are created equal to "weight" of any chain,
 /// which is not true, but good enough to mock the fee payment of XCM execution.
 ///
@@ -611,7 +755,12 @@ impl WeightTrader for AllTokensAreCreatedEqualToWeight {
 		Self(MultiLocation::parent())
 	}
 
-	fn buy_weight(&mut self, weight: Weight, payment: Assets) -> Result<Assets, XcmError> {
+	fn buy_weight(
+		&mut self,
+		weight: Weight,
+		payment: Assets,
+		_context: &XcmContext,
+	) -> Result<Assets, XcmError> {
 		let asset_id = payment.fungible.iter().next().expect("Payment must be something; qed").0;
 		let required = MultiAsset { id: *asset_id, fun: Fungible(weight.ref_time() as u128) };
 
@@ -623,7 +772,7 @@ impl WeightTrader for AllTokensAreCreatedEqualToWeight {
 		Ok(unused)
 	}
 
-	fn refund_weight(&mut self, weight: Weight) -> Option<MultiAsset> {
+	fn refund_weight(&mut self, weight: Weight, _context: &XcmContext) -> Option<MultiAsset> {
 		if weight.is_zero() {
 			None
 		} else {
diff --git a/runtime/integration-tests/src/test_macros.rs b/runtime/integration-tests/src/test_macros.rs
index 8cbdd3f86..8f90817d0 100644
--- a/runtime/integration-tests/src/test_macros.rs
+++ b/runtime/integration-tests/src/test_macros.rs
@@ -8,28 +8,42 @@ macro_rules! transfer_20_relay_token_from_relay_chain_to_parachain {
 		$parachain_id:ident,
 		$tx_fee:ident
 	) => {{
-		use crate::mock::{units, ALICE};
+		use crate::mock::units;
 		use frame_support::traits::fungibles::Inspect;
 		use polkadot_core_primitives::Balance;
 		use xcm::latest::{Junction, Junction::Parachain, Junctions::Here};
+		use xcm_emulator::{Network, TestExt};
 		use $para_runtime::CurrencyId;
 
+		use integration_tests_common::constants::accounts;
+		let alice_account_id = accounts::init_balances()[0].clone();
+
 		$mocknet::reset();
-		let transfer_amount: Balance = units(20);
+		let transfer_amount: Balance = units(100);
 		let mut orml_tokens_before = 0;
 
 		// get ALICE's balance before the transfer
 		$parachain::execute_with(|| {
-			orml_tokens_before = $para_runtime::Tokens::balance(CurrencyId::XCM(0), &ALICE.into());
+			orml_tokens_before = $para_runtime::Tokens::balance(
+				CurrencyId::XCM(0),
+				&alice_account_id.clone().into(),
+			);
+		});
+
+		// get ALICE's balance in the relay chain, before the transfer. Ensure it is enough to transfer.
+		$relaychain::execute_with(|| {
+			let before_alice_free_balance =
+				$relay_runtime::Balances::free_balance(&alice_account_id.clone().into());
+			assert!(before_alice_free_balance > transfer_amount);
 		});
 
 		// execute the transfer from relay chain
 		$relaychain::execute_with(|| {
 			assert_ok!($relay_runtime::XcmPallet::reserve_transfer_assets(
-				$relay_runtime::RuntimeOrigin::signed(ALICE.into()),
-				Box::new(Parachain($parachain_id).into_versioned()),
+				$relay_runtime::RuntimeOrigin::signed(alice_account_id.clone().into()),
+				Box::new(Parachain($parachain_id).into()),
 				Box::new(
-					Junction::AccountId32 { network: None, id: ALICE }
+					Junction::AccountId32 { network: None, id: alice_account_id.clone().into() }
 						.into_location()
 						.into_versioned()
 				),
@@ -41,6 +55,12 @@ macro_rules! transfer_20_relay_token_from_relay_chain_to_parachain {
 		// a "Deposited" event occurred is proof that the transfer was successful
 		$parachain::execute_with(|| {
 			use $para_runtime::{RuntimeEvent, System};
+
+			for event in System::events() {
+				println! {"Parachain events when receiving of relay token"}
+				println! {"{:?}", event}
+			}
+
 			assert!(System::events().iter().any(|r| matches!(
 				r.event,
 				RuntimeEvent::Tokens(orml_tokens::Event::Deposited { .. })
@@ -54,8 +74,12 @@ macro_rules! transfer_20_relay_token_from_relay_chain_to_parachain {
 
 		$parachain::execute_with(|| {
 			assert_eq!(
-				$para_runtime::Tokens::balance(CurrencyId::XCM(0), &ALICE.into()),
-				orml_tokens_before + transfer_amount - $tx_fee
+				$para_runtime::Tokens::balance(
+					CurrencyId::XCM(0),
+					&alice_account_id.clone().into()
+				),
+				orml_tokens_before + transfer_amount - $tx_fee,
+				"Incorrect amount received"
 			);
 		});
 	}};
@@ -66,44 +90,55 @@ macro_rules! transfer_10_relay_token_from_parachain_to_relay_chain {(
 		$relay_runtime:ident,
 		$relaychain:ident,
 		$para_runtime:ident,
-		$parachain: ident
+		$parachain: ident,
+		$parachain_id:ident,
+		$tx_fee:ident
 	) => {{
-		use crate::mock::{BOB, units};
+		use xcm_emulator::TestExt;
+		use crate::mock::{units};
 		use polkadot_core_primitives::Balance;
 		use xcm::latest::{Junction::AccountId32, Junctions::X1, MultiLocation, WeightLimit};
-		use xcm_emulator::TestExt;
 
-		$mocknet::reset();
-		let transfer_amount: Balance = units(10);
-		let expected_base_balance = units(100);
+		use integration_tests_common::constants::accounts;
+		let alice_account_id = accounts::init_balances()[0].clone();
 
-		// get BOB's balance in the relay chain, before the transfer.
+		transfer_20_relay_token_from_relay_chain_to_parachain!(
+			$mocknet,
+			$relay_runtime,
+			$relaychain,
+			$para_runtime,
+			$parachain,
+			$parachain_id,
+			$tx_fee
+		);
+
+		let transfer_amount: Balance = units(90);
+		let mut before_alice_free_balance: Balance = 0;
+
+		// get ALICE's balance in the relay chain, before the transfer.
 		$relaychain::execute_with(|| {
-			let before_bob_free_balance = $relay_runtime::Balances::free_balance(&BOB.into());
-			assert_eq!(before_bob_free_balance, expected_base_balance);
+			before_alice_free_balance = $relay_runtime::Balances::free_balance(&alice_account_id.clone().into());
 		});
 
-		// execute th transfer in the parachain.
+		// execute the transfer in the parachain.
 		$parachain::execute_with(|| {
+			use $para_runtime::{System, RuntimeEvent};
 			assert_ok!($para_runtime::XTokens::transfer(
-				$para_runtime::RuntimeOrigin::signed(BOB.into()),
+				$para_runtime::RuntimeOrigin::signed(alice_account_id.clone().into()),
 				$para_runtime::CurrencyId::XCM(0),
 				transfer_amount,
 				Box::new(
-					MultiLocation { parents: 1, interior: X1(AccountId32 { network: None, id: BOB }) }
+					MultiLocation { parents: 1, interior: X1(AccountId32 { network: None, id: alice_account_id.clone().into() }) }
 						.into()
 				),
 				WeightLimit::Unlimited
 			));
-		});
 
-		// check events in Parachain for proof of transfer
-		$parachain::execute_with(|| {
-			use $para_runtime::{System, RuntimeEvent};
+			use orml_tokens::Event;
 
 			assert!(System::events().iter().any(|r| matches!(
 				r.event,
-				RuntimeEvent::Tokens(orml_tokens::Event::Withdrawn { .. })
+				RuntimeEvent::Tokens(Event::Withdrawn { .. })
 			)));
 
 			assert!(System::events().iter().any(|r| matches!(
@@ -117,7 +152,11 @@ macro_rules! transfer_10_relay_token_from_parachain_to_relay_chain {(
 			use $relay_runtime::{RuntimeEvent, System, Balances};
 
 			let events = System::events();
-			assert_eq!(events.len(), 3);
+
+			for event in System::events() {
+				println!{"Receiveing relay token on relay chain"}
+				println!{"{:?}", event}
+			}
 
 			let withdrawn_balance = match &events[0].event {
 				RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who: _, amount }) => amount,
@@ -129,19 +168,14 @@ macro_rules! transfer_10_relay_token_from_parachain_to_relay_chain {(
 				other => panic!("wrong event: {:#?}", other),
 			};
 
-			match &events[2].event {
-				RuntimeEvent::Ump(polkadot_runtime_parachains::ump::Event::ExecutedUpward(..)) =>
-					assert!(true),
-				other => panic!("wrong event: {:#?}", other),
-			};
-
 			//This fee will taken to transfer assets(Polkadot) from sovereign parachain account to destination user account;
 			let fee_when_transferring_to_relay_chain = withdrawn_balance - deposited_balance;
 
-			let after_bob_free_balance = Balances::free_balance(&BOB.into());
+			let after_alice_free_balance = Balances::free_balance(&alice_account_id.into());
 			assert_eq!(
-				after_bob_free_balance,
-				expected_base_balance + transfer_amount - fee_when_transferring_to_relay_chain
+				after_alice_free_balance,
+				before_alice_free_balance + transfer_amount - fee_when_transferring_to_relay_chain,
+				"Amount received on relay chain incorrect"
 			);
 		});
 
@@ -160,8 +194,9 @@ macro_rules! parachain1_transfer_incorrect_asset_to_parachain2_should_fail {
 		$parachain2: ident,
 		$parachain2_id:ident
 	) => {{
-		use crate::mock::{ALICE, BOB, INCORRECT_ASSET_ID, TEN_UNITS, UNIT};
+		use crate::mock::{INCORRECT_ASSET_ID, TEN_UNITS, UNIT};
 		use frame_support::traits::{fungibles::Inspect, Currency};
+		use integration_tests_common::constants::accounts;
 		use polkadot_core_primitives::AccountId;
 		use polkadot_parachain::primitives::Sibling;
 		use sp_runtime::{traits::AccountIdConversion, MultiAddress};
@@ -171,15 +206,18 @@ macro_rules! parachain1_transfer_incorrect_asset_to_parachain2_should_fail {
 			Junctions::{X1, X2},
 			MultiLocation, WeightLimit,
 		};
+		use xcm_emulator::TestExt;
 		use $para2_runtime::CurrencyId;
 
 		let parachain2_account: AccountId = Sibling::from($parachain2_id).into_account_truncating();
+		let alice_account_id = accounts::init_balances()[0].clone();
+		let bob_account_id = accounts::init_balances()[1].clone();
 
 		let expected_base_usdt_balance = 0;
 		// make sure the account does not have any usdt.
 		$parachain2::execute_with(|| {
 			assert_eq!(
-				$para2_runtime::Tokens::balance(CurrencyId::XCM(1), &BOB.into()),
+				$para2_runtime::Tokens::balance(CurrencyId::XCM(1), &bob_account_id),
 				expected_base_usdt_balance
 			);
 		});
@@ -187,16 +225,16 @@ macro_rules! parachain1_transfer_incorrect_asset_to_parachain2_should_fail {
 		$parachain1::execute_with(|| {
 			use $para1_runtime::*;
 
-			let origin = RuntimeOrigin::signed(ALICE.into());
-			Balances::make_free_balance_be(&ALICE.into(), TEN_UNITS);
-			Balances::make_free_balance_be(&BOB.into(), UNIT);
+			let origin = RuntimeOrigin::signed(alice_account_id.clone());
+			Balances::make_free_balance_be(&alice_account_id, TEN_UNITS);
+			Balances::make_free_balance_be(&bob_account_id, UNIT);
 
 			// If using non root, create custom asset cost 0.1 Dot
 			// We're using force_create here to make sure asset is sufficient.
 			assert_ok!(Assets::force_create(
 				RuntimeOrigin::root(),
 				INCORRECT_ASSET_ID.into(),
-				MultiAddress::Id(ALICE.into()),
+				MultiAddress::Id(alice_account_id.clone()),
 				true,
 				UNIT / 100
 			));
@@ -204,7 +242,7 @@ macro_rules! parachain1_transfer_incorrect_asset_to_parachain2_should_fail {
 			assert_ok!(Assets::mint(
 				origin.clone(),
 				INCORRECT_ASSET_ID.into(),
-				MultiAddress::Id(ALICE.into()),
+				MultiAddress::Id(alice_account_id.clone()),
 				1000 * UNIT
 			));
 
@@ -214,7 +252,10 @@ macro_rules! parachain1_transfer_incorrect_asset_to_parachain2_should_fail {
 			assert_ok!(PolkadotXcm::limited_reserve_transfer_assets(
 				origin.clone(),
 				Box::new(MultiLocation::new(1, X1(Parachain($parachain2_id))).into()),
-				Box::new(Junction::AccountId32 { id: BOB, network: None }.into()),
+				Box::new(
+					Junction::AccountId32 { id: bob_account_id.clone().into(), network: None }
+						.into()
+				),
 				Box::new(
 					(X2(PalletInstance(50), GeneralIndex(INCORRECT_ASSET_ID as u128)), TEN_UNITS)
 						.into()
@@ -223,8 +264,8 @@ macro_rules! parachain1_transfer_incorrect_asset_to_parachain2_should_fail {
 				WeightLimit::Unlimited
 			));
 
-			assert_eq!(990 * UNIT, Assets::balance(INCORRECT_ASSET_ID, &AccountId::from(ALICE)));
-			assert_eq!(0, Assets::balance(INCORRECT_ASSET_ID, &AccountId::from(BOB)));
+			assert_eq!(990 * UNIT, Assets::balance(INCORRECT_ASSET_ID, &alice_account_id));
+			assert_eq!(0, Assets::balance(INCORRECT_ASSET_ID, &bob_account_id));
 
 			assert_eq!(TEN_UNITS, Assets::balance(INCORRECT_ASSET_ID, &parachain2_account));
 			// the balance of sibling parachain sovereign account is not changed
@@ -243,14 +284,15 @@ macro_rules! parachain1_transfer_incorrect_asset_to_parachain2_should_fail {
 				RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail {
 					message_hash: _,
 					error: xcm::v3::Error::TooExpensive,
-					weight: _
+					weight: _,
+					..
 				})
 			)));
 		});
 
 		$parachain2::execute_with(|| {
 			assert_eq!(
-				$para2_runtime::Tokens::balance(CurrencyId::XCM(1), &BOB.into()),
+				$para2_runtime::Tokens::balance(CurrencyId::XCM(1), &bob_account_id),
 				expected_base_usdt_balance
 			);
 		});
@@ -267,8 +309,9 @@ macro_rules! parachain1_transfer_asset_to_parachain2 {
 		$parachain2_id:ident,
 		$tx_fee:ident
 	) => {{
-		use crate::mock::{ALICE, BOB, TEN_UNITS, UNIT};
+		use crate::mock::{TEN_UNITS, UNIT};
 		use frame_support::traits::{fungibles::Inspect, Currency};
+		use integration_tests_common::constants::accounts;
 		use polkadot_core_primitives::AccountId;
 		use polkadot_parachain::primitives::Sibling;
 		use sp_runtime::{traits::AccountIdConversion, MultiAddress};
@@ -278,27 +321,37 @@ macro_rules! parachain1_transfer_asset_to_parachain2 {
 			Junctions::{X1, X2},
 			MultiLocation, WeightLimit,
 		};
+		use xcm_emulator::TestExt;
 		use $para2_runtime::CurrencyId;
 
+		let alice_account_id = accounts::init_balances()[0].clone();
+		let bob_account_id = accounts::init_balances()[1].clone();
+
 		let parachain2_account: AccountId = Sibling::from($parachain2_id).into_account_truncating();
 
 		$parachain2::execute_with(|| {
-			assert_eq!($para2_runtime::Tokens::balance(CurrencyId::XCM(1), &BOB.into()), 0);
+			assert_eq!(
+				$para2_runtime::Tokens::balance(
+					CurrencyId::XCM(1),
+					&alice_account_id.clone().into()
+				),
+				0
+			);
 		});
 
 		$parachain1::execute_with(|| {
 			use $para1_runtime::*;
 
-			let origin = RuntimeOrigin::signed(ALICE.into());
-			Balances::make_free_balance_be(&ALICE.into(), TEN_UNITS);
-			Balances::make_free_balance_be(&BOB.into(), UNIT);
+			let origin = RuntimeOrigin::signed(alice_account_id.clone().into());
+			Balances::make_free_balance_be(&alice_account_id.clone().into(), TEN_UNITS);
+			Balances::make_free_balance_be(&bob_account_id.clone().into(), UNIT);
 
 			// If using non root, create custom asset cost 0.1 Dot
 			// We're using force_create here to make sure asset is sufficient.
 			assert_ok!(Assets::force_create(
 				RuntimeOrigin::root(),
 				$para1_asset_id.into(),
-				MultiAddress::Id(ALICE.into()),
+				MultiAddress::Id(alice_account_id.clone().into()),
 				true,
 				UNIT / 100
 			));
@@ -306,7 +359,7 @@ macro_rules! parachain1_transfer_asset_to_parachain2 {
 			assert_ok!(Assets::mint(
 				origin.clone(),
 				$para1_asset_id.into(),
-				MultiAddress::Id(ALICE.into()),
+				MultiAddress::Id(alice_account_id.clone().into()),
 				1000 * UNIT
 			));
 
@@ -316,7 +369,10 @@ macro_rules! parachain1_transfer_asset_to_parachain2 {
 			assert_ok!(PolkadotXcm::limited_reserve_transfer_assets(
 				origin.clone(),
 				Box::new(MultiLocation::new(1, X1(Parachain($parachain2_id))).into()),
-				Box::new(Junction::AccountId32 { id: BOB, network: None }.into()),
+				Box::new(
+					Junction::AccountId32 { id: bob_account_id.clone().into(), network: None }
+						.into()
+				),
 				Box::new(
 					(X2(PalletInstance(50), GeneralIndex($para1_asset_id as u128)), TEN_UNITS)
 						.into()
@@ -325,8 +381,8 @@ macro_rules! parachain1_transfer_asset_to_parachain2 {
 				WeightLimit::Unlimited
 			));
 
-			assert_eq!(990 * UNIT, Assets::balance($para1_asset_id, &AccountId::from(ALICE)));
-			assert_eq!(0, Assets::balance($para1_asset_id, &AccountId::from(BOB)));
+			assert_eq!(990 * UNIT, Assets::balance($para1_asset_id, &alice_account_id.clone()));
+			assert_eq!(0, Assets::balance($para1_asset_id, &bob_account_id.clone()));
 
 			assert_eq!(TEN_UNITS, Assets::balance($para1_asset_id, &parachain2_account));
 			// the balance of sibling parachain sovereign account is not changed
@@ -355,7 +411,10 @@ macro_rules! parachain1_transfer_asset_to_parachain2 {
 			)));
 
 			assert_eq!(
-				$para2_runtime::Tokens::balance($para2_runtime::CurrencyId::XCM(1), &BOB.into()),
+				$para2_runtime::Tokens::balance(
+					$para2_runtime::CurrencyId::XCM(1),
+					&bob_account_id.clone().into()
+				),
 				TEN_UNITS - $tx_fee
 			);
 		});
@@ -374,12 +433,15 @@ macro_rules! parachain1_transfer_asset_to_parachain2_and_back {
 		$network_id: ident,
 		$tx_fee: ident
 	) => {{
-		use crate::mock::{BOB, TEN_UNITS, UNIT};
+		use crate::mock::{TEN_UNITS, UNIT};
 		use frame_support::traits::{fungible::Mutate, fungibles::Inspect};
-		use polkadot_core_primitives::AccountId;
+		use integration_tests_common::constants::accounts;
 		use xcm::latest::{
 			Junction, Junction::Parachain, Junctions::X2, MultiLocation, WeightLimit,
 		};
+		use xcm_emulator::TestExt;
+
+		let bob_account_id = accounts::init_balances()[1].clone();
 
 		//first we need to set up USDT balance on pendulum chain before to start transfer it back.
 		parachain1_transfer_asset_to_parachain2!(
@@ -402,13 +464,13 @@ macro_rules! parachain1_transfer_asset_to_parachain2_and_back {
 
 			assert_eq!(
 				received_amount_after_fee,
-				Tokens::balance(CurrencyId::XCM(1), &AccountId::from(BOB))
+				Tokens::balance(CurrencyId::XCM(1), &bob_account_id.clone())
 			);
 			// ensure sender has enough balance to be charged as fee
-			assert_ok!(Balances::mint_into(&AccountId::from(BOB), TEN_UNITS));
+			assert_ok!(Balances::mint_into(&bob_account_id.clone(), TEN_UNITS));
 
 			assert_ok!(XTokens::transfer(
-				RuntimeOrigin::signed(BOB.into()),
+				RuntimeOrigin::signed(bob_account_id.clone().into()),
 				CurrencyId::XCM(1),
 				UNIT * 1,
 				Box::new(
@@ -416,7 +478,10 @@ macro_rules! parachain1_transfer_asset_to_parachain2_and_back {
 						1,
 						X2(
 							Parachain($parachain1_id),
-							Junction::AccountId32 { network: Some($network_id), id: BOB.into() }
+							Junction::AccountId32 {
+								network: Some($network_id),
+								id: bob_account_id.clone().into()
+							}
 						)
 					)
 					.into()
@@ -426,26 +491,18 @@ macro_rules! parachain1_transfer_asset_to_parachain2_and_back {
 
 			assert_eq!(
 				received_amount_after_fee - 1 * UNIT, //initial balance - one unit
-				Tokens::balance(CurrencyId::XCM(1), &AccountId::from(BOB))
+				Tokens::balance(CurrencyId::XCM(1), &bob_account_id.clone())
 			);
 
 			assert!(System::events().iter().any(|r| matches!(
 				r.event,
 				RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. })
 			)));
-
-			for i in System::events().iter() {
-				println!("{}: {:?}\n", stringify!($para2_runtime), i);
-			}
 		});
 
 		$parachain1::execute_with(|| {
 			use $para1_runtime::*;
 
-			for i in System::events().iter() {
-				println!("{}: {:?}\n", stringify!($para1_runtime), i);
-			}
-
 			let events = System::events();
 			match &events[events.len() - 2] {
 				&frame_system::EventRecord {
@@ -462,7 +519,7 @@ macro_rules! parachain1_transfer_asset_to_parachain2_and_back {
 					// for paying xcm execution fee.
 					// 990_000_000_000 for Statemint
 					// 988_423_297_485 for Statemine
-					assert_eq!(amount, Assets::balance($para1_asset_id, &AccountId::from(BOB)));
+					assert_eq!(amount, Assets::balance($para1_asset_id, &bob_account_id.clone()));
 				},
 				other => panic!("wrong event: {other:?}"),
 			}
@@ -481,19 +538,24 @@ macro_rules! transfer_native_token_from_parachain1_to_parachain2_and_back {
         $parachain2_id:ident,
 		$tx_fee:ident
     ) => {{
-		use crate::mock::{ALICE, BOB, UNIT, NATIVE_INITIAL_BALANCE};
+		use crate::mock::units;
 		use frame_support::traits::fungibles::Inspect;
 		use polkadot_core_primitives::Balance;
 		use xcm::latest::{
 			Junction, Junction::AccountId32, Junctions::{X2, X1}, MultiLocation, WeightLimit,
 		};
+		use xcm_emulator::{TestExt, Network};
 		use orml_traits::MultiCurrency;
 		use $parachain1_runtime::CurrencyId as Parachain1CurrencyId;
 		use $parachain2_runtime::CurrencyId as Parachain2CurrencyId;
+		use integration_tests_common::constants::accounts;
 
 		$mocknet::reset();
 
-		let transfer_amount: Balance = UNIT;
+		let alice_account_id = accounts::init_balances()[0].clone();
+		let bob_account_id = accounts::init_balances()[1].clone();
+
+		let transfer_amount: Balance = units(10);
 		let asset_location_local_pov =  MultiLocation::new(
 			0,
 			X1(Junction::PalletInstance(10)),
@@ -506,18 +568,21 @@ macro_rules! transfer_native_token_from_parachain1_to_parachain2_and_back {
 		// Used for checking BOB's balance
 		let para1_native_currency_on_para2 = Parachain2CurrencyId::from($parachain1_id);
 
-		// Get ALICE's balance on parachain1 before the transfer (defined in mock config)
-		let native_tokens_before: Balance = NATIVE_INITIAL_BALANCE;
+		// Get ALICE and Treasury's balance on parachain1 before the transfer
+		let mut native_tokens_before: Balance = 0;
+		let mut treasury_native_tokens_before: Balance = 0;
+
+
 
 		$parachain1::execute_with(|| {
-			assert_eq!(
-				$parachain1_runtime::Currencies::free_balance(Parachain1CurrencyId::Native, &ALICE.into()),
-				native_tokens_before
-			);
+			use $parachain1_runtime::Treasury;
+
+			native_tokens_before = $parachain1_runtime::Currencies::free_balance(Parachain1CurrencyId::Native, &alice_account_id);
+			treasury_native_tokens_before = $parachain1_runtime::Currencies::free_balance(Parachain1CurrencyId::Native, &Treasury::account_id());
 		});
 		$parachain2::execute_with(|| {
 			assert_eq!(
-				$parachain2_runtime::Tokens::balance(para1_native_currency_on_para2, &BOB.into()),
+				$parachain2_runtime::Tokens::balance(para1_native_currency_on_para2, &bob_account_id),
 				0
 			);
 		});
@@ -528,14 +593,14 @@ macro_rules! transfer_native_token_from_parachain1_to_parachain2_and_back {
 
 			// Transfer using multilocation
 			assert_ok!(XTokens::transfer_multiasset(
-				$parachain1_runtime::RuntimeOrigin::signed(ALICE.into()),
+				$parachain1_runtime::RuntimeOrigin::signed(alice_account_id.clone()),
 				Box::new((asset_location_local_pov.clone(), transfer_amount).into()),
 				Box::new(
 					MultiLocation {
 						parents: 1,
 						interior: X2(
 							Junction::Parachain($parachain2_id),
-							AccountId32 { network: None, id: BOB }
+							AccountId32 { network: None, id: bob_account_id.clone().into() }
 						)
 					}
 					.into()
@@ -543,6 +608,11 @@ macro_rules! transfer_native_token_from_parachain1_to_parachain2_and_back {
 				WeightLimit::Unlimited
 			));
 
+			for event in System::events() {
+				println!{"Parachain events when sending native"}
+				println!{"{:?}", event}
+			}
+
 			// Alternatively, we should be able to use
 			// assert_ok!(XTokens::transfer(
 			// 	$parachain1_runtime::RuntimeOrigin::signed(ALICE.into()),
@@ -570,12 +640,14 @@ macro_rules! transfer_native_token_from_parachain1_to_parachain2_and_back {
 		// Verify BOB's balance on parachain2 after receiving
 		// Should increase by the transfer amount
 		$parachain2::execute_with(|| {
-			use $parachain2_runtime::{ System};
-			for i in System::events().iter() {
-				println!("para 2 events {}: {:?}\n", stringify!($para2_runtime), i);
+
+			use $parachain2_runtime::System;
+			for event in System::events() {
+				println!{"Parachain 2 events when receiving native"}
+				println!{"{:?}", event}
 			}
 			assert_eq!(
-				$parachain2_runtime::Tokens::balance(para1_native_currency_on_para2, &BOB.into()),
+				$parachain2_runtime::Tokens::balance(para1_native_currency_on_para2, &bob_account_id),
 				transfer_amount
 			);
 		});
@@ -583,7 +655,7 @@ macro_rules! transfer_native_token_from_parachain1_to_parachain2_and_back {
 		// Verify ALICE's balance on parachain1 after transfer
 		$parachain1::execute_with(|| {
 			assert_eq!(
-				$parachain1_runtime::Currencies::free_balance(Parachain1CurrencyId::Native, &ALICE.into()),
+				$parachain1_runtime::Currencies::free_balance(Parachain1CurrencyId::Native, &alice_account_id),
 				native_tokens_before - transfer_amount
 			);
 		});
@@ -594,14 +666,14 @@ macro_rules! transfer_native_token_from_parachain1_to_parachain2_and_back {
 
 			// Transfer using the same multilocation
 			assert_ok!(XTokens::transfer_multiasset(
-				$parachain2_runtime::RuntimeOrigin::signed(BOB.into()),
+				$parachain2_runtime::RuntimeOrigin::signed(bob_account_id.clone()),
 				Box::new((asset_location.clone(), transfer_amount).into()),
 				Box::new(
 					MultiLocation {
 						parents: 1,
 						interior: X2(
 							Junction::Parachain($parachain1_id),
-							AccountId32 { network: None, id: ALICE }
+							AccountId32 { network: None, id: alice_account_id.clone().into() }
 						)
 					}
 					.into()
@@ -613,13 +685,18 @@ macro_rules! transfer_native_token_from_parachain1_to_parachain2_and_back {
 				r.event,
 				RuntimeEvent::XTokens(orml_xtokens::Event::TransferredMultiAssets { .. })
 			)));
+
+			for event in System::events() {
+				println!{"Parachain 2 events when sending native back"}
+				println!{"{:?}", event}
+			}
 		});
 
 		// Verify BOB's balance on parachain2 after transfer
 		// Should become the same amount as initial balance before both transfers
 		$parachain2::execute_with(|| {
 			assert_eq!(
-				$parachain2_runtime::Tokens::balance(para1_native_currency_on_para2, &BOB.into()),
+				$parachain2_runtime::Tokens::balance(para1_native_currency_on_para2, &bob_account_id),
 				0
 			);
 		});
@@ -628,17 +705,21 @@ macro_rules! transfer_native_token_from_parachain1_to_parachain2_and_back {
 		// Should become the same amount as initial balance before both transfers
 		$parachain1::execute_with(|| {
 			use $parachain1_runtime::{System, Treasury};
-			for i in System::events().iter() {
-				println!("para 1 events {}: {:?}\n", stringify!($para2_runtime), i);
+
+			for event in System::events() {
+				println!{"Parachain 1 events when receiving native back"}
+				println!{"{:?}", event}
 			}
 			assert_eq!(
-				$parachain1_runtime::Currencies::free_balance(Parachain1CurrencyId::Native, &ALICE.into()),
-				native_tokens_before - $tx_fee
+				$parachain1_runtime::Currencies::free_balance(Parachain1CurrencyId::Native, &alice_account_id),
+				native_tokens_before - $tx_fee,
+				"Sender received incorrect amount when transfer back"
 			);
 
 			assert_eq!(
-				$parachain1_runtime::Currencies::free_balance(Parachain1CurrencyId::Native, &Treasury::account_id()),
-				$tx_fee
+				$parachain1_runtime::Currencies::free_balance(Parachain1CurrencyId::Native, &Treasury::account_id()) - treasury_native_tokens_before,
+				$tx_fee,
+				"Treasury received incorrect fee when transfer back"
 			);
 		});
 	}};
@@ -656,7 +737,9 @@ macro_rules! moonbeam_transfers_token_and_handle_automation {
         $parachain2_id:ident,
 		$expected_fee:ident
     ) => {{
-		use crate::{mock::{units, ALICE}, definitions::xcm_assets};
+		use crate::{mock::units, definitions::xcm_assets};
+		use xcm_emulator::{TestExt, Network};
+		use integration_tests_common::constants::accounts;
 
 		use polkadot_core_primitives::Balance;
 		use xcm::latest::{
@@ -670,7 +753,9 @@ macro_rules! moonbeam_transfers_token_and_handle_automation {
 
 		$mocknet::reset();
 
-		let transfer_amount: Balance = units(100);
+		let alice_account_id = accounts::init_balances()[0].clone();
+
+		let transfer_amount: Balance = units(10);
 		let mut treasury_balance_before: Balance = 0;
 		// get the balance of the treasury before sending the message
 		$parachain1::execute_with(|| {
@@ -683,14 +768,14 @@ macro_rules! moonbeam_transfers_token_and_handle_automation {
 		$parachain2::execute_with(|| {
 			use $parachain2_runtime::{XTokens, Tokens,RuntimeOrigin};
 
-			assert_ok!(Tokens::set_balance(RuntimeOrigin::root().into(), ALICE.clone().into(), Parachain2CurrencyId::Token,transfer_amount, 0));
+			assert_ok!(Tokens::set_balance(RuntimeOrigin::root().into(), alice_account_id.clone(), Parachain2CurrencyId::Token,transfer_amount, 0));
 
 			// We must ensure that the destination Multilocation is of the structure
 			// the intercept excepts so it calls automation pallet
 
 			// TODO replace instance 99 with automation pallet index when added
 			assert_ok!(XTokens::transfer(
-				$parachain2_runtime::RuntimeOrigin::signed(ALICE.into()),
+				$parachain2_runtime::RuntimeOrigin::signed(alice_account_id.clone()),
 				Parachain2CurrencyId::Token,
 				transfer_amount,
 				Box::new(
@@ -722,8 +807,6 @@ macro_rules! moonbeam_transfers_token_and_handle_automation {
 				$parachain1_runtime::Currencies::free_balance(Parachain1CurrencyId::XCM(6), &Treasury::account_id()),
 				$expected_fee
 			);
-
-
 		});
 	}};
 }
diff --git a/runtime/pendulum/Cargo.toml b/runtime/pendulum/Cargo.toml
index 7ca0e6f95..4d9540109 100644
--- a/runtime/pendulum/Cargo.toml
+++ b/runtime/pendulum/Cargo.toml
@@ -12,7 +12,7 @@ version = "0.1.0"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
 
 [dependencies]
 cfg-if = "1.0.0"
@@ -31,78 +31,79 @@ price-chain-extension = { path = "../../chain-extensions/price", default-feature
 treasury-buyout-extension = { path = "../../pallets/treasury-buyout-extension", default-features = false }
 
 # Custom libraries for Spacewalk
-clients-info = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-currency = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-security = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-staking = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-oracle = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-stellar-relay = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-fee = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-vault-registry = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-redeem = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-issue = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-nomination = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-replace = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-issue-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-redeem-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-replace-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-module-vault-registry-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+clients-info = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+currency = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+security = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+staking = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+oracle = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+stellar-relay = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+fee = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+vault-registry = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+redeem = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+issue = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+nomination = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+replace = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-issue-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-redeem-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-replace-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+module-vault-registry-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 module-pallet-staking-rpc-runtime-api = { path = "../../pallets/parachain-staking/rpc/runtime-api", default-features = false }
-pooled-rewards = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
-reward-distribution = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "8b41e633321e472288e8fb635a4fc3cde9236d54" }
+pooled-rewards = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
+reward-distribution = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "580dd307ede65f90f17df6731645b678f3596e0f" }
 
 # Substrate
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.42" }
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.42" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.42" }
-pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-bounties = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-child-bounties = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, optional = true, branch = "release-polkadot-v1.1.0" }
+frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, optional = true, branch = "release-polkadot-v1.1.0" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, optional = true, branch = "release-polkadot-v1.1.0" }
+pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-bounties = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-child-bounties = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-contracts-primitives = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+sp-version = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
 
 # Open Runtime Module Library
-orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
-orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.42" }
-orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.42" }
+orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
+orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v1.1.0" }
 
 # KILT
 parachain-staking = { path = "../../pallets/parachain-staking", default-features = false }
@@ -110,39 +111,39 @@ parachain-staking = { path = "../../pallets/parachain-staking", default-features
 orml-currencies-allowance-extension = { path = "../../pallets/orml-currencies-allowance-extension", default-features = false }
 
 # DIA
-dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v0.9.42" }
-dia-oracle-runtime-api = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v0.9.42" }
+dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v1.1.0" }
+dia-oracle-runtime-api = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v1.1.0" }
 
 # Pendulum Pallets
 vesting-manager = { path = "../../pallets/vesting-manager", default-features = false }
 
 # Polkadot
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot-sdk", package = "polkadot-parachain-primitives", default-features = false, branch = "release-polkadot-v1.1.0"}
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+xcm = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm", default-features = false , branch = "release-polkadot-v1.1.0" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm-builder", default-features = false, branch = "release-polkadot-v1.1.0" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-xcm-executor", default-features = false , branch = "release-polkadot-v1.1.0"}
 
 # Cumulus
-cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
-parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.42" }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
 
 # Zenlink
-zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", default-features = false, branch = "polkadot-v0.9.42" }
-zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", default-features = false, branch = "polkadot-v0.9.42" }
+zenlink-protocol = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", default-features = false, branch = "release-polkadot-v1.1.0" }
+zenlink-protocol-runtime-api = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", default-features = false, branch = "release-polkadot-v1.1.0" }
 
 #Bifrost
-bifrost-farming = { git = "https://github.com/pendulum-chain/bifrost", default-features = false, branch = "upgrade-v0.9.42" }
-bifrost-farming-rpc-runtime-api = { git = "https://github.com/pendulum-chain/bifrost", default-features = false, branch = "upgrade-v0.9.42" }
+bifrost-farming = { git = "https://github.com/bifrost-finance/bifrost", default-features = false, rev = "46ba3689c2fe1011cce0d752cb479e0e522e2e76" }
+bifrost-farming-rpc-runtime-api = { git = "https://github.com/bifrost-finance/bifrost", default-features = false, rev = "46ba3689c2fe1011cce0d752cb479e0e522e2e76" }
 
 [features]
 default = [
@@ -156,6 +157,7 @@ std = [
     "cumulus-pallet-aura-ext/std",
     "cumulus-pallet-dmp-queue/std",
     "cumulus-pallet-parachain-system/std",
+    "cumulus-pallet-parachain-system/parameterized-consensus-hook",
     "cumulus-pallet-xcm/std",
     "cumulus-pallet-xcmp-queue/std",
     "cumulus-primitives-core/std",
@@ -200,7 +202,6 @@ std = [
     "pallet-vesting/std",
     "pallet-xcm/std",
     "parachain-info/std",
-    "polkadot-parachain/std",
     "polkadot-runtime-common/std",
     "runtime-common/std",
     "sp-api/std",
@@ -213,6 +214,7 @@ std = [
     "sp-runtime/std",
     "sp-session/std",
     "sp-std/std",
+    "sp-storage/std",
     "sp-transaction-pool/std",
     "sp-version/std",
     "xcm-builder/std",
@@ -277,6 +279,8 @@ runtime-benchmarks = [
     "parachain-staking/runtime-benchmarks",
     "orml-currencies-allowance-extension/runtime-benchmarks",
     "treasury-buyout-extension/runtime-benchmarks",
+    "dia-oracle/runtime-benchmarks",
+    "dia-oracle-runtime-api/runtime-benchmarks"
 ]
 
 try-runtime = [
diff --git a/runtime/pendulum/src/lib.rs b/runtime/pendulum/src/lib.rs
index 79d0690a8..e6f0258fd 100644
--- a/runtime/pendulum/src/lib.rs
+++ b/runtime/pendulum/src/lib.rs
@@ -1,6 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
-// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
+// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 512.
+#![recursion_limit = "512"]
 
 // Make the WASM binary available.
 #[cfg(feature = "std")]
@@ -42,7 +42,7 @@ use spacewalk_primitives::{
 	UnsignedFixedPoint, UnsignedInner,
 };
 
-#[cfg(any(feature = "runtime-benchmarks", feature = "testing-utils"))]
+#[cfg(any(feature = "runtime-benchmarks"))]
 use oracle::testing_utils::MockDataFeeder;
 
 use sp_std::{fmt::Debug, marker::PhantomData, prelude::*};
@@ -71,14 +71,14 @@ use frame_system::{
 };
 
 use runtime_common::{
-	asset_registry, opaque, AccountId, Amount, AuraId, Balance, BlockNumber, Hash, Index, PoolId,
+	asset_registry, AccountId, Amount, AuraId, Balance, BlockNumber, Hash, Index, PoolId,
 	ProxyType, ReserveIdentifier, Signature, EXISTENTIAL_DEPOSIT, MILLIUNIT, NANOUNIT, UNIT,
 };
 
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 
-use dia_oracle::DiaOracle;
 pub use dia_oracle::dia::AssetId;
+use dia_oracle::DiaOracle;
 pub use issue::{Event as IssueEvent, IssueRequest};
 pub use nomination::Event as NominationEvent;
 use oracle::dia::DiaOracleAdapter;
@@ -93,8 +93,6 @@ use module_oracle_rpc_runtime_api::BalanceWrapper;
 use orml_currencies::BasicCurrencyAdapter;
 use orml_traits::{currency::MutationHooks, parameter_type_with_key};
 
-const CONTRACTS_DEBUG_OUTPUT: bool = true;
-
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
 
@@ -103,6 +101,7 @@ use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
 
 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
+use runtime_common::asset_registry::StringLimit;
 // XCM Imports
 use xcm_executor::XcmExecutor;
 
@@ -140,6 +139,11 @@ pub type SignedExtra = (
 	treasury_buyout_extension::CheckBuyout<Runtime>,
 );
 
+type EventRecord = frame_system::EventRecord<
+	<Runtime as frame_system::Config>::RuntimeEvent,
+	<Runtime as frame_system::Config>::Hash,
+>;
+
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
@@ -153,38 +157,35 @@ parameter_types! {
 	pub const InactiveAccounts: Vec<AccountId> = Vec::new();
 }
 
-use crate::sp_api_hidden_includes_construct_runtime::hidden_include::dispatch::GetStorageVersion;
-use frame_support::pallet_prelude::StorageVersion;
+// To be removed after contracts migrations executes.
+use pallet_contracts::migration::{v11, v12, v13, v14, v15};
+
+// Custom storage version bump
+use frame_support::{
+	pallet_prelude::StorageVersion,
+	traits::{GetStorageVersion, OnRuntimeUpgrade},
+};
 
 pub struct CustomOnRuntimeUpgrade;
-impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
+impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
 		log::info!("Custom on-runtime-upgrade function");
 
 		let mut writes = 0;
 		// WARNING: manually setting the storage version
-		if Contracts::on_chain_storage_version() == 0 {
-			log::info!("Upgrading pallet contract's storage version to 10");
-			StorageVersion::new(10).put::<Contracts>();
-			writes += 1;
-		}
-		if Scheduler::on_chain_storage_version() == 3 {
-			log::info!("Upgrading pallet scheduler's storage version to 4");
-			StorageVersion::new(4).put::<Scheduler>();
+		if ParachainStaking::on_chain_storage_version() == 0 {
+			log::info!("Upgrading parachain staking storage version to 7");
+			StorageVersion::new(7).put::<ParachainStaking>();
 			writes += 1;
 		}
-		if PolkadotXcm::on_chain_storage_version() == 0 {
-			log::info!("Upgrading pallet xcm's storage version to 1");
-			StorageVersion::new(1).put::<PolkadotXcm>();
-			writes += 1;
-		}
-		if AssetRegistry::on_chain_storage_version() == 0 {
-			log::info!("Upgrading pallet asset registry's storage version to 2");
-			StorageVersion::new(2).put::<AssetRegistry>();
+
+		if Bounties::on_chain_storage_version() == 0 {
+			log::info!("Upgrading bounties storage version to 4");
+			StorageVersion::new(4).put::<Bounties>();
 			writes += 1;
 		}
 		// not really a heavy operation
-		<Runtime as frame_system::Config>::DbWeight::get().reads_writes(4, writes)
+		<Runtime as frame_system::Config>::DbWeight::get().reads_writes(2, writes)
 	}
 }
 
@@ -195,11 +196,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	(
-		CustomOnRuntimeUpgrade,
-		pallet_balances::migration::MigrateManyToTrackInactive<Runtime, InactiveAccounts>,
-		pallet_transaction_payment::migrations::v1::ForceSetVersionToV2<Runtime>,
-	),
+	(CustomOnRuntimeUpgrade, pallet_contracts::migration::Migration<Runtime>),
 >;
 
 pub struct ConvertPrice;
@@ -258,7 +255,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("pendulum"),
 	impl_name: create_runtime_str!("pendulum"),
 	authoring_version: 1,
-	spec_version: 17,
+	spec_version: 18,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 10,
@@ -338,51 +335,54 @@ impl Contains<RuntimeCall> for BaseFilter {
 	fn contains(call: &RuntimeCall) -> bool {
 		match call {
 			// These modules are all allowed to be called by transactions:
-			RuntimeCall::Bounties(_)
-			| RuntimeCall::ChildBounties(_)
-			| RuntimeCall::ClientsInfo(_)
-			| RuntimeCall::Treasury(_)
-			| RuntimeCall::Tokens(_)
-			| RuntimeCall::Currencies(_)
-			| RuntimeCall::ParachainStaking(_)
-			| RuntimeCall::Democracy(_)
-			| RuntimeCall::Council(_)
-			| RuntimeCall::TechnicalCommittee(_)
-			| RuntimeCall::System(_)
-			| RuntimeCall::Scheduler(_)
-			| RuntimeCall::Preimage(_)
-			| RuntimeCall::Timestamp(_)
-			| RuntimeCall::Balances(_)
-			| RuntimeCall::Session(_)
-			| RuntimeCall::ParachainSystem(_)
-			| RuntimeCall::XcmpQueue(_)
-			| RuntimeCall::PolkadotXcm(_)
-			| RuntimeCall::DmpQueue(_)
-			| RuntimeCall::Utility(_)
-			| RuntimeCall::Vesting(_)
-			| RuntimeCall::XTokens(_)
-			| RuntimeCall::Multisig(_)
-			| RuntimeCall::Identity(_)
-			| RuntimeCall::Contracts(_)
-			| RuntimeCall::ZenlinkProtocol(_)
-			| RuntimeCall::DiaOracleModule(_)
-			| RuntimeCall::VestingManager(_)
-			| RuntimeCall::TokenAllowance(_)
-			| RuntimeCall::AssetRegistry(_)
-			| RuntimeCall::Fee(_)
-			| RuntimeCall::Issue(_)
-			| RuntimeCall::Nomination(_)
-			| RuntimeCall::Oracle(_)
-			| RuntimeCall::Redeem(_)
-			| RuntimeCall::Replace(_)
-			| RuntimeCall::Security(_)
-			| RuntimeCall::StellarRelay(_)
-			| RuntimeCall::VaultRegistry(_)
-			| RuntimeCall::PooledVaultRewards(_)
-			| RuntimeCall::RewardDistribution(_)
-			| RuntimeCall::Farming(_)
-			| RuntimeCall::Proxy(_)
-			| RuntimeCall::TreasuryBuyoutExtension(_) => true,
+			RuntimeCall::Bounties(_) |
+			RuntimeCall::ChildBounties(_) |
+			RuntimeCall::ClientsInfo(_) |
+			RuntimeCall::Treasury(_) |
+			RuntimeCall::Tokens(_) |
+			RuntimeCall::Currencies(_) |
+			RuntimeCall::ParachainStaking(_) |
+			RuntimeCall::Democracy(_) |
+			RuntimeCall::Council(_) |
+			RuntimeCall::TechnicalCommittee(_) |
+			RuntimeCall::System(_) |
+			RuntimeCall::Scheduler(_) |
+			RuntimeCall::Preimage(_) |
+			RuntimeCall::Timestamp(_) |
+			RuntimeCall::Balances(_) |
+			RuntimeCall::Session(_) |
+			RuntimeCall::ParachainSystem(_) |
+			RuntimeCall::XcmpQueue(_) |
+			RuntimeCall::PolkadotXcm(_) |
+			RuntimeCall::DmpQueue(_) |
+			RuntimeCall::Utility(_) |
+			RuntimeCall::Vesting(_) |
+			RuntimeCall::XTokens(_) |
+			RuntimeCall::Multisig(_) |
+			RuntimeCall::Identity(_) |
+			RuntimeCall::Contracts(_) |
+			RuntimeCall::ZenlinkProtocol(_) |
+			RuntimeCall::DiaOracleModule(_) |
+			RuntimeCall::VestingManager(_) |
+			RuntimeCall::TokenAllowance(_) |
+			RuntimeCall::AssetRegistry(_) |
+			RuntimeCall::Fee(_) |
+			RuntimeCall::Issue(_) |
+			RuntimeCall::Nomination(_) |
+			RuntimeCall::Oracle(_) |
+			RuntimeCall::Redeem(_) |
+			RuntimeCall::Replace(_) |
+			RuntimeCall::Security(_) |
+			RuntimeCall::StellarRelay(_) |
+			RuntimeCall::VaultRegistry(_) |
+			RuntimeCall::PooledVaultRewards(_) |
+			RuntimeCall::RewardDistribution(_) |
+			RuntimeCall::Farming(_) |
+			RuntimeCall::Proxy(_) |
+			RuntimeCall::TreasuryBuyoutExtension(_) |
+			RuntimeCall::ParachainInfo(_) |
+			RuntimeCall::CumulusXcm(_) |
+			RuntimeCall::VaultStaking(_) => true,
 			// All pallets are allowed, but exhaustive match is defensive
 			// in the case of adding new pallets.
 		}
@@ -392,22 +392,20 @@ impl Contains<RuntimeCall> for BaseFilter {
 // Configure FRAME pallets to include in runtime.
 
 impl frame_system::Config for Runtime {
+	/// The Block type used by the runtime. This is used by construct_runtime to retrieve the extrinsics or other block specific data as needed.
+	type Block = Block;
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
 	/// The aggregated dispatch type that is available for extrinsics.
 	type RuntimeCall = RuntimeCall;
 	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
 	type Lookup = AccountIdLookup<AccountId, ()>;
-	/// The index type for storing how many extrinsics an account has signed.
-	type Index = Index;
-	/// The index type for blocks.
-	type BlockNumber = BlockNumber;
+	/// This stores the number of previous transactions associated with a sender account.
+	type Nonce = Index;
 	/// The type for hashing blocks and tries.
 	type Hash = Hash;
 	/// The hashing algorithm used.
 	type Hashing = BlakeTwo256;
-	/// The header type.
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
@@ -503,7 +501,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type MaxHolds = ConstU32<1>;
-	type HoldIdentifier = RuntimeHoldReason;
+	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
 parameter_types! {
@@ -551,6 +549,8 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	#[cfg(feature = "std")]
+	type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
 }
 
 impl parachain_info::Config for Runtime {}
@@ -592,10 +592,16 @@ impl pallet_session::Config for Runtime {
 	type WeightInfo = pallet_session::weights::SubstrateWeight<Runtime>;
 }
 
+parameter_types! {
+	// as per documentation, typical value for this is false "unless this pallet is being augmented by another pallet"
+	// https://github.com/paritytech/polkadot-sdk/blob/release-polkadot-v1.1.0/substrate/frame/aura/src/lib.rs#L111
+	pub const AllowMultipleBlocksPerSlot: bool = false;
+}
 impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
 	type MaxAuthorities = MaxAuthorities;
+	type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot;
 }
 
 parameter_types! {
@@ -886,7 +892,8 @@ impl orml_asset_registry::Config for Runtime {
 	type AuthorityOrigin = asset_registry::AssetAuthority;
 	type AssetProcessor = asset_registry::CustomAssetProcessor;
 	type Balance = Balance;
-	type WeightInfo = weights::orml_asset_registry::WeightInfo<Runtime>;
+	type WeightInfo = weights::orml_asset_registry::SubstrateWeight<Runtime>;
+	type StringLimit = StringLimit;
 }
 
 parameter_types! {
@@ -985,10 +992,11 @@ const fn deposit(items: u32, bytes: u32) -> Balance {
 
 parameter_types! {
 	pub const DepositPerItem: Balance = deposit(1, 0);
-	pub const DepositPerByte: Balance = deposit(0, 1);
-	// Fallback value if storage deposit limit not set by the user
-	pub const DefaultDepositLimit: Balance = deposit(1024, 1024 * 1024);
+    pub const DepositPerByte: Balance = deposit(0, 1);
+    pub const DefaultDepositLimit: Balance = deposit(1024, 1024 * 1024);
 	pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
+	pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30);
+	pub const MaxDelegateDependencies: u32 = 32;
 }
 
 impl pallet_contracts::Config for Runtime {
@@ -1012,6 +1020,18 @@ impl pallet_contracts::Config for Runtime {
 	type UnsafeUnstableInterface = ConstBool<true>;
 	type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
 	type DefaultDepositLimit = DefaultDepositLimit;
+	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
+	type MaxDelegateDependencies = MaxDelegateDependencies;
+	type RuntimeHoldReason = RuntimeHoldReason;
+	type Migrations = (
+		v11::Migration<Self>,
+		v12::Migration<Runtime, Balances>,
+		v13::Migration<Self>,
+		v14::Migration<Self, Balances>,
+		v15::Migration<Self>,
+	);
+	type Debug = ();
+	type Environment = ();
 }
 
 impl pallet_insecure_randomness_collective_flip::Config for Runtime {}
@@ -1049,7 +1069,7 @@ impl dia_oracle::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
 	type AuthorityId = dia_oracle::crypto::DiaAuthId;
-	type WeightInfo = dia_oracle::weights::DiaWeightInfo<Runtime>;
+	type WeightInfo = weights::dia_oracle::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -1065,7 +1085,7 @@ impl farming::Config for Runtime {
 	type CurrencyId = CurrencyId;
 	type MultiCurrency = Currencies;
 	type ControlOrigin = EnsureRoot<AccountId>;
-	type WeightInfo = farming::weights::BifrostWeight<Runtime>;
+	type WeightInfo = ();
 	type TreasuryAccount = PendulumTreasuryAccount;
 	type Keeper = FarmingKeeperPalletId;
 	type RewardIssuer = FarmingRewardIssuerPalletId;
@@ -1182,7 +1202,7 @@ pub struct DataFeederBenchmark<K, V, A>(PhantomData<(K, V, A)>);
 
 #[cfg(feature = "runtime-benchmarks")]
 impl<K, V, A> orml_traits::DataFeeder<K, V, A> for DataFeederBenchmark<K, V, A> {
-	fn feed_value(_who: A, _key: K, _value: V) -> sp_runtime::DispatchResult {
+	fn feed_value(_who: Option<A>, _key: K, _value: V) -> sp_runtime::DispatchResult {
 		Ok(())
 	}
 }
@@ -1429,89 +1449,84 @@ impl treasury_buyout_extension::Config for Runtime {
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = opaque::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Runtime
 	{
 		// System support stuff.
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
-		ParachainSystem: cumulus_pallet_parachain_system::{
-			Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned,
-		} = 1,
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
-		ParachainInfo: parachain_info::{Pallet, Storage, Config} = 3,
+		System: frame_system = 0,
+		ParachainSystem: cumulus_pallet_parachain_system = 1,
+		Timestamp: pallet_timestamp = 2,
+		ParachainInfo: parachain_info = 3,
 
 		// Monetary stuff.
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 10,
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 11,
+		Balances: pallet_balances = 10,
+		TransactionPayment: pallet_transaction_payment = 11,
 
 		// Governance
-		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>} = 13,
-		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Config<T>, Origin<T>, Event<T>} = 14,
-		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Config<T>, Origin<T>,  Event<T>} = 15,
-		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 16,
-		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 17,
-		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 18,
-		Treasury: pallet_treasury::{Pallet, Call, Storage, Event<T>} = 19,
-		Bounties: pallet_bounties::{Pallet, Call, Storage, Event<T>} = 20,
-		ChildBounties: pallet_child_bounties::{Pallet, Call, Storage, Event<T>} = 21,
-		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 22,
+		Democracy: pallet_democracy= 13,
+		Council: pallet_collective::<Instance1> = 14,
+		TechnicalCommittee: pallet_collective::<Instance2> = 15,
+		Scheduler: pallet_scheduler = 16,
+		Preimage: pallet_preimage = 17,
+		Multisig: pallet_multisig = 18,
+		Treasury: pallet_treasury = 19,
+		Bounties: pallet_bounties = 20,
+		ChildBounties: pallet_child_bounties = 21,
+		Proxy: pallet_proxy = 22,
 
 		// Consensus support.
 		// The following order MUST NOT be changed: Aura -> Session -> Staking -> Authorship -> AuraExt
 		// Dependencies: AuraExt on Aura, Authorship and Session on ParachainStaking
-		Aura: pallet_aura::{Pallet, Storage, Config<T>} = 33,
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 32,
-		ParachainStaking: parachain_staking::{Pallet, Call, Storage, Event<T>, Config<T>} = 35,
-		Authorship: pallet_authorship::{Pallet, Storage} = 30,
-		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 34,
+		Aura: pallet_aura = 33,
+		Session: pallet_session = 32,
+		ParachainStaking: parachain_staking = 35,
+		Authorship: pallet_authorship = 30,
+		AuraExt: cumulus_pallet_aura_ext = 34,
 
 		// XCM helpers.
-		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 40,
-		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config} = 41,
-		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 42,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 43,
+		XcmpQueue: cumulus_pallet_xcmp_queue = 40,
+		PolkadotXcm: pallet_xcm = 41,
+		CumulusXcm: cumulus_pallet_xcm = 42,
+		DmpQueue: cumulus_pallet_dmp_queue = 43,
 
 		// Amendments
-		Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 50,
-		Utility: pallet_utility::{Pallet, Call, Event} = 51,
-		Currencies: orml_currencies::{Pallet, Call, Storage} = 52,
-		Tokens: orml_tokens::{Pallet, Call, Storage, Event<T>} = 53,
-		XTokens: orml_xtokens::{Pallet, Storage, Call, Event<T>} = 54,
-		Identity: pallet_identity::{Pallet, Storage, Call, Event<T>} = 55,
-		Contracts: pallet_contracts::{Pallet, Storage, Call, Event<T>} = 56,
-		RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip::{Pallet, Storage} = 57,
-		DiaOracleModule: dia_oracle::{Pallet, Config<T>, Storage, Call, Event<T>} = 58,
+		Vesting: pallet_vesting = 50,
+		Utility: pallet_utility = 51,
+		Currencies: orml_currencies = 52,
+		Tokens: orml_tokens = 53,
+		XTokens: orml_xtokens = 54,
+		Identity: pallet_identity = 55,
+		Contracts: pallet_contracts = 56,
+		RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip = 57,
+		DiaOracleModule: dia_oracle = 58,
 
 		// Zenlink
 		ZenlinkProtocol: zenlink_protocol::{Pallet, Call, Storage, Event<T>}  = 59,
 
 		// Spacewalk pallets
-		Currency: currency::{Pallet} = 60,
-		Fee: fee::{Pallet, Call, Config<T>, Storage} = 61,
-		Issue: issue::{Pallet, Call, Config<T>, Storage, Event<T>} = 62,
-		Nomination: nomination::{Pallet, Call, Config, Storage, Event<T>} = 63,
-		Oracle: oracle::{Pallet, Call, Config, Storage, Event<T>} = 64,
-		Redeem: redeem::{Pallet, Call, Config<T>, Storage, Event<T>} = 65,
-		Replace: replace::{Pallet, Call, Config<T>, Storage, Event<T>} = 66,
-		Security: security::{Pallet, Call, Config, Storage, Event<T>} = 67,
-		StellarRelay: stellar_relay::{Pallet, Call, Config<T>, Storage, Event<T>} = 68,
-		VaultRegistry: vault_registry::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned} = 69,
-		PooledVaultRewards: pooled_rewards::{Pallet, Call, Storage, Event<T>} = 70,
-		VaultStaking: staking::{Pallet, Storage, Event<T>} = 71,
-		ClientsInfo: clients_info::{Pallet, Call, Storage, Event<T>} = 72,
-		RewardDistribution: reward_distribution::{Pallet, Call, Storage, Event<T>} = 73,
-
-		TokenAllowance: orml_currencies_allowance_extension::{Pallet, Storage, Call, Event<T>} = 80,
-		TreasuryBuyoutExtension: treasury_buyout_extension::{Pallet, Storage, Call, Event<T>} = 82,
+		Currency: currency = 60,
+		Fee: fee = 61,
+		Issue: issue = 62,
+		Nomination: nomination = 63,
+		Oracle: oracle = 64,
+		Redeem: redeem = 65,
+		Replace: replace = 66,
+		Security: security = 67,
+		StellarRelay: stellar_relay = 68,
+		VaultRegistry: vault_registry = 69,
+		PooledVaultRewards: pooled_rewards = 70,
+		VaultStaking: staking = 71,
+		ClientsInfo: clients_info = 72,
+		RewardDistribution: reward_distribution = 73,
+
+		TokenAllowance: orml_currencies_allowance_extension = 80,
+		TreasuryBuyoutExtension: treasury_buyout_extension = 82,
 
 		//Farming
-		Farming: farming::{Pallet, Call, Storage, Event<T>} = 90,
+		Farming: farming = 90,
 		// Asset Metadata
-		AssetRegistry: orml_asset_registry::{Pallet, Storage, Call, Event<T>, Config<T>} = 91,
+		AssetRegistry: orml_asset_registry = 91,
 
-		VestingManager: vesting_manager::{Pallet, Call, Event<T>} = 100
+		VestingManager: vesting_manager = 100
 	}
 );
 
@@ -1545,6 +1560,8 @@ mod benches {
 
 		[orml_currencies_allowance_extension, TokenAllowance]
 		[treasury_buyout_extension, TreasuryBuyoutExtension]
+
+		[dia_oracle, DiaOracleModule]
 	);
 }
 
@@ -1682,11 +1699,11 @@ impl_runtime_apis! {
 
 
 	impl dia_oracle_runtime_api::DiaOracleApi<Block> for Runtime{
-		fn get_value(blockchain: frame_support::sp_std::vec::Vec<u8>, symbol: frame_support::sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::PriceInfo, sp_runtime::DispatchError>{
+		fn get_value(blockchain: sp_std::vec::Vec<u8>, symbol: sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::PriceInfo, sp_runtime::DispatchError>{
 			DiaOracleModule::get_value(blockchain, symbol)
 		}
 
-		fn get_coin_info(blockchain: frame_support::sp_std::vec::Vec<u8>, symbol: frame_support::sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::CoinInfo,sp_runtime::DispatchError>{
+		fn get_coin_info(blockchain: sp_std::vec::Vec<u8>, symbol: sp_std::vec::Vec<u8>)-> Result<dia_oracle_runtime_api::CoinInfo,sp_runtime::DispatchError>{
 			DiaOracleModule::get_coin_info(blockchain, symbol)
 		}
 	}
@@ -1804,8 +1821,8 @@ impl_runtime_apis! {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey};
-
+			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch};
+			use sp_storage::TrackedStorageKey;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use baseline::Pallet as BaselineBench;
 
@@ -1935,7 +1952,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_contracts::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>
+	impl pallet_contracts::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash, EventRecord>
 		for Runtime
 	{
 		fn call(
@@ -1945,7 +1962,7 @@ impl_runtime_apis! {
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			input_data: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractExecResult<Balance> {
+		) -> pallet_contracts_primitives::ContractExecResult<Balance, EventRecord> {
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
 			Contracts::bare_call(
 				origin,
@@ -1954,7 +1971,8 @@ impl_runtime_apis! {
 				gas_limit,
 				storage_deposit_limit,
 				input_data,
-				CONTRACTS_DEBUG_OUTPUT,
+				pallet_contracts::DebugInfo::UnsafeDebug,
+				pallet_contracts::CollectEvents::UnsafeCollect,
 				pallet_contracts::Determinism::Enforced,
 			)
 		}
@@ -1967,7 +1985,7 @@ impl_runtime_apis! {
 			code: pallet_contracts_primitives::Code<Hash>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance>
+		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance, EventRecord>
 		{
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
 			Contracts::bare_instantiate(
@@ -1978,7 +1996,8 @@ impl_runtime_apis! {
 				code,
 				data,
 				salt,
-				CONTRACTS_DEBUG_OUTPUT
+				pallet_contracts::DebugInfo::UnsafeDebug,
+				pallet_contracts::CollectEvents::UnsafeCollect,
 			)
 		}
 
@@ -2022,6 +2041,7 @@ impl_runtime_apis! {
 #[allow(dead_code)]
 struct CheckInherents;
 
+#[allow(deprecated)]
 impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
 	fn check_inherents(
 		block: &Block,
diff --git a/runtime/pendulum/src/weights/dia_oracle.rs b/runtime/pendulum/src/weights/dia_oracle.rs
new file mode 100644
index 000000000..29ce71501
--- /dev/null
+++ b/runtime/pendulum/src/weights/dia_oracle.rs
@@ -0,0 +1,135 @@
+
+//! Autogenerated weights for dia_oracle
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+
+// Executed Command:
+// ../target/production/pendulum-node
+// benchmark
+// pallet
+// --chain
+// pendulum
+// --wasm-execution=compiled
+// --pallet
+// dia_oracle
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+// --output
+// ../runtime/pendulum/src/weights/dia_oracle.rs
+// --template
+// frame-weight-template.hbs
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for dia_oracle using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> dia_oracle::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::SupportedCurrencies` (r:1 w:1)
+	/// Proof: `DiaOracleModule::SupportedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn add_currency() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `402`
+		//  Estimated: `3867`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 3867)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::SupportedCurrencies` (r:1 w:0)
+	/// Proof: `DiaOracleModule::SupportedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn remove_currency() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `402`
+		//  Estimated: `3867`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 3867)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:1)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn authorize_account() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `232`
+		//  Estimated: `3697`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 3697)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:2 w:1)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn authorize_account_signed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `287`
+		//  Estimated: `6227`
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 6227)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn deauthorize_account() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `232`
+		//  Estimated: `3697`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 3697)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:2 w:1)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn deauthorize_account_signed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `287`
+		//  Estimated: `6227`
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 6227)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::CoinInfosMap` (r:0 w:1)
+	/// Proof: `DiaOracleModule::CoinInfosMap` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn set_updated_coin_infos() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `287`
+		//  Estimated: `3752`
+		// Minimum execution time: 9_864_000_000 picoseconds.
+		Weight::from_parts(9_973_000_000, 3752)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `DiaOracleModule::AuthorizedAccounts` (r:1 w:0)
+	/// Proof: `DiaOracleModule::AuthorizedAccounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `DiaOracleModule::BatchingApi` (r:0 w:1)
+	/// Proof: `DiaOracleModule::BatchingApi` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn set_batching_api() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `287`
+		//  Estimated: `3752`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 3752)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+}
\ No newline at end of file
diff --git a/runtime/pendulum/src/weights/fee.rs b/runtime/pendulum/src/weights/fee.rs
index 87113d6cb..d0ec65cb4 100644
--- a/runtime/pendulum/src/weights/fee.rs
+++ b/runtime/pendulum/src/weights/fee.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for fee
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // fee
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/fee.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,64 +38,64 @@ use core::marker::PhantomData;
 /// Weights for fee using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> fee::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Fee IssueFee (r:0 w:1)
-	/// Proof Skipped: Fee IssueFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::IssueFee` (r:0 w:1)
+	/// Proof: `Fee::IssueFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_issue_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee IssueGriefingCollateral (r:0 w:1)
-	/// Proof Skipped: Fee IssueGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::IssueGriefingCollateral` (r:0 w:1)
+	/// Proof: `Fee::IssueGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_issue_griefing_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee RedeemFee (r:0 w:1)
-	/// Proof Skipped: Fee RedeemFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::RedeemFee` (r:0 w:1)
+	/// Proof: `Fee::RedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_redeem_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee PremiumRedeemFee (r:0 w:1)
-	/// Proof Skipped: Fee PremiumRedeemFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::PremiumRedeemFee` (r:0 w:1)
+	/// Proof: `Fee::PremiumRedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_premium_redeem_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee PunishmentFee (r:0 w:1)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::PunishmentFee` (r:0 w:1)
+	/// Proof: `Fee::PunishmentFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_punishment_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Fee ReplaceGriefingCollateral (r:0 w:1)
-	/// Proof Skipped: Fee ReplaceGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Fee::ReplaceGriefingCollateral` (r:0 w:1)
+	/// Proof: `Fee::ReplaceGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_replace_griefing_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/pendulum/src/weights/issue.rs b/runtime/pendulum/src/weights/issue.rs
index bcf3d7fbb..b034e7e03 100644
--- a/runtime/pendulum/src/weights/issue.rs
+++ b/runtime/pendulum/src/weights/issue.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for issue
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Marcels-MBP`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // issue
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/issue.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,97 +38,97 @@ use core::marker::PhantomData;
 /// Weights for issue using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> issue::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Issue LimitVolumeAmount (r:1 w:0)
-	/// Proof: Issue LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:3 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee IssueGriefingCollateral (r:1 w:0)
-	/// Proof Skipped: Fee IssueGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Issue IssueMinimumTransferAmount (r:1 w:0)
-	/// Proof: Issue IssueMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee IssueFee (r:1 w:0)
-	/// Proof Skipped: Fee IssueFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Security Nonce (r:1 w:1)
-	/// Proof Skipped: Security Nonce (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry VaultStellarPublicKey (r:1 w:0)
-	/// Proof Skipped: VaultRegistry VaultStellarPublicKey (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Issue IssuePeriod (r:1 w:0)
-	/// Proof: Issue IssuePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Issue IssueRequests (r:0 w:1)
-	/// Proof: Issue IssueRequests (max_values: None, max_size: Some(339), added: 2814, mode: MaxEncodedLen)
+	/// Storage: `Issue::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Issue::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:3 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::IssueGriefingCollateral` (r:1 w:0)
+	/// Proof: `Fee::IssueGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IssueMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Issue::IssueMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Fee::IssueFee` (r:1 w:0)
+	/// Proof: `Fee::IssueFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::Nonce` (r:1 w:1)
+	/// Proof: `Security::Nonce` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::ParentHash` (r:1 w:0)
+	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::VaultStellarPublicKey` (r:1 w:0)
+	/// Proof: `VaultRegistry::VaultStellarPublicKey` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Issue::IssuePeriod` (r:1 w:0)
+	/// Proof: `Issue::IssuePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IssueRequests` (r:0 w:1)
+	/// Proof: `Issue::IssueRequests` (`max_values`: None, `max_size`: Some(339), added: 2814, mode: `MaxEncodedLen`)
 	fn request_issue() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2060`
-		//  Estimated: `10475`
-		// Minimum execution time: 95_000_000 picoseconds.
-		Weight::from_parts(96_000_000, 10475)
+		//  Estimated: `11106`
+		// Minimum execution time: 87_000_000 picoseconds.
+		Weight::from_parts(90_000_000, 11106)
 			.saturating_add(T::DbWeight::get().reads(18_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Issue IssueRequests (r:1 w:1)
-	/// Proof: Issue IssueRequests (max_values: None, max_size: Some(339), added: 2814, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:1 w:0)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Validators (r:1 w:0)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:0)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee IssueFee (r:1 w:0)
-	/// Proof Skipped: Fee IssueFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Issue LimitVolumeAmount (r:1 w:0)
-	/// Proof: Issue LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: AssetRegistry Metadata (r:1 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Issue::IssueRequests` (r:1 w:1)
+	/// Proof: `Issue::IssueRequests` (`max_values`: None, `max_size`: Some(339), added: 2814, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:1 w:0)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Validators` (r:1 w:0)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:0)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Fee::IssueFee` (r:1 w:0)
+	/// Proof: `Fee::IssueFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Issue::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Issue::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:2 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
 	fn execute_issue() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2498`
 		//  Estimated: `71867`
-		// Minimum execution time: 8_239_000_000 picoseconds.
-		Weight::from_parts(8_285_000_000, 71867)
+		// Minimum execution time: 7_727_000_000 picoseconds.
+		Weight::from_parts(7_917_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(11_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Issue IssueRequests (r:1 w:1)
-	/// Proof: Issue IssueRequests (max_values: None, max_size: Some(339), added: 2814, mode: MaxEncodedLen)
-	/// Storage: Issue IssuePeriod (r:1 w:0)
-	/// Proof: Issue IssuePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Issue::IssueRequests` (r:1 w:1)
+	/// Proof: `Issue::IssueRequests` (`max_values`: None, `max_size`: Some(339), added: 2814, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IssuePeriod` (r:1 w:0)
+	/// Proof: `Issue::IssuePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn cancel_issue() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1303`
 		//  Estimated: `4768`
-		// Minimum execution time: 35_000_000 picoseconds.
-		Weight::from_parts(36_000_000, 4768)
+		// Minimum execution time: 32_000_000 picoseconds.
+		Weight::from_parts(33_000_000, 4768)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Issue IssuePeriod (r:0 w:1)
-	/// Proof: Issue IssuePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Issue::IssuePeriod` (r:0 w:1)
+	/// Proof: `Issue::IssuePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_issue_period() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
@@ -138,28 +137,28 @@ impl<T: frame_system::Config> issue::WeightInfo for SubstrateWeight<T> {
 		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Issue LimitVolumeAmount (r:0 w:1)
-	/// Proof: Issue LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Issue LimitVolumeCurrencyId (r:0 w:1)
-	/// Proof: Issue LimitVolumeCurrencyId (max_values: Some(1), max_size: Some(46), added: 541, mode: MaxEncodedLen)
-	/// Storage: Issue IntervalLength (r:0 w:1)
-	/// Proof: Issue IntervalLength (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Issue::LimitVolumeAmount` (r:0 w:1)
+	/// Proof: `Issue::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::LimitVolumeCurrencyId` (r:0 w:1)
+	/// Proof: `Issue::LimitVolumeCurrencyId` (`max_values`: Some(1), `max_size`: Some(46), added: 541, mode: `MaxEncodedLen`)
+	/// Storage: `Issue::IntervalLength` (r:0 w:1)
+	/// Proof: `Issue::IntervalLength` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn rate_limit_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_000_000 picoseconds.
+		// Minimum execution time: 8_000_000 picoseconds.
 		Weight::from_parts(9_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Issue IssueMinimumTransferAmount (r:0 w:1)
-	/// Proof: Issue IssueMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Issue::IssueMinimumTransferAmount` (r:0 w:1)
+	/// Proof: `Issue::IssueMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn minimum_transfer_amount_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/pendulum/src/weights/mod.rs b/runtime/pendulum/src/weights/mod.rs
index 8bfc1d9c0..5206c8949 100644
--- a/runtime/pendulum/src/weights/mod.rs
+++ b/runtime/pendulum/src/weights/mod.rs
@@ -17,21 +17,22 @@
 
 //! Expose the auto generated weight files.
 pub mod block_weights;
+pub mod dia_oracle;
 pub mod extrinsic_weights;
-pub mod pallet_xcm;
-pub mod paritydb_weights;
-pub mod rocksdb_weights;
-pub mod parachain_staking;
-pub mod orml_asset_registry;
-pub mod orml_currencies_allowance_extension;
-pub mod treasury_buyout_extension;
 pub mod fee;
 pub mod issue;
 pub mod nomination;
 pub mod oracle;
+pub mod orml_asset_registry;
+pub mod orml_currencies_allowance_extension;
+pub mod pallet_xcm;
+pub mod parachain_staking;
+pub mod paritydb_weights;
 pub mod redeem;
 pub mod replace;
+pub mod rocksdb_weights;
 pub mod stellar_relay;
+pub mod treasury_buyout_extension;
 pub mod vault_registry;
 
 pub use block_weights::constants::BlockExecutionWeight;
diff --git a/runtime/pendulum/src/weights/nomination.rs b/runtime/pendulum/src/weights/nomination.rs
index 80b51f0e9..16ed465f4 100644
--- a/runtime/pendulum/src/weights/nomination.rs
+++ b/runtime/pendulum/src/weights/nomination.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for nomination
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-29, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // nomination
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/nomination.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,190 +38,194 @@ use core::marker::PhantomData;
 /// Weights for nomination using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> nomination::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Nomination NominationEnabled (r:0 w:1)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Nomination::NominationEnabled` (r:0 w:1)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn set_nomination_enabled() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Nomination NominationEnabled (r:1 w:0)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Nomination Vaults (r:1 w:1)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::NominationEnabled` (r:1 w:0)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::Vaults` (r:1 w:1)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
 	fn opt_in_to_nomination() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `780`
 		//  Estimated: `4245`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 4245)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 4245)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Nomination Vaults (r:1 w:1)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:1)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:2 w:2)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:2 w:2)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:2 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:2 w:2)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:2 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:2 w:2)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:2 w:2)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::Vaults` (r:1 w:1)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:1)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:2 w:2)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:2 w:2)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:2 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:2 w:2)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:2 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:2 w:2)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:2 w:2)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn opt_out_of_nomination() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2427`
-		//  Estimated: `8367`
-		// Minimum execution time: 232_000_000 picoseconds.
-		Weight::from_parts(242_000_000, 8367)
-			.saturating_add(T::DbWeight::get().reads(25_u64))
+		//  Measured:  `2531`
+		//  Estimated: `8471`
+		// Minimum execution time: 171_000_000 picoseconds.
+		Weight::from_parts(186_000_000, 8471)
+			.saturating_add(T::DbWeight::get().reads(27_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Nomination NominationEnabled (r:1 w:0)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Nomination Vaults (r:1 w:0)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:2 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:2 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::NominationEnabled` (r:1 w:0)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Nomination::Vaults` (r:1 w:0)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:2 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:2 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn deposit_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `3139`
 		//  Estimated: `9079`
-		// Minimum execution time: 227_000_000 picoseconds.
-		Weight::from_parts(253_000_000, 9079)
+		// Minimum execution time: 161_000_000 picoseconds.
+		Weight::from_parts(171_000_000, 9079)
 			.saturating_add(T::DbWeight::get().reads(28_u64))
 			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Nomination NominationEnabled (r:1 w:0)
-	/// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Nomination Vaults (r:1 w:0)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Nomination::NominationEnabled` (r:1 w:0)
+	/// Proof: `Nomination::NominationEnabled` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Nomination::Vaults` (r:1 w:0)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn withdraw_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3325`
-		//  Estimated: `6790`
-		// Minimum execution time: 209_000_000 picoseconds.
-		Weight::from_parts(271_000_000, 6790)
-			.saturating_add(T::DbWeight::get().reads(24_u64))
+		//  Measured:  `3429`
+		//  Estimated: `7734`
+		// Minimum execution time: 157_000_000 picoseconds.
+		Weight::from_parts(167_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(26_u64))
 			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/pendulum/src/weights/oracle.rs b/runtime/pendulum/src/weights/oracle.rs
index b9877bd86..0ba88ae81 100644
--- a/runtime/pendulum/src/weights/oracle.rs
+++ b/runtime/pendulum/src/weights/oracle.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for oracle
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // oracle
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/oracle.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,10 +38,10 @@ use core::marker::PhantomData;
 /// Weights for oracle using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> oracle::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Timestamp Now (r:0 w:1)
-	/// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Timestamp DidUpdate (r:0 w:1)
-	/// Proof: Timestamp DidUpdate (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Timestamp::Now` (r:0 w:1)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Timestamp::DidUpdate` (r:0 w:1)
+	/// Proof: `Timestamp::DidUpdate` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn on_initialize() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
@@ -51,24 +50,24 @@ impl<T: frame_system::Config> oracle::WeightInfo for SubstrateWeight<T> {
 		Weight::from_parts(1_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Oracle OracleKeys (r:0 w:1)
-	/// Proof Skipped: Oracle OracleKeys (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Oracle::OracleKeys` (r:0 w:1)
+	/// Proof: `Oracle::OracleKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn update_oracle_keys() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Oracle MaxDelay (r:0 w:1)
-	/// Proof Skipped: Oracle MaxDelay (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Oracle::MaxDelay` (r:0 w:1)
+	/// Proof: `Oracle::MaxDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_max_delay() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/pendulum/src/weights/orml_asset_registry.rs b/runtime/pendulum/src/weights/orml_asset_registry.rs
index aabdf34d8..745626913 100644
--- a/runtime/pendulum/src/weights/orml_asset_registry.rs
+++ b/runtime/pendulum/src/weights/orml_asset_registry.rs
@@ -1,22 +1,21 @@
 
-//! Autogenerated weights for `orml_asset_registry`
+//! Autogenerated weights for orml_asset_registry
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Marcels-MBP`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// *
+// orml_asset_registry
 // --extrinsic
 // *
 // --steps
@@ -24,45 +23,46 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/orml_asset_registry.rs
+// --template
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
+#![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
 
-/// Weight functions for `orml_asset_registry`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> orml_asset_registry::WeightInfo for WeightInfo<T> {
-	/// Storage: AssetRegistry Metadata (r:1 w:1)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry LocationToAssetId (r:1 w:1)
-	/// Proof Skipped: AssetRegistry LocationToAssetId (max_values: None, max_size: None, mode: Measured)
+/// Weights for orml_asset_registry using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> orml_asset_registry::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:1)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationToAssetId` (r:1 w:1)
+	/// Proof: `AssetRegistry::LocationToAssetId` (`max_values`: None, `max_size`: Some(656), added: 3131, mode: `MaxEncodedLen`)
 	fn register_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66`
-		//  Estimated: `7062`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 7062))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `104`
+		//  Estimated: `4362`
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 4362)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: AssetRegistry Metadata (r:1 w:1)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: AssetRegistry LocationToAssetId (r:1 w:2)
-	/// Proof Skipped: AssetRegistry LocationToAssetId (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:1)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationToAssetId` (r:1 w:2)
+	/// Proof: `AssetRegistry::LocationToAssetId` (`max_values`: None, `max_size`: Some(656), added: 3131, mode: `MaxEncodedLen`)
 	fn update_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `707`
-		//  Estimated: `8344`
-		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(26_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 8344))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `767`
+		//  Estimated: `4362`
+		// Minimum execution time: 22_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 4362)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	fn set_asset_location() -> Weight {
 		// Proof Size summary in bytes:
@@ -70,6 +70,5 @@ impl<T: frame_system::Config> orml_asset_registry::WeightInfo for WeightInfo<T>
 		//  Estimated: `0`
 		// Minimum execution time: 0_000 picoseconds.
 		Weight::from_parts(0, 0)
-			.saturating_add(Weight::from_parts(0, 0))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/pendulum/src/weights/orml_currencies_allowance_extension.rs b/runtime/pendulum/src/weights/orml_currencies_allowance_extension.rs
index 1c2a11555..375eeed1c 100644
--- a/runtime/pendulum/src/weights/orml_currencies_allowance_extension.rs
+++ b/runtime/pendulum/src/weights/orml_currencies_allowance_extension.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for orml_currencies_allowance_extension
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // orml_currencies_allowance_extension
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/orml_currencies_allowance_extension.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -38,59 +37,59 @@ use core::marker::PhantomData;
 
 /// Weights for orml_currencies_allowance_extension using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> orml_currencies_allowance_extension::default_weights::WeightInfo for SubstrateWeight<T> {
-	/// Storage: TokenAllowance AllowedCurrencies (r:2 w:1)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
+impl<T: frame_system::Config> orml_currencies_allowance_extension::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:2 w:1)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `n` is `[1, 256]`.
 	fn add_allowed_currencies(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `6082`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(16_105_645, 6082)
-			// Standard Error: 2_439
-			.saturating_add(Weight::from_parts(1_339_480, 0).saturating_mul(n.into()))
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_076_531, 6082)
+			// Standard Error: 1_265
+			.saturating_add(Weight::from_parts(1_035_865, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TokenAllowance AllowedCurrencies (r:0 w:1)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:0 w:1)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `n` is `[1, 256]`.
 	fn remove_allowed_currencies(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(10_824_769, 0)
-			// Standard Error: 3_481
-			.saturating_add(Weight::from_parts(1_300_759, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(7_996_170, 0)
+			// Standard Error: 1_419
+			.saturating_add(Weight::from_parts(1_016_605, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TokenAllowance AllowedCurrencies (r:1 w:0)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TokenAllowance Approvals (r:0 w:1)
-	/// Proof Skipped: TokenAllowance Approvals (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:1 w:0)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `TokenAllowance::Approvals` (r:0 w:1)
+	/// Proof: `TokenAllowance::Approvals` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn approve() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `184`
 		//  Estimated: `3649`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(19_000_000, 3649)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 3649)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TokenAllowance AllowedCurrencies (r:1 w:0)
-	/// Proof Skipped: TokenAllowance AllowedCurrencies (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TokenAllowance Approvals (r:1 w:1)
-	/// Proof Skipped: TokenAllowance Approvals (max_values: None, max_size: None, mode: Measured)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `TokenAllowance::AllowedCurrencies` (r:1 w:0)
+	/// Proof: `TokenAllowance::AllowedCurrencies` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `TokenAllowance::Approvals` (r:1 w:1)
+	/// Proof: `TokenAllowance::Approvals` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_from() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `581`
 		//  Estimated: `6196`
-		// Minimum execution time: 72_000_000 picoseconds.
-		Weight::from_parts(74_000_000, 6196)
+		// Minimum execution time: 55_000_000 picoseconds.
+		Weight::from_parts(56_000_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
diff --git a/runtime/pendulum/src/weights/pallet_xcm.rs b/runtime/pendulum/src/weights/pallet_xcm.rs
index c0d3ba948..8bab1daaf 100644
--- a/runtime/pendulum/src/weights/pallet_xcm.rs
+++ b/runtime/pendulum/src/weights/pallet_xcm.rs
@@ -1,22 +1,21 @@
 
-//! Autogenerated weights for `pallet_xcm`
+//! Autogenerated weights for pallet_xcm
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `pop-os`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// pallet-xcm
+// pallet_xcm
 // --extrinsic
 // *
 // --steps
@@ -24,251 +23,237 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/pallet_xcm.rs
+// --template
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_xcm`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+/// Weights for pallet_xcm using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_xcm::WeightInfo for SubstrateWeight<T> {
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 40_032_000 picoseconds.
-		Weight::from_parts(40_460_000, 0)
-			.saturating_add(Weight::from_parts(0, 3610))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `245`
+		//  Estimated: `3710`
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 3710)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Benchmark Override (r:0 w:0)
-	/// Proof Skipped: Benchmark Override (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Benchmark::Override` (r:0 w:0)
+	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn teleport_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)
-			.saturating_add(Weight::from_parts(0, 0))
 	}
-	/// Storage: ParachainInfo ParachainId (r:1 w:0)
-	/// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `32`
 		//  Estimated: `1489`
-		// Minimum execution time: 37_188_000 picoseconds.
-		Weight::from_parts(39_629_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 1489)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 14_427_000 picoseconds.
-		Weight::from_parts(30_136_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 	}
-	/// Storage: PolkadotXcm SupportedVersion (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_xcm_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 15_126_000 picoseconds.
-		Weight::from_parts(15_296_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: PolkadotXcm SafeXcmVersion (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:0 w:1)
+	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn force_default_xcm_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_002_000 picoseconds.
-		Weight::from_parts(5_109_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm QueryCounter (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm Queries (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
+	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 46_138_000 picoseconds.
-		Weight::from_parts(46_714_000, 0)
-			.saturating_add(Weight::from_parts(0, 3610))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
+		//  Measured:  `245`
+		//  Estimated: `3710`
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(25_000_000, 3710)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm Queries (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
+	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `328`
-		//  Estimated: `3793`
-		// Minimum execution time: 45_902_000 picoseconds.
-		Weight::from_parts(47_995_000, 0)
-			.saturating_add(Weight::from_parts(0, 3793))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `428`
+		//  Estimated: `3893`
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 3893)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1)
-	/// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
+	/// Proof: `PolkadotXcm::XcmExecutionSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn force_suspension() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_807_000 picoseconds.
-		Weight::from_parts(5_523_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: PolkadotXcm SupportedVersion (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:4 w:2)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `162`
-		//  Estimated: `11052`
-		// Minimum execution time: 23_133_000 picoseconds.
-		Weight::from_parts(23_599_000, 0)
-			.saturating_add(Weight::from_parts(0, 11052))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `229`
+		//  Estimated: `11119`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 11119)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifiers (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:4 w:2)
+	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `166`
-		//  Estimated: `11056`
-		// Minimum execution time: 23_543_000 picoseconds.
-		Weight::from_parts(23_918_000, 0)
-			.saturating_add(Weight::from_parts(0, 11056))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `233`
+		//  Estimated: `11123`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 11123)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:5 w:0)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `173`
-		//  Estimated: `13538`
-		// Minimum execution time: 24_704_000 picoseconds.
-		Weight::from_parts(25_267_000, 0)
-			.saturating_add(Weight::from_parts(0, 13538))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `240`
+		//  Estimated: `13605`
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 13605)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `212`
-		//  Estimated: `6152`
-		// Minimum execution time: 42_577_000 picoseconds.
-		Weight::from_parts(43_366_000, 0)
-			.saturating_add(Weight::from_parts(0, 6152))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `312`
+		//  Estimated: `6252`
+		// Minimum execution time: 23_000_000 picoseconds.
+		Weight::from_parts(24_000_000, 6252)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:3 w:0)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `206`
-		//  Estimated: `8621`
-		// Minimum execution time: 12_957_000 picoseconds.
-		Weight::from_parts(13_179_000, 0)
-			.saturating_add(Weight::from_parts(0, 8621))
-			.saturating_add(T::DbWeight::get().reads(3))
+		//  Measured:  `272`
+		//  Estimated: `8687`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 8687)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `173`
-		//  Estimated: `11063`
-		// Minimum execution time: 23_953_000 picoseconds.
-		Weight::from_parts(24_967_000, 0)
-			.saturating_add(Weight::from_parts(0, 11063))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `240`
+		//  Estimated: `11130`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 11130)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem HostConfiguration (r:1 w:0)
-	/// Proof Skipped: ParachainSystem HostConfiguration (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
-	/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
+	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// 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::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `215`
-		//  Estimated: `11105`
-		// Minimum execution time: 50_999_000 picoseconds.
-		Weight::from_parts(51_842_000, 0)
-			.saturating_add(Weight::from_parts(0, 11105))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `316`
+		//  Estimated: `11206`
+		// Minimum execution time: 30_000_000 picoseconds.
+		Weight::from_parts(31_000_000, 11206)
+			.saturating_add(T::DbWeight::get().reads(9_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/pendulum/src/weights/redeem.rs b/runtime/pendulum/src/weights/redeem.rs
index d3917126d..ac4b1d8ba 100644
--- a/runtime/pendulum/src/weights/redeem.rs
+++ b/runtime/pendulum/src/weights/redeem.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for redeem
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-29, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ./target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // redeem
@@ -39,257 +38,267 @@ use core::marker::PhantomData;
 /// Weights for redeem using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> redeem::WeightInfo for SubstrateWeight<T> {
-	/// Storage: Redeem LimitVolumeAmount (r:1 w:0)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: Fee RedeemFee (r:1 w:0)
-	/// Proof Skipped: Fee RedeemFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemMinimumTransferAmount (r:1 w:0)
-	/// Proof: Redeem RedeemMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Security Nonce (r:1 w:1)
-	/// Proof Skipped: Security Nonce (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PremiumRedeemFee (r:1 w:0)
-	/// Proof Skipped: Fee PremiumRedeemFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemRequests (r:0 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
+	/// Storage: `Redeem::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Redeem::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::RedeemFee` (r:1 w:0)
+	/// Proof: `Fee::RedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Redeem::RedeemMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Security::Nonce` (r:1 w:1)
+	/// Proof: `Security::Nonce` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::ParentHash` (r:1 w:0)
+	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::PremiumRedeemFee` (r:1 w:0)
+	/// Proof: `Fee::PremiumRedeemFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemPeriod` (r:1 w:0)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::RedeemRequests` (r:0 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
 	fn request_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1527`
-		//  Estimated: `4992`
-		// Minimum execution time: 101_000_000 picoseconds.
-		Weight::from_parts(107_000_000, 4992)
-			.saturating_add(T::DbWeight::get().reads(14_u64))
+		//  Measured:  `1631`
+		//  Estimated: `7734`
+		// Minimum execution time: 87_000_000 picoseconds.
+		Weight::from_parts(91_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(16_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Tokens TotalIssuance (r:1 w:1)
-	/// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry LiquidationVault (r:1 w:1)
-	/// Proof Skipped: VaultRegistry LiquidationVault (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Tokens::Accounts` (r:3 w:3)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::LiquidationVault` (r:1 w:1)
+	/// Proof: `VaultRegistry::LiquidationVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn liquidation_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1269`
-		//  Estimated: `4734`
-		// Minimum execution time: 92_000_000 picoseconds.
-		Weight::from_parts(99_000_000, 4734)
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
+		//  Measured:  `1484`
+		//  Estimated: `8865`
+		// Minimum execution time: 100_000_000 picoseconds.
+		Weight::from_parts(103_000_000, 8865)
+			.saturating_add(T::DbWeight::get().reads(8_u64))
+			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:1 w:0)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Validators (r:1 w:0)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:0)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: Redeem LimitVolumeAmount (r:1 w:0)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:1 w:0)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Validators` (r:1 w:0)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:0)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::LimitVolumeAmount` (r:1 w:0)
+	/// Proof: `Redeem::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn execute_redeem() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1731`
 		//  Estimated: `71867`
-		// Minimum execution time: 8_396_000_000 picoseconds.
-		Weight::from_parts(8_451_000_000, 71867)
+		// Minimum execution time: 7_950_000_000 picoseconds.
+		Weight::from_parts(8_274_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PunishmentFee (r:1 w:0)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PunishmentDelay (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Redeem CancelledRedeemAmount (r:0 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::RedeemPeriod` (r:1 w:0)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::PunishmentFee` (r:1 w:0)
+	/// Proof: `Fee::PunishmentFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PunishmentDelay` (r:1 w:0)
+	/// Proof: `VaultRegistry::PunishmentDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:2 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::CancelledRedeemAmount` (r:0 w:1)
+	/// Proof: `Redeem::CancelledRedeemAmount` (`max_values`: None, `max_size`: Some(110), added: 2585, mode: `MaxEncodedLen`)
 	fn cancel_redeem_reimburse() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2658`
-		//  Estimated: `6123`
-		// Minimum execution time: 163_000_000 picoseconds.
-		Weight::from_parts(165_000_000, 6123)
-			.saturating_add(T::DbWeight::get().reads(20_u64))
+		//  Measured:  `2762`
+		//  Estimated: `7734`
+		// Minimum execution time: 136_000_000 picoseconds.
+		Weight::from_parts(142_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(22_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem RedeemPeriod (r:1 w:0)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Fee PunishmentFee (r:1 w:0)
-	/// Proof Skipped: Fee PunishmentFee (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PunishmentDelay (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem CancelledRedeemAmount (r:0 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::RedeemPeriod` (r:1 w:0)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::PunishmentFee` (r:1 w:0)
+	/// Proof: `Fee::PunishmentFee` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PunishmentDelay` (r:1 w:0)
+	/// Proof: `VaultRegistry::PunishmentDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::CancelledRedeemAmount` (r:0 w:1)
+	/// Proof: `Redeem::CancelledRedeemAmount` (`max_values`: None, `max_size`: Some(110), added: 2585, mode: `MaxEncodedLen`)
 	fn cancel_redeem_retry() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2551`
-		//  Estimated: `6016`
-		// Minimum execution time: 136_000_000 picoseconds.
-		Weight::from_parts(141_000_000, 6016)
-			.saturating_add(T::DbWeight::get().reads(17_u64))
+		//  Measured:  `2655`
+		//  Estimated: `7734`
+		// Minimum execution time: 112_000_000 picoseconds.
+		Weight::from_parts(116_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(19_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Tokens TotalIssuance (r:1 w:1)
-	/// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalStake (r:2 w:0)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:2 w:0)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:1 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
 	fn self_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1653`
+		//  Measured:  `1757`
 		//  Estimated: `6096`
-		// Minimum execution time: 98_000_000 picoseconds.
-		Weight::from_parts(102_000_000, 6096)
-			.saturating_add(T::DbWeight::get().reads(7_u64))
+		// Minimum execution time: 80_000_000 picoseconds.
+		Weight::from_parts(83_000_000, 6096)
+			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Redeem RedeemPeriod (r:0 w:1)
-	/// Proof: Redeem RedeemPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Redeem::RedeemPeriod` (r:0 w:1)
+	/// Proof: `Redeem::RedeemPeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_redeem_period() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(11_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Redeem RedeemRequests (r:1 w:1)
-	/// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(356), added: 2831, mode: MaxEncodedLen)
-	/// Storage: Redeem CancelledRedeemAmount (r:1 w:1)
-	/// Proof: Redeem CancelledRedeemAmount (max_values: None, max_size: Some(110), added: 2585, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Redeem::RedeemRequests` (r:1 w:1)
+	/// Proof: `Redeem::RedeemRequests` (`max_values`: None, `max_size`: Some(356), added: 2831, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::CancelledRedeemAmount` (r:1 w:1)
+	/// Proof: `Redeem::CancelledRedeemAmount` (`max_values`: None, `max_size`: Some(110), added: 2585, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn mint_tokens_for_reimbursed_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1839`
-		//  Estimated: `5304`
-		// Minimum execution time: 80_000_000 picoseconds.
-		Weight::from_parts(85_000_000, 5304)
-			.saturating_add(T::DbWeight::get().reads(7_u64))
+		//  Measured:  `1943`
+		//  Estimated: `7734`
+		// Minimum execution time: 66_000_000 picoseconds.
+		Weight::from_parts(70_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Redeem LimitVolumeAmount (r:0 w:1)
-	/// Proof: Redeem LimitVolumeAmount (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
-	/// Storage: Redeem LimitVolumeCurrencyId (r:0 w:1)
-	/// Proof: Redeem LimitVolumeCurrencyId (max_values: Some(1), max_size: Some(46), added: 541, mode: MaxEncodedLen)
-	/// Storage: Redeem IntervalLength (r:0 w:1)
-	/// Proof: Redeem IntervalLength (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Redeem::LimitVolumeAmount` (r:0 w:1)
+	/// Proof: `Redeem::LimitVolumeAmount` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::LimitVolumeCurrencyId` (r:0 w:1)
+	/// Proof: `Redeem::LimitVolumeCurrencyId` (`max_values`: Some(1), `max_size`: Some(46), added: 541, mode: `MaxEncodedLen`)
+	/// Storage: `Redeem::IntervalLength` (r:0 w:1)
+	/// Proof: `Redeem::IntervalLength` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn rate_limit_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Redeem RedeemMinimumTransferAmount (r:0 w:1)
-	/// Proof: Redeem RedeemMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Redeem::RedeemMinimumTransferAmount` (r:0 w:1)
+	/// Proof: `Redeem::RedeemMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn minimum_transfer_amount_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(11_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/pendulum/src/weights/replace.rs b/runtime/pendulum/src/weights/replace.rs
index 5c5ebd2e2..361796eac 100644
--- a/runtime/pendulum/src/weights/replace.rs
+++ b/runtime/pendulum/src/weights/replace.rs
@@ -2,18 +2,17 @@
 //! Autogenerated weights for replace
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-29, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
 // replace
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/replace.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,185 +38,191 @@ use core::marker::PhantomData;
 /// Weights for replace using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> replace::WeightInfo for SubstrateWeight<T> {
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Nomination Vaults (r:1 w:0)
-	/// Proof: Nomination Vaults (max_values: None, max_size: Some(141), added: 2616, mode: MaxEncodedLen)
-	/// Storage: Replace ReplaceMinimumTransferAmount (r:1 w:0)
-	/// Proof: Replace ReplaceMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Fee ReplaceGriefingCollateral (r:1 w:0)
-	/// Proof Skipped: Fee ReplaceGriefingCollateral (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Nomination::Vaults` (r:1 w:0)
+	/// Proof: `Nomination::Vaults` (`max_values`: None, `max_size`: Some(141), added: 2616, mode: `MaxEncodedLen`)
+	/// Storage: `Replace::ReplaceMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Replace::ReplaceMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Fee::ReplaceGriefingCollateral` (r:1 w:0)
+	/// Proof: `Fee::ReplaceGriefingCollateral` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn request_replace() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1531`
-		//  Estimated: `4996`
-		// Minimum execution time: 73_000_000 picoseconds.
-		Weight::from_parts(74_000_000, 4996)
-			.saturating_add(T::DbWeight::get().reads(6_u64))
+		//  Measured:  `1635`
+		//  Estimated: `7734`
+		// Minimum execution time: 59_000_000 picoseconds.
+		Weight::from_parts(60_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn withdraw_replace() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `650`
 		//  Estimated: `4115`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 4115)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 4115)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:2 w:2)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Replace ReplaceMinimumTransferAmount (r:1 w:0)
-	/// Proof: Replace ReplaceMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Security Nonce (r:1 w:1)
-	/// Proof Skipped: Security Nonce (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Replace ReplacePeriod (r:1 w:0)
-	/// Proof: Replace ReplacePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Replace ReplaceRequests (r:0 w:1)
-	/// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(431), added: 2906, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::Vaults` (r:2 w:2)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Replace::ReplaceMinimumTransferAmount` (r:1 w:0)
+	/// Proof: `Replace::ReplaceMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `Security::Nonce` (r:1 w:1)
+	/// Proof: `Security::Nonce` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `System::ParentHash` (r:1 w:0)
+	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Replace::ReplacePeriod` (r:1 w:0)
+	/// Proof: `Replace::ReplacePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Replace::ReplaceRequests` (r:0 w:1)
+	/// Proof: `Replace::ReplaceRequests` (`max_values`: None, `max_size`: Some(431), added: 2906, mode: `MaxEncodedLen`)
 	fn accept_replace() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3275`
-		//  Estimated: `9215`
-		// Minimum execution time: 237_000_000 picoseconds.
-		Weight::from_parts(251_000_000, 9215)
-			.saturating_add(T::DbWeight::get().reads(27_u64))
+		//  Measured:  `3379`
+		//  Estimated: `9319`
+		// Minimum execution time: 194_000_000 picoseconds.
+		Weight::from_parts(204_000_000, 9319)
+			.saturating_add(T::DbWeight::get().reads(29_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
-	/// Storage: Replace ReplaceRequests (r:1 w:1)
-	/// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(431), added: 2906, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:1 w:0)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Validators (r:1 w:0)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:0)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry Vaults (r:2 w:2)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Replace::ReplaceRequests` (r:1 w:1)
+	/// Proof: `Replace::ReplaceRequests` (`max_values`: None, `max_size`: Some(431), added: 2906, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:1 w:0)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Validators` (r:1 w:0)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:0)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::Vaults` (r:2 w:2)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn execute_replace() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1968`
 		//  Estimated: `71867`
-		// Minimum execution time: 8_202_000_000 picoseconds.
-		Weight::from_parts(8_279_000_000, 71867)
+		// Minimum execution time: 7_837_000_000 picoseconds.
+		Weight::from_parts(8_125_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Replace ReplaceRequests (r:1 w:1)
-	/// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(431), added: 2906, mode: MaxEncodedLen)
-	/// Storage: Replace ReplacePeriod (r:1 w:0)
-	/// Proof: Replace ReplacePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Security ActiveBlockCount (r:1 w:0)
-	/// Proof Skipped: Security ActiveBlockCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:2 w:2)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Replace::ReplaceRequests` (r:1 w:1)
+	/// Proof: `Replace::ReplaceRequests` (`max_values`: None, `max_size`: Some(431), added: 2906, mode: `MaxEncodedLen`)
+	/// Storage: `Replace::ReplacePeriod` (r:1 w:0)
+	/// Proof: `Replace::ReplacePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Security::ActiveBlockCount` (r:1 w:0)
+	/// Proof: `Security::ActiveBlockCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:2 w:2)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn cancel_replace() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3078`
-		//  Estimated: `9018`
-		// Minimum execution time: 142_000_000 picoseconds.
-		Weight::from_parts(145_000_000, 9018)
-			.saturating_add(T::DbWeight::get().reads(20_u64))
+		//  Measured:  `3182`
+		//  Estimated: `9122`
+		// Minimum execution time: 118_000_000 picoseconds.
+		Weight::from_parts(120_000_000, 9122)
+			.saturating_add(T::DbWeight::get().reads(22_u64))
 			.saturating_add(T::DbWeight::get().writes(10_u64))
 	}
-	/// Storage: Replace ReplacePeriod (r:0 w:1)
-	/// Proof: Replace ReplacePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Replace::ReplacePeriod` (r:0 w:1)
+	/// Proof: `Replace::ReplacePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_replace_period() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Replace ReplaceMinimumTransferAmount (r:0 w:1)
-	/// Proof: Replace ReplaceMinimumTransferAmount (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Replace::ReplaceMinimumTransferAmount` (r:0 w:1)
+	/// Proof: `Replace::ReplaceMinimumTransferAmount` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn minimum_transfer_amount_update() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(11_000_000, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/pendulum/src/weights/stellar_relay.rs b/runtime/pendulum/src/weights/stellar_relay.rs
index b05371d72..2b5f29135 100644
--- a/runtime/pendulum/src/weights/stellar_relay.rs
+++ b/runtime/pendulum/src/weights/stellar_relay.rs
@@ -2,21 +2,20 @@
 //! Autogenerated weights for stellar_relay
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// stellar-relay
+// stellar_relay
 // --extrinsic
 // *
 // --steps
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/stellar_relay.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,22 +38,22 @@ use core::marker::PhantomData;
 /// Weights for stellar_relay using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> stellar_relay::WeightInfo for SubstrateWeight<T> {
-	/// Storage: StellarRelay Validators (r:1 w:1)
-	/// Proof: StellarRelay Validators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay Organizations (r:1 w:1)
-	/// Proof: StellarRelay Organizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
-	/// Storage: StellarRelay OldValidators (r:0 w:1)
-	/// Proof: StellarRelay OldValidators (max_values: Some(1), max_size: Some(70382), added: 70877, mode: MaxEncodedLen)
-	/// Storage: StellarRelay NewValidatorsEnactmentBlockHeight (r:0 w:1)
-	/// Proof: StellarRelay NewValidatorsEnactmentBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: StellarRelay OldOrganizations (r:0 w:1)
-	/// Proof: StellarRelay OldOrganizations (max_values: Some(1), max_size: Some(37232), added: 37727, mode: MaxEncodedLen)
+	/// Storage: `StellarRelay::Validators` (r:1 w:1)
+	/// Proof: `StellarRelay::Validators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::Organizations` (r:1 w:1)
+	/// Proof: `StellarRelay::Organizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::OldValidators` (r:0 w:1)
+	/// Proof: `StellarRelay::OldValidators` (`max_values`: Some(1), `max_size`: Some(70382), added: 70877, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::NewValidatorsEnactmentBlockHeight` (r:0 w:1)
+	/// Proof: `StellarRelay::NewValidatorsEnactmentBlockHeight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `StellarRelay::OldOrganizations` (r:0 w:1)
+	/// Proof: `StellarRelay::OldOrganizations` (`max_values`: Some(1), `max_size`: Some(37232), added: 37727, mode: `MaxEncodedLen`)
 	fn update_tier_1_validator_set() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2446`
 		//  Estimated: `71867`
-		// Minimum execution time: 146_000_000 picoseconds.
-		Weight::from_parts(156_000_000, 71867)
+		// Minimum execution time: 117_000_000 picoseconds.
+		Weight::from_parts(117_000_000, 71867)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
diff --git a/runtime/pendulum/src/weights/treasury_buyout_extension.rs b/runtime/pendulum/src/weights/treasury_buyout_extension.rs
index 8e5c28d62..b139bb8ad 100644
--- a/runtime/pendulum/src/weights/treasury_buyout_extension.rs
+++ b/runtime/pendulum/src/weights/treasury_buyout_extension.rs
@@ -2,21 +2,20 @@
 //! Autogenerated weights for treasury_buyout_extension
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-05-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// treasury-buyout-extension
+// treasury_buyout_extension
 // --extrinsic
 // *
 // --steps
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/treasury_buyout_extension.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -38,51 +37,51 @@ use core::marker::PhantomData;
 
 /// Weights for treasury_buyout_extension using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> treasury_buyout_extension::default_weights::WeightInfo for SubstrateWeight<T> {
-	/// Storage: TreasuryBuyoutExtension AllowedCurrencies (r:1 w:0)
-	/// Proof: TreasuryBuyoutExtension AllowedCurrencies (max_values: None, max_size: Some(62), added: 2537, mode: MaxEncodedLen)
-	/// Storage: AssetRegistry Metadata (r:2 w:0)
-	/// Proof Skipped: AssetRegistry Metadata (max_values: None, max_size: None, mode: Measured)
-	/// Storage: DiaOracleModule CoinInfosMap (r:1 w:0)
-	/// Proof Skipped: DiaOracleModule CoinInfosMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TreasuryBuyoutExtension BuyoutLimit (r:1 w:0)
-	/// Proof: TreasuryBuyoutExtension BuyoutLimit (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: TreasuryBuyoutExtension Buyouts (r:1 w:1)
-	/// Proof: TreasuryBuyoutExtension Buyouts (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+impl<T: frame_system::Config> treasury_buyout_extension::WeightInfo for SubstrateWeight<T> {
+	/// Storage: `TreasuryBuyoutExtension::AllowedCurrencies` (r:1 w:0)
+	/// Proof: `TreasuryBuyoutExtension::AllowedCurrencies` (`max_values`: None, `max_size`: Some(62), added: 2537, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `DiaOracleModule::CoinInfosMap` (r:1 w:0)
+	/// Proof: `DiaOracleModule::CoinInfosMap` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `TreasuryBuyoutExtension::BuyoutLimit` (r:1 w:0)
+	/// Proof: `TreasuryBuyoutExtension::BuyoutLimit` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `TreasuryBuyoutExtension::Buyouts` (r:1 w:1)
+	/// Proof: `TreasuryBuyoutExtension::Buyouts` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn buyout() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1223`
-		//  Estimated: `7163`
-		// Minimum execution time: 121_000_000 picoseconds.
-		Weight::from_parts(125_000_000, 7163)
+		//  Measured:  `1294`
+		//  Estimated: `7734`
+		// Minimum execution time: 89_000_000 picoseconds.
+		Weight::from_parts(90_000_000, 7734)
 			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
-	/// Storage: TreasuryBuyoutExtension BuyoutLimit (r:0 w:1)
-	/// Proof: TreasuryBuyoutExtension BuyoutLimit (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `TreasuryBuyoutExtension::BuyoutLimit` (r:0 w:1)
+	/// Proof: `TreasuryBuyoutExtension::BuyoutLimit` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn update_buyout_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: TreasuryBuyoutExtension AllowedCurrencies (r:1 w:1)
-	/// Proof: TreasuryBuyoutExtension AllowedCurrencies (max_values: None, max_size: Some(62), added: 2537, mode: MaxEncodedLen)
+	/// Storage: `TreasuryBuyoutExtension::AllowedCurrencies` (r:1 w:1)
+	/// Proof: `TreasuryBuyoutExtension::AllowedCurrencies` (`max_values`: None, `max_size`: Some(62), added: 2537, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 20]`.
 	fn update_allowed_assets(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3527`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(15_597_893, 3527)
-			// Standard Error: 5_165
-			.saturating_add(Weight::from_parts(1_242_326, 0).saturating_mul(n.into()))
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_248_153, 3527)
+			// Standard Error: 2_707
+			.saturating_add(Weight::from_parts(949_685, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/pendulum/src/weights/vault_registry.rs b/runtime/pendulum/src/weights/vault_registry.rs
index ccd9280f2..0f7c40237 100644
--- a/runtime/pendulum/src/weights/vault_registry.rs
+++ b/runtime/pendulum/src/weights/vault_registry.rs
@@ -2,21 +2,20 @@
 //! Autogenerated weights for vault_registry
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-29, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `<UNKNOWN>`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
+//! HOSTNAME: `Gianfrancos-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pendulum"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/pendulum-node
+// ../target/production/pendulum-node
 // benchmark
 // pallet
 // --chain
 // pendulum
-// --execution=wasm
 // --wasm-execution=compiled
 // --pallet
-// vault-registry
+// vault_registry
 // --extrinsic
 // *
 // --steps
@@ -24,9 +23,9 @@
 // --repeat
 // 20
 // --output
-// runtime/pendulum/src/weights/
+// ../runtime/pendulum/src/weights/vault_registry.rs
 // --template
-// .maintain/frame-weight-template.hbs
+// frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -39,343 +38,349 @@ use core::marker::PhantomData;
 /// Weights for vault_registry using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> vault_registry::WeightInfo for SubstrateWeight<T> {
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry LiquidationCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry LiquidationCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry MinimumCollateralVault (r:1 w:0)
-	/// Proof Skipped: VaultRegistry MinimumCollateralVault (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry VaultStellarPublicKey (r:1 w:0)
-	/// Proof Skipped: VaultRegistry VaultStellarPublicKey (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::LiquidationCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::LiquidationCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::MinimumCollateralVault` (r:1 w:0)
+	/// Proof: `VaultRegistry::MinimumCollateralVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::VaultStellarPublicKey` (r:1 w:0)
+	/// Proof: `VaultRegistry::VaultStellarPublicKey` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
 	fn register_vault() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1079`
 		//  Estimated: `4544`
-		// Minimum execution time: 153_000_000 picoseconds.
-		Weight::from_parts(159_000_000, 4544)
+		// Minimum execution time: 116_000_000 picoseconds.
+		Weight::from_parts(119_000_000, 4544)
 			.saturating_add(T::DbWeight::get().reads(24_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
 	fn deposit_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2501`
-		//  Estimated: `5966`
-		// Minimum execution time: 178_000_000 picoseconds.
-		Weight::from_parts(183_000_000, 5966)
-			.saturating_add(T::DbWeight::get().reads(21_u64))
+		//  Measured:  `2605`
+		//  Estimated: `7734`
+		// Minimum execution time: 143_000_000 picoseconds.
+		Weight::from_parts(148_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:0)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:1 w:1)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:0)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
 	fn withdraw_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2475`
-		//  Estimated: `5940`
-		// Minimum execution time: 187_000_000 picoseconds.
-		Weight::from_parts(197_000_000, 5940)
-			.saturating_add(T::DbWeight::get().reads(21_u64))
+		//  Measured:  `2579`
+		//  Estimated: `7734`
+		// Minimum execution time: 147_000_000 picoseconds.
+		Weight::from_parts(150_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: VaultRegistry VaultStellarPublicKey (r:1 w:1)
-	/// Proof Skipped: VaultRegistry VaultStellarPublicKey (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::VaultStellarPublicKey` (r:1 w:1)
+	/// Proof: `VaultRegistry::VaultStellarPublicKey` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_public_key() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `334`
 		//  Estimated: `3799`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 3799)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 3799)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:0)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:0)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:0)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn accept_new_issues() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1484`
 		//  Estimated: `4949`
-		// Minimum execution time: 59_000_000 picoseconds.
-		Weight::from_parts(61_000_000, 4949)
+		// Minimum execution time: 46_000_000 picoseconds.
+		Weight::from_parts(47_000_000, 4949)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_custom_secure_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `711`
 		//  Estimated: `4176`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 4176)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 4176)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry MinimumCollateralVault (r:0 w:1)
-	/// Proof Skipped: VaultRegistry MinimumCollateralVault (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::MinimumCollateralVault` (r:0 w:1)
+	/// Proof: `VaultRegistry::MinimumCollateralVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_minimum_collateral() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:0 w:1)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:0 w:1)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_system_collateral_ceiling() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(7_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultRegistry SecureCollateralThreshold (r:0 w:1)
-	/// Proof Skipped: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::SecureCollateralThreshold` (r:0 w:1)
+	/// Proof: `VaultRegistry::SecureCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_secure_collateral_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `80`
 		//  Estimated: `1565`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(11_000_000, 1565)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 1565)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: VaultRegistry PremiumRedeemThreshold (r:0 w:1)
-	/// Proof Skipped: VaultRegistry PremiumRedeemThreshold (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::PremiumRedeemThreshold` (r:0 w:1)
+	/// Proof: `VaultRegistry::PremiumRedeemThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_premium_redeem_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry LiquidationCollateralThreshold (r:0 w:1)
-	/// Proof Skipped: VaultRegistry LiquidationCollateralThreshold (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::LiquidationCollateralThreshold` (r:0 w:1)
+	/// Proof: `VaultRegistry::LiquidationCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_liquidation_collateral_threshold() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry LiquidationCollateralThreshold (r:1 w:0)
-	/// Proof Skipped: VaultRegistry LiquidationCollateralThreshold (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking Nonce (r:1 w:0)
-	/// Proof Skipped: VaultStaking Nonce (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalCurrentStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalCurrentStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Security ParachainStatus (r:1 w:0)
-	/// Proof Skipped: Security ParachainStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: VaultStaking Stake (r:1 w:1)
-	/// Proof Skipped: VaultStaking Stake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashPerToken (r:1 w:0)
-	/// Proof Skipped: VaultStaking SlashPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking SlashTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking SlashTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardCurrencies (r:1 w:0)
-	/// Proof Skipped: VaultStaking RewardCurrencies (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards Stake (r:1 w:1)
-	/// Proof: PooledVaultRewards Stake (max_values: None, max_size: Some(202), added: 2677, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardPerToken (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardPerToken (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardTally (r:1 w:1)
-	/// Proof: PooledVaultRewards RewardTally (max_values: None, max_size: Some(264), added: 2739, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards TotalRewards (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalRewards (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: VaultStaking RewardPerToken (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardPerToken (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking TotalStake (r:1 w:1)
-	/// Proof Skipped: VaultStaking TotalStake (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultStaking RewardTally (r:1 w:1)
-	/// Proof Skipped: VaultStaking RewardTally (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PooledVaultRewards TotalStake (r:1 w:1)
-	/// Proof: PooledVaultRewards TotalStake (max_values: None, max_size: Some(78), added: 2553, mode: MaxEncodedLen)
-	/// Storage: PooledVaultRewards RewardCurrencies (r:1 w:0)
-	/// Proof: PooledVaultRewards RewardCurrencies (max_values: None, max_size: Some(523), added: 2998, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1)
-	/// Proof Skipped: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tokens Accounts (r:2 w:2)
-	/// Proof: Tokens Accounts (max_values: None, max_size: Some(150), added: 2625, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0)
-	/// Proof Skipped: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: None, mode: Measured)
-	/// Storage: VaultRegistry LiquidationVault (r:1 w:1)
-	/// Proof Skipped: VaultRegistry LiquidationVault (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::LiquidationCollateralThreshold` (r:1 w:0)
+	/// Proof: `VaultRegistry::LiquidationCollateralThreshold` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::Nonce` (r:1 w:0)
+	/// Proof: `VaultStaking::Nonce` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalCurrentStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalCurrentStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Security::ParachainStatus` (r:1 w:0)
+	/// Proof: `Security::ParachainStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::Metadata` (r:2 w:0)
+	/// Proof: `AssetRegistry::Metadata` (`max_values`: None, `max_size`: Some(897), added: 3372, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::Stake` (r:1 w:1)
+	/// Proof: `VaultStaking::Stake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashPerToken` (r:1 w:0)
+	/// Proof: `VaultStaking::SlashPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::SlashTally` (r:1 w:1)
+	/// Proof: `VaultStaking::SlashTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardCurrencies` (r:1 w:0)
+	/// Proof: `VaultStaking::RewardCurrencies` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::Stake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::Stake` (`max_values`: None, `max_size`: Some(202), added: 2677, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardPerToken` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardPerToken` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardTally` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::RewardTally` (`max_values`: None, `max_size`: Some(264), added: 2739, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::TotalRewards` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalRewards` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `VaultStaking::RewardPerToken` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardPerToken` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::TotalStake` (r:1 w:1)
+	/// Proof: `VaultStaking::TotalStake` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultStaking::RewardTally` (r:1 w:1)
+	/// Proof: `VaultStaking::RewardTally` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PooledVaultRewards::TotalStake` (r:1 w:1)
+	/// Proof: `PooledVaultRewards::TotalStake` (`max_values`: None, `max_size`: Some(78), added: 2553, mode: `MaxEncodedLen`)
+	/// Storage: `PooledVaultRewards::RewardCurrencies` (r:1 w:0)
+	/// Proof: `PooledVaultRewards::RewardCurrencies` (`max_values`: None, `max_size`: Some(523), added: 2998, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::TotalUserVaultCollateral` (r:1 w:1)
+	/// Proof: `VaultRegistry::TotalUserVaultCollateral` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(150), added: 2625, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `VaultRegistry::SystemCollateralCeiling` (r:1 w:0)
+	/// Proof: `VaultRegistry::SystemCollateralCeiling` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `VaultRegistry::LiquidationVault` (r:1 w:1)
+	/// Proof: `VaultRegistry::LiquidationVault` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn report_undercollateralized_vault() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2708`
-		//  Estimated: `6240`
-		// Minimum execution time: 323_000_000 picoseconds.
-		Weight::from_parts(343_000_000, 6240)
-			.saturating_add(T::DbWeight::get().reads(25_u64))
+		//  Measured:  `2812`
+		//  Estimated: `7734`
+		// Minimum execution time: 260_000_000 picoseconds.
+		Weight::from_parts(269_000_000, 7734)
+			.saturating_add(T::DbWeight::get().reads(27_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
-	/// Storage: VaultRegistry Vaults (r:1 w:1)
-	/// Proof Skipped: VaultRegistry Vaults (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::Vaults` (r:1 w:1)
+	/// Proof: `VaultRegistry::Vaults` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn recover_vault_id() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `649`
 		//  Estimated: `4114`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 4114)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 4114)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: VaultRegistry PunishmentDelay (r:0 w:1)
-	/// Proof Skipped: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `VaultRegistry::PunishmentDelay` (r:0 w:1)
+	/// Proof: `VaultRegistry::PunishmentDelay` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_punishment_delay() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/pendulum/src/xcm_config.rs b/runtime/pendulum/src/xcm_config.rs
index 7754f9f36..4d4c511b4 100644
--- a/runtime/pendulum/src/xcm_config.rs
+++ b/runtime/pendulum/src/xcm_config.rs
@@ -2,9 +2,10 @@ use core::marker::PhantomData;
 
 use cumulus_primitives_utility::XcmFeesTo32ByteAccount;
 use frame_support::{
-	log, match_types, parameter_types,
+	match_types, parameter_types,
 	traits::{ContainsPair, Everything, Nothing, ProcessMessageError},
 };
+use log;
 use orml_asset_registry::{AssetRegistryTrader, FixedRateAssetRegistryTrader};
 use orml_traits::{
 	location::{RelativeReserveProvider, Reserve},
@@ -22,7 +23,10 @@ use xcm_builder::{
 	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 };
-use xcm_executor::{traits::ShouldExecute, XcmExecutor};
+use xcm_executor::{
+	traits::{Properties, ShouldExecute},
+	XcmExecutor,
+};
 
 use runtime_common::{
 	asset_registry::FixedConversionRateProvider,
@@ -125,8 +129,8 @@ where
 	fn should_execute<RuntimeCall>(
 		origin: &MultiLocation,
 		instructions: &mut [Instruction<RuntimeCall>],
-		max_weight: XCMWeight,
-		weight_credit: &mut XCMWeight,
+		max_weight: Weight,
+		weight_credit: &mut Properties,
 	) -> Result<(), ProcessMessageError> {
 		Deny::should_execute(origin, instructions, max_weight, weight_credit)?;
 		Allow::should_execute(origin, instructions, max_weight, weight_credit)
@@ -139,8 +143,8 @@ impl ShouldExecute for DenyReserveTransferToRelayChain {
 	fn should_execute<RuntimeCall>(
 		origin: &MultiLocation,
 		instructions: &mut [Instruction<RuntimeCall>],
-		_max_weight: XCMWeight,
-		_weight_credit: &mut XCMWeight,
+		_max_weight: Weight,
+		_weight_credit: &mut Properties,
 	) -> Result<(), ProcessMessageError> {
 		if instructions.iter().any(|inst| {
 			matches!(
@@ -277,6 +281,7 @@ impl xcm_executor::Config for XcmConfig {
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
 	type SafeCallFilter = Everything;
+	type Aliasers = ();
 }
 
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.
@@ -315,10 +320,12 @@ impl pallet_xcm::Config for Runtime {
 	type TrustedLockers = ();
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
-	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::pallet_xcm::SubstrateWeight<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
 	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 }
 
 #[cfg(feature = "runtime-benchmarks")]