From 1387b74a4104ab2721008da89b1982a368fc08f8 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Thu, 10 Aug 2023 14:22:17 +1200
Subject: [PATCH] Update polkadot v1.0.0 (#2577)

* wip

* fix

* fix build

* more fix

* update

* update deps

* fix

* update

* fix

* fix test

* some fix

* fix

* /bench runtime acala *

* update template

* /bench runtime karura *

* fix

* fix

* fix

* fix

* fix

* fix

* fmt

---------

Co-authored-by: Acala Github Action Bot <hello@acala.network>
---
 .../extrinsic-ordering-check-on-release.yml   |    4 +-
 Cargo.lock                                    | 3686 ++++++++---------
 Cargo.toml                                    |  455 +-
 Makefile                                      |   10 +-
 ecosystem-modules/stable-asset                |    2 +-
 evm-tests                                     |    2 +-
 inspect/Cargo.toml                            |   12 +-
 launch/config.yml                             |    3 -
 launch/karura-bifrost.yml                     |    5 -
 modules/aggregated-dex/Cargo.toml             |   18 +-
 modules/aggregated-dex/src/lib.rs             |    4 +-
 modules/aggregated-dex/src/mock.rs            |   33 +-
 modules/asset-registry/Cargo.toml             |   20 +-
 modules/asset-registry/src/lib.rs             |   12 +-
 modules/asset-registry/src/mock.rs            |   33 +-
 modules/auction-manager/Cargo.toml            |   16 +-
 modules/auction-manager/src/lib.rs            |   36 +-
 modules/auction-manager/src/mock.rs           |   28 +-
 modules/cdp-engine/Cargo.toml                 |   20 +-
 modules/cdp-engine/src/lib.rs                 |   13 +-
 modules/cdp-engine/src/mock.rs                |   41 +-
 modules/cdp-treasury/Cargo.toml               |   16 +-
 modules/cdp-treasury/src/lib.rs               |   13 +-
 modules/cdp-treasury/src/mock.rs              |   32 +-
 modules/collator-selection/Cargo.toml         |   34 +-
 modules/collator-selection/src/lib.rs         |   26 +-
 modules/collator-selection/src/mock.rs        |   39 +-
 modules/collator-selection/src/tests.rs       |    6 +-
 modules/currencies/Cargo.toml                 |   22 +-
 modules/currencies/src/lib.rs                 |    6 +-
 modules/currencies/src/mock.rs                |   33 +-
 modules/currencies/src/tests.rs               |   15 -
 modules/dex-oracle/Cargo.toml                 |   20 +-
 modules/dex-oracle/src/lib.rs                 |    4 +-
 modules/dex-oracle/src/mock.rs                |   26 +-
 modules/dex/Cargo.toml                        |   18 +-
 modules/dex/src/lib.rs                        |   27 +-
 modules/dex/src/mock.rs                       |   24 +-
 modules/earning/Cargo.toml                    |   16 +-
 modules/earning/src/lib.rs                    |    6 +-
 modules/earning/src/mock.rs                   |   21 +-
 modules/emergency-shutdown/Cargo.toml         |   16 +-
 modules/emergency-shutdown/src/lib.rs         |    6 +-
 modules/emergency-shutdown/src/mock.rs        |   35 +-
 modules/evm-accounts/Cargo.toml               |   16 +-
 modules/evm-accounts/src/lib.rs               |    5 +-
 modules/evm-accounts/src/mock.rs              |   30 +-
 modules/evm-bridge/Cargo.toml                 |   18 +-
 modules/evm-bridge/src/lib.rs                 |    3 +-
 modules/evm-bridge/src/mock.rs                |   29 +-
 modules/evm-utility/Cargo.toml                |    2 +-
 modules/evm/Cargo.toml                        |   44 +-
 modules/evm/rpc/runtime_api/Cargo.toml        |    8 +-
 modules/evm/src/bench/mock.rs                 |   35 +-
 modules/evm/src/lib.rs                        |   33 +-
 modules/evm/src/mock.rs                       |   21 +-
 modules/evm/src/precompiles/mod.rs            |    2 +-
 modules/evm/src/precompiles/ripemd.rs         |    2 +-
 modules/evm/src/runner/stack.rs               |    5 +-
 modules/evm/src/tests.rs                      |    4 +-
 modules/homa-validator-list/Cargo.toml        |   16 +-
 modules/homa-validator-list/src/lib.rs        |   10 +-
 modules/homa-validator-list/src/mock.rs       |   30 +-
 modules/homa/Cargo.toml                       |   22 +-
 modules/homa/src/lib.rs                       |   24 +-
 modules/homa/src/mock.rs                      |   30 +-
 modules/honzon-bridge/Cargo.toml              |   18 +-
 modules/honzon-bridge/src/lib.rs              |    2 +-
 modules/honzon-bridge/src/mock.rs             |   22 +-
 modules/honzon/Cargo.toml                     |   20 +-
 modules/honzon/src/lib.rs                     |    2 +-
 modules/honzon/src/mock.rs                    |   42 +-
 modules/idle-scheduler/Cargo.toml             |   14 +-
 modules/idle-scheduler/src/lib.rs             |    8 +-
 modules/idle-scheduler/src/mock.rs            |   21 +-
 modules/incentives/Cargo.toml                 |   16 +-
 modules/incentives/src/lib.rs                 |    6 +-
 modules/incentives/src/mock.rs                |   27 +-
 modules/liquid-crowdloan/Cargo.toml           |    2 +-
 modules/liquid-crowdloan/src/mock.rs          |   30 +-
 modules/loans/Cargo.toml                      |   16 +-
 modules/loans/src/lib.rs                      |    3 -
 modules/loans/src/mock.rs                     |   32 +-
 modules/nft/Cargo.toml                        |   24 +-
 modules/nft/src/benchmarking.rs               |   32 +-
 modules/nft/src/lib.rs                        |   12 +-
 modules/nft/src/mock.rs                       |   36 +-
 modules/nominees-election/Cargo.toml          |   16 +-
 modules/nominees-election/src/lib.rs          |    4 +-
 modules/nominees-election/src/mock.rs         |   30 +-
 modules/prices/Cargo.toml                     |   14 +-
 modules/prices/src/lib.rs                     |    6 +-
 modules/prices/src/mock.rs                    |   25 +-
 modules/relaychain/Cargo.toml                 |   16 +-
 modules/session-manager/Cargo.toml            |   16 +-
 modules/session-manager/src/lib.rs            |   52 +-
 modules/session-manager/src/migrations.rs     |    5 +-
 modules/session-manager/src/mock.rs           |   25 +-
 modules/support/Cargo.toml                    |   16 +-
 modules/transaction-pause/Cargo.toml          |   18 +-
 modules/transaction-pause/src/lib.rs          |    2 +-
 modules/transaction-pause/src/mock.rs         |   28 +-
 modules/transaction-payment/Cargo.toml        |   22 +-
 modules/transaction-payment/src/lib.rs        |    6 +-
 modules/transaction-payment/src/mock.rs       |   33 +-
 modules/xcm-interface/Cargo.toml              |   28 +-
 modules/xcm-interface/src/lib.rs              |    2 +-
 modules/xcm-interface/src/mock.rs             |   33 +-
 node/cli/Cargo.toml                           |   36 +-
 node/cli/src/cli.rs                           |    8 +-
 node/cli/src/command.rs                       |   64 +-
 node/e2e-tests/test-service/Cargo.toml        |  117 +-
 node/e2e-tests/test-service/src/builder.rs    |   30 +-
 node/e2e-tests/test-service/src/lib.rs        |   12 +-
 node/e2e-tests/test-service/src/node.rs       |    5 +-
 node/e2e-tests/test-service/src/service.rs    |   50 +-
 node/service/Cargo.toml                       |  117 +-
 node/service/src/chain_spec/acala.rs          |   11 +-
 node/service/src/chain_spec/karura.rs         |   11 +-
 node/service/src/chain_spec/mandala.rs        |   20 +-
 node/service/src/chain_spec/mod.rs            |    2 +-
 node/service/src/lib.rs                       |   68 +-
 orml                                          |    2 +-
 primitives/Cargo.toml                         |   20 +-
 primitives/src/currency.rs                    |   42 +-
 primitives/src/lib.rs                         |   19 +-
 primitives/src/nft.rs                         |    9 +-
 primitives/src/unchecked_extrinsic.rs         |   10 +-
 rpc/Cargo.toml                                |   22 +-
 runtime/acala/Cargo.toml                      |  120 +-
 runtime/acala/src/constants.rs                |    4 +-
 runtime/acala/src/lib.rs                      |   22 +-
 .../src/weights/module_aggregated_dex.rs      |   81 +-
 .../src/weights/module_asset_registry.rs      |  139 +-
 .../src/weights/module_auction_manager.rs     |   59 +-
 .../acala/src/weights/module_cdp_engine.rs    |  361 +-
 .../acala/src/weights/module_cdp_treasury.rs  |  141 +-
 .../src/weights/module_collator_selection.rs  |  247 +-
 .../acala/src/weights/module_currencies.rs    |  151 +-
 runtime/acala/src/weights/module_dex.rs       |  373 +-
 .../acala/src/weights/module_dex_oracle.rs    |  117 +-
 .../src/weights/module_emergency_shutdown.rs  |   79 +-
 runtime/acala/src/weights/module_evm.rs       |  357 +-
 .../acala/src/weights/module_evm_accounts.rs  |   49 +-
 runtime/acala/src/weights/module_homa.rs      |  351 +-
 runtime/acala/src/weights/module_honzon.rs    |  521 ++-
 .../src/weights/module_idle_scheduler.rs      |   63 +-
 .../acala/src/weights/module_incentives.rs    |  153 +-
 .../src/weights/module_liquid_crowdloan.rs    |   85 +-
 runtime/acala/src/weights/module_nft.rs       |  191 +-
 runtime/acala/src/weights/module_prices.rs    |   37 +-
 .../src/weights/module_session_manager.rs     |   83 +-
 .../src/weights/module_transaction_pause.rs   |   55 +-
 .../src/weights/module_transaction_payment.rs |  127 +-
 .../src/weights/nutsfinance_stable_asset.rs   |  289 +-
 runtime/acala/src/weights/orml_auction.rs     |  101 +-
 runtime/acala/src/weights/orml_authority.rs   |  137 +-
 runtime/acala/src/weights/orml_oracle.rs      |   49 +-
 runtime/acala/src/weights/orml_tokens.rs      |   99 +-
 runtime/acala/src/weights/orml_vesting.rs     |   89 +-
 runtime/acala/src/weights/pallet_xcm.rs       |    6 +-
 runtime/acala/src/xcm_config.rs               |    5 +-
 runtime/common/Cargo.toml                     |   46 +-
 runtime/common/src/check_nonce.rs             |   11 +-
 runtime/common/src/lib.rs                     |    2 +-
 runtime/common/src/mock.rs                    |   19 +-
 runtime/common/src/precompile/mock.rs         |   25 +-
 runtime/common/src/precompile/stable_asset.rs |    3 +-
 runtime/common/src/xcm_impl.rs                |   26 +-
 runtime/integration-tests/Cargo.toml          |  133 +-
 runtime/integration-tests/src/evm.rs          |   18 +-
 runtime/integration-tests/src/lib.rs          |   10 -
 runtime/integration-tests/src/payment.rs      |   65 +-
 .../integration-tests/src/relaychain/erc20.rs |  672 ---
 .../relaychain/kusama_cross_chain_transfer.rs | 1258 ------
 .../src/relaychain/kusama_test_net.rs         |  172 -
 .../src/relaychain/liquid_crowdloan.rs        |   98 -
 .../integration-tests/src/relaychain/mod.rs   |  295 --
 .../polkadot_cross_chain_transfer.rs          |  213 -
 .../src/relaychain/polkadot_test_net.rs       |  172 -
 .../src/relaychain/relay_chain.rs             |  373 --
 .../src/relaychain/statemine.rs               |  392 --
 .../src/relaychain/statemint.rs               |  244 --
 runtime/integration-tests/src/runtime.rs      |   12 +-
 runtime/integration-tests/src/setup.rs        |   53 +-
 runtime/integration-tests/src/stable_asset.rs |    6 +-
 runtime/integration-tests/src/treasury.rs     |    6 +-
 .../integration-tests/src/xcm_interface.rs    |  683 ---
 runtime/karura/Cargo.toml                     |  121 +-
 runtime/karura/src/constants.rs               |    4 +-
 runtime/karura/src/lib.rs                     |   22 +-
 .../src/weights/module_aggregated_dex.rs      |   81 +-
 .../src/weights/module_asset_registry.rs      |  139 +-
 .../src/weights/module_auction_manager.rs     |   59 +-
 .../karura/src/weights/module_cdp_engine.rs   |  361 +-
 .../karura/src/weights/module_cdp_treasury.rs |  139 +-
 .../src/weights/module_collator_selection.rs  |  247 +-
 .../karura/src/weights/module_currencies.rs   |  151 +-
 runtime/karura/src/weights/module_dex.rs      |  373 +-
 .../karura/src/weights/module_dex_oracle.rs   |  117 +-
 .../src/weights/module_emergency_shutdown.rs  |   79 +-
 runtime/karura/src/weights/module_evm.rs      |  357 +-
 .../karura/src/weights/module_evm_accounts.rs |   49 +-
 runtime/karura/src/weights/module_homa.rs     |  351 +-
 runtime/karura/src/weights/module_honzon.rs   |  521 ++-
 .../src/weights/module_honzon_bridge.rs       |   37 +-
 .../src/weights/module_idle_scheduler.rs      |   63 +-
 .../karura/src/weights/module_incentives.rs   |  151 +-
 runtime/karura/src/weights/module_nft.rs      |  193 +-
 runtime/karura/src/weights/module_prices.rs   |   37 +-
 .../src/weights/module_session_manager.rs     |   83 +-
 .../src/weights/module_transaction_pause.rs   |   55 +-
 .../src/weights/module_transaction_payment.rs |  127 +-
 .../src/weights/nutsfinance_stable_asset.rs   |  289 +-
 runtime/karura/src/weights/orml_auction.rs    |  101 +-
 runtime/karura/src/weights/orml_authority.rs  |  137 +-
 runtime/karura/src/weights/orml_oracle.rs     |   49 +-
 runtime/karura/src/weights/orml_tokens.rs     |   99 +-
 runtime/karura/src/weights/orml_vesting.rs    |   89 +-
 runtime/karura/src/weights/pallet_xcm.rs      |    6 +-
 runtime/karura/src/xcm_config.rs              |    5 +-
 runtime/mandala/Cargo.toml                    |  133 +-
 runtime/mandala/src/benchmarking/utils.rs     |    6 +-
 runtime/mandala/src/constants.rs              |    2 +-
 runtime/mandala/src/lib.rs                    |   25 +-
 runtime/mandala/src/weights/pallet_xcm.rs     |    8 +-
 runtime/mandala/src/xcm_config.rs             |    3 +
 templates/module-weight-template.hbs          |    2 +-
 templates/orml-weight-template.hbs            |    2 +-
 templates/runtime-weight-template.hbs         |    2 +-
 ts-tests/tests/test-balance.ts                |   14 +-
 ts-tests/tests/util.ts                        |    6 +-
 232 files changed, 8097 insertions(+), 13306 deletions(-)
 delete mode 100644 runtime/integration-tests/src/relaychain/erc20.rs
 delete mode 100644 runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs
 delete mode 100644 runtime/integration-tests/src/relaychain/kusama_test_net.rs
 delete mode 100644 runtime/integration-tests/src/relaychain/liquid_crowdloan.rs
 delete mode 100644 runtime/integration-tests/src/relaychain/mod.rs
 delete mode 100644 runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs
 delete mode 100644 runtime/integration-tests/src/relaychain/polkadot_test_net.rs
 delete mode 100644 runtime/integration-tests/src/relaychain/relay_chain.rs
 delete mode 100644 runtime/integration-tests/src/relaychain/statemine.rs
 delete mode 100644 runtime/integration-tests/src/relaychain/statemint.rs
 delete mode 100644 runtime/integration-tests/src/xcm_interface.rs

diff --git a/.github/workflows/extrinsic-ordering-check-on-release.yml b/.github/workflows/extrinsic-ordering-check-on-release.yml
index cc792684ea..2b3e2cfcf7 100644
--- a/.github/workflows/extrinsic-ordering-check-on-release.yml
+++ b/.github/workflows/extrinsic-ordering-check-on-release.yml
@@ -67,8 +67,8 @@ jobs:
 
       - name: Start local node
         run: |
-          docker run --name extrinsic-ordering-check-${{ env.CHAIN }}-${{ env.PREVIOUS_VERSION }} -d -p 9944:9944 --rm ghcr.io/acalanetwork/${{ env.CHAIN }}-node:${{ env.PREVIOUS_VERSION }} --chain=${{ env.CHAIN }}-dev --rpc-cors=all --ws-external --ws-port=9944 --tmp -- --dev
-          docker run --name extrinsic-ordering-check-${{ env.CHAIN }}-${{ env.VERSION }} -d -p 9955:9955 --rm ghcr.io/acalanetwork/${{ env.CHAIN }}-node:${{ env.VERSION }} --chain=${{ env.CHAIN }}-dev --rpc-cors=all --ws-external --ws-port=9955 --tmp -- --dev
+          docker run --name extrinsic-ordering-check-${{ env.CHAIN }}-${{ env.PREVIOUS_VERSION }} -d -p 9944:9944 --rm ghcr.io/acalanetwork/${{ env.CHAIN }}-node:${{ env.PREVIOUS_VERSION }} --chain=${{ env.CHAIN }}-dev --rpc-cors=all --rpc-external --rpc-port=9944 --tmp -- --dev
+          docker run --name extrinsic-ordering-check-${{ env.CHAIN }}-${{ env.VERSION }} -d -p 9955:9955 --rm ghcr.io/acalanetwork/${{ env.CHAIN }}-node:${{ env.VERSION }} --chain=${{ env.CHAIN }}-dev --rpc-cors=all --rpc-external --rpc-port=9955 --tmp -- --dev
           sleep 120
 
       - name: Compare the metadata
diff --git a/Cargo.lock b/Cargo.lock
index c1e4acbdde..c42b8712ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,7 +27,7 @@ version = "2.19.0"
 dependencies = [
  "acala-inspect",
  "acala-service",
- "clap 4.2.5",
+ "clap 4.3.19",
  "cumulus-client-cli",
  "cumulus-client-service",
  "cumulus-primitives-core",
@@ -55,7 +55,7 @@ dependencies = [
 name = "acala-inspect"
 version = "2.19.0"
 dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
  "derive_more",
  "log",
  "parity-scale-codec",
@@ -72,9 +72,9 @@ name = "acala-primitives"
 version = "2.19.0"
 dependencies = [
  "bstringify",
- "enumflags2 0.6.4",
+ "enumflags2",
  "frame-support",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "module-evm-utility",
  "module-evm-utility-macro",
  "num_enum",
@@ -134,7 +134,7 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "libsecp256k1",
  "module-aggregated-dex",
  "module-asset-registry",
@@ -260,7 +260,7 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.28",
  "hex",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "jsonrpsee",
  "k256 0.11.6",
  "karura-runtime",
@@ -293,6 +293,7 @@ dependencies = [
  "sc-telemetry",
  "sc-tracing",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "serde",
  "serde_json",
  "sp-api",
@@ -317,20 +318,20 @@ 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",
 ]
 
 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
 dependencies = [
- "gimli 0.27.2",
+ "gimli",
 ]
 
 [[package]]
@@ -393,9 +394,9 @@ dependencies = [
 
 [[package]]
 name = "aes"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
+checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
 dependencies = [
  "cfg-if",
  "cipher 0.4.4",
@@ -418,12 +419,12 @@ dependencies = [
 
 [[package]]
 name = "aes-gcm"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c"
+checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237"
 dependencies = [
  "aead 0.5.2",
- "aes 0.8.2",
+ "aes 0.8.3",
  "cipher 0.4.4",
  "ctr 0.9.2",
  "ghash 0.5.0",
@@ -456,7 +457,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
  "once_cell",
  "version_check",
 ]
@@ -468,25 +469,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
 dependencies = [
  "memchr",
 ]
@@ -497,6 +489,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4436e0292ab1bb631b42973c61205e704475fe8126af845c8d923c0996328127"
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -532,15 +530,15 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
 dependencies = [
  "utf8parse",
 ]
@@ -566,9 +564,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
 
 [[package]]
 name = "approx"
@@ -585,12 +583,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
 
-[[package]]
-name = "array-bytes"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
-
 [[package]]
 name = "array-bytes"
 version = "6.1.0"
@@ -611,9 +603,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "asn1-rs"
@@ -628,7 +620,7 @@ dependencies = [
  "num-traits",
  "rusticata-macros",
  "thiserror",
- "time 0.3.20",
+ "time 0.3.23",
 ]
 
 [[package]]
@@ -644,7 +636,7 @@ dependencies = [
  "num-traits",
  "rusticata-macros",
  "thiserror",
- "time 0.3.20",
+ "time 0.3.23",
 ]
 
 [[package]]
@@ -682,43 +674,17 @@ 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"
 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?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
-dependencies = [
- "cumulus-primitives-core",
- "frame-support",
- "log",
- "pallet-xcm",
- "parachains-common",
- "parity-scale-codec",
- "scale-info",
- "sp-api",
- "sp-std",
- "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
-
 [[package]]
 name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -739,9 +705,9 @@ dependencies = [
  "log",
  "parking",
  "polling",
- "rustix 0.37.18",
+ "rustix 0.37.23",
  "slab",
- "socket2",
+ "socket2 0.4.9",
  "waker-fn",
 ]
 
@@ -762,31 +728,31 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.68"
+version = "0.1.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "asynchronous-codec"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182"
+checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568"
 dependencies = [
  "bytes",
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
 ]
 
 [[package]]
@@ -826,16 +792,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
 dependencies = [
- "addr2line 0.19.0",
+ "addr2line 0.20.0",
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.6.2",
- "object 0.30.3",
+ "miniz_oxide",
+ "object 0.31.1",
  "rustc-demangle",
 ]
 
@@ -887,9 +853,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
 
 [[package]]
 name = "base64ct"
@@ -924,7 +890,7 @@ dependencies = [
 [[package]]
 name = "binary-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "hash-db 0.16.0",
  "log",
@@ -941,22 +907,23 @@ 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",
+ "bitflags 1.3.2",
  "cexpr",
  "clang-sys",
  "lazy_static",
  "lazycell",
  "peeking_take_while",
+ "prettyplease 0.2.12",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -965,6 +932,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
 [[package]]
 name = "bitvec"
 version = "0.17.4"
@@ -993,7 +966,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -1003,8 +976,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.2",
- "constant_time_eq",
+ "arrayvec 0.7.4",
+ "constant_time_eq 0.2.6",
 ]
 
 [[package]]
@@ -1014,22 +987,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.2",
- "constant_time_eq",
+ "arrayvec 0.7.4",
+ "constant_time_eq 0.2.6",
 ]
 
 [[package]]
 name = "blake3"
-version = "1.3.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef"
+checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "cc",
  "cfg-if",
- "constant_time_eq",
- "digest 0.10.6",
+ "constant_time_eq 0.3.0",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -1050,7 +1023,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "block-padding 0.2.1",
  "generic-array 0.14.7",
 ]
 
@@ -1090,9 +1062,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "bounded-collections"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3888522b497857eb606bf51695988dba7096941822c1bcf676e3a929a9ae7a0"
+checksum = "eb5b05133427c07c4776906f673ccf36c21b102c9829c641a5b56bd151d44fd6"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -1117,9 +1089,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 
 [[package]]
 name = "bstr"
-version = "1.4.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
 dependencies = [
  "memchr",
  "serde",
@@ -1142,9 +1114,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.12.1"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
 [[package]]
 name = "byte-slice-cast"
@@ -1189,18 +1161,18 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.4"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2"
+checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
+checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
 dependencies = [
  "serde",
 ]
@@ -1213,7 +1185,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.17",
+ "semver 1.0.18",
  "serde",
  "serde_json",
  "thiserror",
@@ -1256,9 +1228,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.10.3"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
+checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c"
 dependencies = [
  "smallvec",
 ]
@@ -1302,13 +1274,13 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.24"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
- "num-integer",
  "num-traits",
  "time 0.1.45",
  "wasm-bindgen",
@@ -1317,13 +1289,13 @@ 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",
 ]
@@ -1382,16 +1354,16 @@ version = "2.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "textwrap",
  "unicode-width",
 ]
 
 [[package]]
 name = "clap"
-version = "4.2.5"
+version = "4.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819"
+checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1400,34 +1372,33 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.2.5"
+version = "4.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab"
+checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
 dependencies = [
  "anstream",
  "anstyle",
- "bitflags",
  "clap_lex",
  "strsim",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.2.0"
+version = "4.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "coarsetime"
@@ -1460,13 +1431,13 @@ dependencies = [
  "bincode",
  "bs58",
  "coins-core",
- "digest 0.10.6",
- "getrandom 0.2.9",
+ "digest 0.10.7",
+ "getrandom 0.2.10",
  "hmac 0.12.1",
  "k256 0.11.6",
  "lazy_static",
  "serde",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "thiserror",
 ]
 
@@ -1478,12 +1449,12 @@ checksum = "2a11892bcac83b4c6e95ab84b5b06c76d9d70ad73548dd07418269c5c7977171"
 dependencies = [
  "bitvec 0.17.4",
  "coins-bip32",
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
  "hex",
  "hmac 0.12.1",
  "pbkdf2 0.11.0",
  "rand 0.8.5",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "thiserror",
 ]
 
@@ -1497,14 +1468,14 @@ dependencies = [
  "base64 0.12.3",
  "bech32",
  "blake2",
- "digest 0.10.6",
+ "digest 0.10.7",
  "generic-array 0.14.7",
  "hex",
  "ripemd",
  "serde",
  "serde_derive",
- "sha2 0.10.6",
- "sha3 0.10.7",
+ "sha2 0.10.7",
+ "sha3",
  "thiserror",
 ]
 
@@ -1516,15 +1487,21 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "comfy-table"
-version = "6.1.4"
+version = "7.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d"
+checksum = "9ab77dbd8adecaf3f0db40581631b995f312a8a5ae3aa9993188bb8f23d83a5b"
 dependencies = [
  "strum",
  "strum_macros",
  "unicode-width",
 ]
 
+[[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.2.0"
@@ -1534,17 +1511,36 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "console"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "const-oid"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b"
+checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
+
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
 [[package]]
 name = "convert_case"
@@ -1598,37 +1594,36 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.7"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
 dependencies = [
  "libc",
 ]
 
 [[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.2",
  "bumpalo",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
  "cranelift-isle",
- "gimli 0.26.2",
- "hashbrown 0.12.3",
+ "gimli",
+ "hashbrown 0.13.2",
  "log",
  "regalloc2",
  "smallvec",
@@ -1637,33 +1632,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",
@@ -1673,15 +1668,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",
@@ -1690,9 +1685,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",
@@ -1789,14 +1784,14 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.14"
+version = "0.9.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset 0.8.0",
+ "memoffset 0.9.0",
  "scopeguard",
 ]
 
@@ -1812,9 +1807,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
 dependencies = [
  "cfg-if",
 ]
@@ -1882,9 +1877,9 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad"
+checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
 dependencies = [
  "csv-core",
  "itoa",
@@ -1922,12 +1917,13 @@ dependencies = [
 [[package]]
 name = "cumulus-client-cli"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-cli",
+ "sc-client-api",
  "sc-service",
  "sp-core",
  "sp-runtime",
@@ -1937,7 +1933,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-collator"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
@@ -1960,16 +1956,26 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-aura"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 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 0.3.28",
+ "lru 0.10.1",
  "parity-scale-codec",
+ "polkadot-node-primitives",
+ "polkadot-overseer",
+ "polkadot-primitives",
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-aura",
+ "sc-consensus-babe",
  "sc-consensus-slots",
  "sc-telemetry",
  "sp-api",
@@ -1982,6 +1988,8 @@ dependencies = [
  "sp-inherents",
  "sp-keystore",
  "sp-runtime",
+ "sp-state-machine",
+ "sp-timestamp",
  "substrate-prometheus-endpoint",
  "tracing",
 ]
@@ -1989,10 +1997,10 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "async-trait",
- "cumulus-client-pov-recovery 0.1.0 (git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846)",
+ "cumulus-client-pov-recovery",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
  "dyn-clone",
@@ -2002,18 +2010,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//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "cumulus-primitives-parachain-inherent",
+ "sp-consensus",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-state-machine",
+ "thiserror",
+]
+
 [[package]]
 name = "cumulus-client-consensus-relay-chain"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "async-trait",
  "cumulus-client-consensus-common",
@@ -2036,7 +2064,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-network"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -2059,31 +2087,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-pov-recovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846"
-dependencies = [
- "async-trait",
- "cumulus-primitives-core",
- "cumulus-relay-chain-interface",
- "futures 0.3.28",
- "futures-timer",
- "parity-scale-codec",
- "polkadot-node-primitives",
- "polkadot-node-subsystem",
- "polkadot-overseer",
- "polkadot-primitives",
- "rand 0.8.5",
- "sc-client-api",
- "sc-consensus",
- "sp-consensus",
- "sp-maybe-compressed-blob",
- "sp-runtime",
- "tracing",
-]
-
-[[package]]
-name = "cumulus-client-pov-recovery"
-version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2107,13 +2111,13 @@ dependencies = [
 [[package]]
 name = "cumulus-client-service"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "cumulus-client-cli",
  "cumulus-client-collator",
  "cumulus-client-consensus-common",
  "cumulus-client-network",
- "cumulus-client-pov-recovery 0.1.0 (git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846)",
+ "cumulus-client-pov-recovery",
  "cumulus-primitives-core",
  "cumulus-relay-chain-inprocess-interface",
  "cumulus-relay-chain-interface",
@@ -2142,7 +2146,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-aura-ext"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2158,7 +2162,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-dmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -2175,7 +2179,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "bytes",
  "cumulus-pallet-parachain-system-proc-macro",
@@ -2204,32 +2208,18 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "cumulus-pallet-session-benchmarking"
-version = "3.0.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "pallet-session",
- "parity-scale-codec",
- "sp-runtime",
- "sp-std",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "cumulus-pallet-xcm"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -2245,7 +2235,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "cumulus-primitives-core",
  "frame-benchmarking",
@@ -2263,10 +2253,24 @@ dependencies = [
  "xcm-executor",
 ]
 
+[[package]]
+name = "cumulus-primitives-aura"
+version = "0.1.0"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
+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?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2283,7 +2287,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2306,7 +2310,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-timestamp"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "cumulus-primitives-core",
  "futures 0.3.28",
@@ -2319,7 +2323,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-utility"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -2337,7 +2341,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-inprocess-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2345,7 +2349,6 @@ dependencies = [
  "futures 0.3.28",
  "futures-timer",
  "polkadot-cli",
- "polkadot-client",
  "polkadot-service",
  "sc-cli",
  "sc-client-api",
@@ -2362,7 +2365,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2380,9 +2383,9 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-minimal-node"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
- "array-bytes 6.1.0",
+ "array-bytes",
  "async-trait",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
@@ -2418,7 +2421,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-rpc-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2448,7 +2451,7 @@ dependencies = [
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
@@ -2461,10 +2464,10 @@ dependencies = [
 [[package]]
 name = "cumulus-test-relay-validation-worker-provider"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
- "polkadot-node-core-pvf-worker 0.9.42 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.42)",
- "toml 0.7.3",
+ "polkadot-node-core-pvf",
+ "toml 0.7.6",
 ]
 
 [[package]]
@@ -2502,16 +2505,16 @@ dependencies = [
  "cfg-if",
  "fiat-crypto",
  "packed_simd_2",
- "platforms 3.0.2",
+ "platforms",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "cxx"
-version = "1.0.94"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
+checksum = "f68e12e817cb19eaab81aaec582b4052d07debd3c3c6b083b9d361db47c7dc9d"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -2521,9 +2524,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.94"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
+checksum = "e789217e4ab7cf8cc9ce82253180a9fe331f35f5d339f0ccfe0270b39433f397"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -2531,24 +2534,24 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.94"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
+checksum = "78a19f4c80fd9ab6c882286fa865e92e07688f4387370a209508014ead8751d0"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.94"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
+checksum = "b8fcfa71f66c8563c4fa9dd2bb68368d50267856f831ac5d85367e0805f9606c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -2588,15 +2591,15 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca"
+checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -2604,9 +2607,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db"
+checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772"
 dependencies = [
  "data-encoding",
  "syn 1.0.109",
@@ -2625,9 +2628,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56acb310e15652100da43d130af8d97b509e95af61aab1c5a7939ef24337ee17"
+checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946"
 dependencies = [
  "const-oid",
  "zeroize",
@@ -2753,9 +2756,9 @@ dependencies = [
 
 [[package]]
 name = "digest"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
  "const-oid",
@@ -2806,32 +2809,52 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
-name = "downcast"
-version = "0.11.0"
+name = "docify"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
+checksum = "af1b04e6ef3d21119d3eb7b032bca17f99fe041e9c072f30f32cc0e1a2b1f3c4"
+dependencies = [
+ "docify_macros",
+]
 
 [[package]]
-name = "downcast-rs"
-version = "1.2.0"
+name = "docify_macros"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b5610df7f2acf89a1bb5d1a66ae56b1c7fcdcfe3948856fb3ace3f644d70eb7"
+dependencies = [
+ "common-path",
+ "derive-syn-parse",
+ "lazy_static",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.27",
+ "termcolor",
+ "walkdir",
+]
+
+[[package]]
+name = "downcast"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
 [[package]]
 name = "dtoa"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "dyn-clonable"
@@ -2856,9 +2879,9 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
+checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272"
 
 [[package]]
 name = "e2e-tests"
@@ -2881,12 +2904,12 @@ dependencies = [
 
 [[package]]
 name = "ecdsa"
-version = "0.16.7"
+version = "0.16.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428"
+checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
 dependencies = [
- "der 0.7.6",
- "digest 0.10.6",
+ "der 0.7.7",
+ "digest 0.10.7",
  "elliptic-curve 0.13.5",
  "rfc6979 0.4.0",
  "signature 2.1.0",
@@ -2932,9 +2955,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "elliptic-curve"
@@ -2945,7 +2968,7 @@ dependencies = [
  "base16ct 0.1.1",
  "crypto-bigint 0.4.9",
  "der 0.6.1",
- "digest 0.10.6",
+ "digest 0.10.7",
  "ff 0.12.1",
  "generic-array 0.14.7",
  "group 0.12.1",
@@ -2966,17 +2989,23 @@ checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
 dependencies = [
  "base16ct 0.2.0",
  "crypto-bigint 0.5.2",
- "digest 0.10.6",
+ "digest 0.10.7",
  "ff 0.13.0",
  "generic-array 0.14.7",
  "group 0.13.0",
  "pkcs8 0.10.2",
  "rand_core 0.6.4",
- "sec1 0.7.2",
+ "sec1 0.7.3",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
 [[package]]
 name = "enum-as-inner"
 version = "0.5.1"
@@ -2989,34 +3018,14 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "enumflags2"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
-dependencies = [
- "enumflags2_derive 0.6.4",
- "serde",
-]
-
 [[package]]
 name = "enumflags2"
 version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2"
 dependencies = [
- "enumflags2_derive 0.7.7",
-]
-
-[[package]]
-name = "enumflags2_derive"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "enumflags2_derive",
+ "serde",
 ]
 
 [[package]]
@@ -3027,18 +3036,18 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "enumn"
-version = "0.1.8"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76"
+checksum = "b893c4eb2dc092c811165f84dc7447fae16fb66521717968c34c509b39b1a5c5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -3074,15 +3083,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b"
 
 [[package]]
-name = "errno"
-version = "0.2.8"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
@@ -3114,7 +3118,7 @@ dependencies = [
  "ethereum-types",
  "hex",
  "serde",
- "sha3 0.10.7",
+ "sha3",
  "thiserror",
  "uint",
 ]
@@ -3148,7 +3152,7 @@ dependencies = [
  "rlp",
  "scale-info",
  "serde",
- "sha3 0.10.7",
+ "sha3",
  "triehash",
 ]
 
@@ -3202,7 +3206,7 @@ dependencies = [
  "rlp",
  "scale-info",
  "serde",
- "sha3 0.10.7",
+ "sha3",
 ]
 
 [[package]]
@@ -3256,7 +3260,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sha3 0.10.7",
+ "sha3",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -3272,7 +3276,7 @@ dependencies = [
  "environmental",
  "evm-core",
  "primitive-types",
- "sha3 0.10.7",
+ "sha3",
 ]
 
 [[package]]
@@ -3308,19 +3312,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.0.0"
@@ -3331,7 +3322,7 @@ dependencies = [
  "fs-err",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -3355,6 +3346,12 @@ dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
 [[package]]
 name = "fatality"
 version = "0.0.6"
@@ -3372,7 +3369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd"
 dependencies = [
  "expander 0.0.4",
- "indexmap",
+ "indexmap 1.9.3",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
@@ -3479,7 +3476,7 @@ checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
 dependencies = [
  "crc32fast",
  "libz-sys",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -3500,16 +3497,16 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
 ]
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
 dependencies = [
  "percent-encoding",
 ]
@@ -3523,7 +3520,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -3548,12 +3545,12 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "Inflector",
- "array-bytes 4.2.0",
+ "array-bytes",
  "chrono",
- "clap 4.2.5",
+ "clap 4.3.19",
  "comfy-table",
  "frame-benchmarking",
  "frame-support",
@@ -3582,12 +3579,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",
 ]
@@ -3595,18 +3593,18 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -3623,7 +3621,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3639,9 +3637,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",
@@ -3652,10 +3650,11 @@ dependencies = [
 [[package]]
 name = "frame-remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-recursion",
  "futures 0.3.28",
+ "indicatif",
  "jsonrpsee",
  "log",
  "parity-scale-codec",
@@ -3663,23 +3662,25 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
+ "spinners",
  "substrate-rpc-client",
  "tokio",
+ "tokio-retry",
 ]
 
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "environmental",
  "frame-metadata",
  "frame-support-procedural",
  "impl-trait-for-tuples",
  "k256 0.13.1",
  "log",
- "once_cell",
+ "macro_magic",
  "parity-scale-codec",
  "paste",
  "scale-info",
@@ -3689,6 +3690,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-core-hashing-proc-macro",
+ "sp-debug-derive",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
@@ -3703,46 +3705,49 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "Inflector",
  "cfg-expr",
  "derive-syn-parse",
+ "expander 2.0.0",
  "frame-support-procedural-tools",
  "itertools",
+ "macro_magic",
  "proc-macro-warning",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
+ "cfg-if",
  "frame-support",
  "log",
  "parity-scale-codec",
@@ -3759,7 +3764,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3774,7 +3779,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3783,7 +3788,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3810,13 +3815,12 @@ dependencies = [
 
 [[package]]
 name = "fs4"
-version = "0.6.3"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea55201cc351fdb478217c0fb641b59813da9b4efe4c414a9d8f989a657d149"
+checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
 dependencies = [
- "libc",
- "rustix 0.35.13",
- "winapi",
+ "rustix 0.38.4",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3886,12 +3890,12 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
  "futures-core",
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
  "waker-fn",
 ]
 
@@ -3903,7 +3907,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -3953,7 +3957,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
  "pin-utils",
  "slab",
 ]
@@ -4010,9 +4014,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4038,26 +4042,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
 dependencies = [
  "opaque-debug 0.3.0",
- "polyval 0.6.0",
+ "polyval 0.6.1",
 ]
 
 [[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",
+ "indexmap 1.9.3",
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
-
 [[package]]
 name = "glob"
 version = "0.3.1"
@@ -4066,11 +4064,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "globset"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df"
 dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick",
  "bstr",
  "fnv",
  "log",
@@ -4111,9 +4109,9 @@ dependencies = [
 
 [[package]]
 name = "gloo-utils"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8e8fc851e9c7b9852508bc6e3f690f452f474417e8545ec9857b7f7377036b5"
+checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e"
 dependencies = [
  "js-sys",
  "serde",
@@ -4146,9 +4144,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.18"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
 dependencies = [
  "bytes",
  "fnv",
@@ -4156,7 +4154,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 1.9.3",
  "slab",
  "tokio",
  "tokio-util",
@@ -4171,9 +4169,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
 [[package]]
 name = "handlebars"
-version = "4.3.6"
+version = "4.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a"
+checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d"
 dependencies = [
  "log",
  "pest",
@@ -4222,6 +4220,12 @@ dependencies = [
  "ahash 0.8.3",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -4239,18 +4243,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
 name = "hex"
@@ -4305,7 +4300,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -4349,14 +4344,14 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes",
  "http",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
 ]
 
 [[package]]
 name = "http-range-header"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
+checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
 [[package]]
 name = "httparse"
@@ -4378,9 +4373,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.26"
+version = "0.14.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -4392,8 +4387,8 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project-lite 0.2.9",
- "socket2",
+ "pin-project-lite 0.2.10",
+ "socket2 0.4.9",
  "tokio",
  "tower-service",
  "tracing",
@@ -4412,15 +4407,31 @@ dependencies = [
  "rustls 0.20.8",
  "rustls-native-certs",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.23.4",
  "webpki-roots",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "log",
+ "rustls 0.21.5",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls 0.24.1",
+]
+
 [[package]]
 name = "iana-time-zone"
-version = "0.1.56"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -4432,12 +4443,11 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
 ]
 
 [[package]]
@@ -4459,9 +4469,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -4545,6 +4555,29 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.17.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
+dependencies = [
+ "console",
+ "instant",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-width",
+]
+
 [[package]]
 name = "inout"
 version = "0.1.3"
@@ -4599,17 +4632,11 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi 0.3.2",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -4622,31 +4649,30 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1"
 
 [[package]]
 name = "ipconfig"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2",
+ "socket2 0.5.3",
  "widestring",
- "winapi",
+ "windows-sys 0.48.0",
  "winreg",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.7.2"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes 1.0.10",
- "rustix 0.37.18",
+ "hermit-abi 0.3.2",
+ "rustix 0.38.4",
  "windows-sys 0.48.0",
 ]
 
@@ -4661,9 +4687,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jobserver"
@@ -4676,9 +4702,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.61"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -4719,7 +4745,7 @@ dependencies = [
  "soketto",
  "thiserror",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.23.4",
  "tokio-util",
  "tracing",
  "webpki-roots",
@@ -4732,7 +4758,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b"
 dependencies = [
  "anyhow",
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "async-lock",
  "async-trait",
  "beef",
@@ -4762,7 +4788,7 @@ checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad"
 dependencies = [
  "async-trait",
  "hyper",
- "hyper-rustls",
+ "hyper-rustls 0.23.2",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "rustc-hash",
@@ -4854,8 +4880,8 @@ dependencies = [
  "cfg-if",
  "ecdsa 0.14.8",
  "elliptic-curve 0.12.3",
- "sha2 0.10.6",
- "sha3 0.10.7",
+ "sha2 0.10.7",
+ "sha3",
 ]
 
 [[package]]
@@ -4865,10 +4891,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
 dependencies = [
  "cfg-if",
- "ecdsa 0.16.7",
+ "ecdsa 0.16.8",
  "elliptic-curve 0.13.5",
  "once_cell",
- "sha2 0.10.6",
+ "sha2 0.10.7",
 ]
 
 [[package]]
@@ -4891,7 +4917,7 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "libsecp256k1",
  "module-aggregated-dex",
  "module-asset-registry",
@@ -4991,9 +5017,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
 dependencies = [
  "cpufeatures",
 ]
@@ -5010,8 +5036,8 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bitvec 1.0.1",
  "frame-benchmarking",
@@ -5044,6 +5070,7 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-nis",
  "pallet-nomination-pools",
@@ -5062,6 +5089,7 @@ dependencies = [
  "pallet-society",
  "pallet-staking",
  "pallet-staking-runtime-api",
+ "pallet-state-trie-migration",
  "pallet-timestamp",
  "pallet-tips",
  "pallet-transaction-payment",
@@ -5108,8 +5136,8 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime-constants"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -5141,9 +5169,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",
@@ -5153,6 +5181,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"
@@ -5170,9 +5209,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libloading"
@@ -5190,30 +5229,26 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
 
-[[package]]
-name = "libm"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
-
 [[package]]
 name = "libp2p"
-version = "0.50.1"
+version = "0.51.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8"
+checksum = "f210d259724eae82005b5c48078619b7745edb7b76de370b03f8ba59ea103097"
 dependencies = [
  "bytes",
  "futures 0.3.28",
  "futures-timer",
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
  "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",
@@ -5224,44 +5259,32 @@ dependencies = [
  "libp2p-webrtc",
  "libp2p-websocket",
  "libp2p-yamux",
- "multiaddr 0.16.0",
- "parking_lot 0.12.1",
+ "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",
- "either",
- "fnv",
- "futures 0.3.28",
- "futures-timer",
- "instant",
- "log",
- "multiaddr 0.16.0",
- "multihash 0.16.3",
- "multistream-select",
- "once_cell",
- "parking_lot 0.12.1",
- "pin-project",
- "prost",
- "prost-build",
- "rand 0.8.5",
- "rw-stream-sink",
- "sec1 0.3.0",
- "sha2 0.10.6",
- "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]]
@@ -5277,8 +5300,8 @@ dependencies = [
  "instant",
  "libp2p-identity",
  "log",
- "multiaddr 0.17.1",
- "multihash 0.17.0",
+ "multiaddr",
+ "multihash",
  "multistream-select",
  "once_cell",
  "parking_lot 0.12.1",
@@ -5294,12 +5317,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 0.3.28",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "log",
  "parking_lot 0.12.1",
  "smallvec",
@@ -5308,20 +5331,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 0.3.28",
  "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",
@@ -5336,22 +5360,22 @@ dependencies = [
  "bs58",
  "ed25519-dalek",
  "log",
- "multiaddr 0.17.1",
- "multihash 0.17.0",
+ "multiaddr",
+ "multihash",
  "quick-protobuf",
  "rand 0.8.5",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "thiserror",
  "zeroize",
 ]
 
 [[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.2",
+ "arrayvec 0.7.4",
  "asynchronous-codec",
  "bytes",
  "either",
@@ -5359,13 +5383,13 @@ dependencies = [
  "futures 0.3.28",
  "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.6",
+ "sha2 0.10.7",
  "smallvec",
  "thiserror",
  "uint",
@@ -5375,19 +5399,20 @@ 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 0.3.28",
  "if-watch",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
  "rand 0.8.5",
  "smallvec",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
  "trust-dns-proto",
  "void",
@@ -5395,11 +5420,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",
@@ -5407,40 +5432,22 @@ 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 0.3.28",
- "libp2p-core 0.38.0",
- "log",
- "nohash-hasher",
- "parking_lot 0.12.1",
- "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 0.3.28",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "log",
  "once_cell",
- "prost",
- "prost-build",
+ "quick-protobuf",
  "rand 0.8.5",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "snow",
  "static_assertions",
  "thiserror",
@@ -5450,14 +5457,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 0.3.28",
  "futures-timer",
  "instant",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "libp2p-swarm",
  "log",
  "rand 0.8.5",
@@ -5466,15 +5474,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 0.3.28",
  "futures-timer",
  "if-watch",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-tls",
  "log",
  "parking_lot 0.12.1",
@@ -5487,49 +5496,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 0.3.28",
  "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 0.3.28",
  "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",
  "quote",
@@ -5538,17 +5544,17 @@ 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 0.3.28",
  "futures-timer",
  "if-watch",
  "libc",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "log",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
 ]
 
@@ -5560,7 +5566,7 @@ checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781"
 dependencies = [
  "futures 0.3.28",
  "futures-rustls",
- "libp2p-core 0.39.2",
+ "libp2p-core",
  "libp2p-identity",
  "rcgen 0.10.0",
  "ring",
@@ -5573,13 +5579,13 @@ dependencies = [
 
 [[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 0.3.28",
  "js-sys",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "parity-send-wrapper",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -5587,9 +5593,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webrtc"
-version = "0.4.0-alpha"
+version = "0.4.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a"
+checksum = "dba48592edbc2f60b4bc7c10d65445b0c3964c07df26fdf493b6880d33be36f8"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
@@ -5598,13 +5604,13 @@ dependencies = [
  "futures-timer",
  "hex",
  "if-watch",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-noise",
  "log",
- "multihash 0.16.3",
- "prost",
- "prost-build",
- "prost-codec",
+ "multihash",
+ "quick-protobuf",
+ "quick-protobuf-codec",
  "rand 0.8.5",
  "rcgen 0.9.3",
  "serde",
@@ -5618,14 +5624,14 @@ dependencies = [
 
 [[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 0.3.28",
  "futures-rustls",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "log",
  "parking_lot 0.12.1",
  "quicksink",
@@ -5637,23 +5643,22 @@ 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 0.3.28",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "log",
- "parking_lot 0.12.1",
  "thiserror",
  "yamux",
 ]
 
 [[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",
@@ -5714,9 +5719,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.9"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db"
+checksum = "24e6ab01971eb092ffe6a7d42f49f9ff42662f17604681e2843ad65077ba47dc"
 dependencies = [
  "cc",
  "pkg-config",
@@ -5725,9 +5730,9 @@ dependencies = [
 
 [[package]]
 name = "link-cplusplus"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
+checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9"
 dependencies = [
  "cc",
 ]
@@ -5749,36 +5754,36 @@ dependencies = [
 
 [[package]]
 name = "linregress"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "475015a7f8f017edb28d2e69813be23500ad4b32cfe3421c4148efc97324ee52"
+checksum = "4de0b5f52a9f84544d268f5fabb71b38962d6aa3c6600b8bcd27d44ccf9c9c45"
 dependencies = [
  "nalgebra",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.0.46"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.6"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -5786,27 +5791,24 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 
 [[package]]
 name = "lru"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909"
+checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17"
 dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown 0.13.2",
 ]
 
 [[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",
 ]
@@ -5850,14 +5852,61 @@ dependencies = [
 ]
 
 [[package]]
-name = "mandala-runtime"
-version = "2.19.0"
+name = "macro_magic"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614b1304ab7877b499925b4dcc5223ff480f2646ad4db1ee7065badb8d530439"
 dependencies = [
- "acala-primitives",
- "acala-service",
- "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
+ "macro_magic_core",
+ "macro_magic_macros",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "macro_magic_core"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d72c1b662d07b8e482c80d3a7fc4168e058b3bef4c573e94feb714b670f406"
+dependencies = [
+ "derive-syn-parse",
+ "macro_magic_core_macros",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "macro_magic_core_macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d7d9e6e234c040dafc745c7592738d56a03ad04b1fa04ab60821deb597466a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "macro_magic_macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffd19f13cfd2bfbd83692adfef8c244fe5109b3eb822a1fb4e0a6253b406cd81"
+dependencies = [
+ "macro_magic_core",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "mandala-runtime"
+version = "2.19.0"
+dependencies = [
+ "acala-primitives",
+ "acala-service",
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcm",
  "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
@@ -5869,11 +5918,10 @@ dependencies = [
  "frame-executive",
  "frame-support",
  "frame-system",
- "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "libsecp256k1",
  "module-aggregated-dex",
  "module-asset-registry",
@@ -5995,7 +6043,7 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
@@ -6006,9 +6054,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "matrixmultiply"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcce854c9e76cfd191182c280eb5460cb8efd2cb4e58a1fd56bc41102d7e5802"
+checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77"
 dependencies = [
  "autocfg",
  "rawpointer",
@@ -6020,7 +6068,7 @@ version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -6035,7 +6083,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e"
 dependencies = [
- "rustix 0.37.18",
+ "rustix 0.37.23",
 ]
 
 [[package]]
@@ -6065,6 +6113,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "memory-db"
 version = "0.32.0"
@@ -6074,12 +6131,6 @@ dependencies = [
  "hash-db 0.16.0",
 ]
 
-[[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"
@@ -6109,15 +6160,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -6129,20 +6171,19 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
- "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "mmr-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "futures 0.3.28",
  "log",
@@ -6161,7 +6202,7 @@ dependencies = [
 [[package]]
 name = "mmr-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "anyhow",
  "jsonrpsee",
@@ -6354,7 +6395,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "module-evm",
  "module-evm-bridge",
  "module-support",
@@ -6455,11 +6496,12 @@ name = "module-evm"
 version = "2.19.0"
 dependencies = [
  "acala-primitives",
- "env_logger 0.9.3",
+ "env_logger 0.10.0",
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "hex",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "module-dex",
  "module-evm-utility",
  "module-idle-scheduler",
@@ -6474,12 +6516,12 @@ dependencies = [
  "pallet-timestamp",
  "pallet-utility",
  "parity-scale-codec",
- "ripemd160",
+ "ripemd",
  "rlp",
  "scale-info",
  "serde",
  "serde_json",
- "sha3 0.9.1",
+ "sha3",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -6555,7 +6597,7 @@ dependencies = [
  "evm",
  "evm-gasometer",
  "evm-runtime",
- "sha3 0.10.7",
+ "sha3",
  "sp-std",
 ]
 
@@ -6865,7 +6907,7 @@ dependencies = [
  "acala-primitives",
  "frame-support",
  "frame-system",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "module-support",
  "orml-tokens",
  "orml-traits",
@@ -6932,24 +6974,6 @@ dependencies = [
  "xcm-executor",
 ]
 
-[[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"
@@ -6961,7 +6985,7 @@ dependencies = [
  "data-encoding",
  "log",
  "multibase",
- "multihash 0.17.0",
+ "multihash",
  "percent-encoding",
  "serde",
  "static_assertions",
@@ -6982,29 +7006,18 @@ 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",
  "blake3",
  "core2",
- "digest 0.10.6",
- "multihash-derive",
- "sha2 0.10.6",
- "sha3 0.10.7",
- "unsigned-varint",
-]
-
-[[package]]
-name = "multihash"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
-dependencies = [
- "core2",
+ "digest 0.10.7",
  "multihash-derive",
+ "sha2 0.10.7",
+ "sha3",
  "unsigned-varint",
 ]
 
@@ -7044,9 +7057,9 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.32.2"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511"
+checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa"
 dependencies = [
  "approx",
  "matrixmultiply",
@@ -7060,9 +7073,9 @@ dependencies = [
 
 [[package]]
 name = "nalgebra-macros"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
+checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7103,7 +7116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab"
 dependencies = [
  "anyhow",
- "bitflags",
+ "bitflags 1.3.2",
  "byteorder",
  "libc",
  "netlink-packet-core",
@@ -7156,7 +7169,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
  "memoffset 0.6.5",
@@ -7186,9 +7199,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
 name = "num"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
+checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -7224,7 +7237,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "itoa",
 ]
 
@@ -7263,20 +7276,20 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.3.2",
  "libc",
 ]
 
@@ -7301,6 +7314,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
 [[package]]
 name = "nutsfinance-stable-asset"
 version = "0.1.0"
@@ -7319,21 +7338,21 @@ dependencies = [
 
 [[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",
- "indexmap",
+ "hashbrown 0.13.2",
+ "indexmap 1.9.3",
  "memchr",
 ]
 
 [[package]]
 name = "object"
-version = "0.30.3"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
 dependencies = [
  "memchr",
 ]
@@ -7358,9 +7377,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "oorandom"
@@ -7443,6 +7462,7 @@ dependencies = [
  "orml-xcm-support",
  "orml-xtokens",
  "pallet-balances",
+ "pallet-message-queue",
  "pallet-xcm",
  "parachain-info",
  "parity-scale-codec",
@@ -7697,6 +7717,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
+ "sp-staking",
  "sp-std",
 ]
 
@@ -7774,6 +7795,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
+ "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -7854,6 +7876,7 @@ dependencies = [
  "orml-xcm",
  "orml-xcm-support",
  "pallet-balances",
+ "pallet-message-queue",
  "pallet-xcm",
  "parachain-info",
  "parity-scale-codec",
@@ -7879,7 +7902,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
 dependencies = [
  "ecdsa 0.14.8",
  "elliptic-curve 0.12.3",
- "sha2 0.10.6",
+ "sha2 0.10.7",
 ]
 
 [[package]]
@@ -7890,7 +7913,7 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa"
 dependencies = [
  "ecdsa 0.14.8",
  "elliptic-curve 0.12.3",
- "sha2 0.10.6",
+ "sha2 0.10.7",
 ]
 
 [[package]]
@@ -7900,46 +7923,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
 dependencies = [
  "cfg-if",
- "libm 0.1.4",
-]
-
-[[package]]
-name = "pallet-asset-tx-payment"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "pallet-transaction-payment",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-assets"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "scale-info",
- "sp-core",
- "sp-runtime",
- "sp-std",
+ "libm",
 ]
 
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7955,7 +7945,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7971,7 +7961,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7985,7 +7975,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8009,7 +7999,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8029,7 +8019,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8044,7 +8034,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8063,9 +8053,9 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "binary-merkle-tree",
  "frame-support",
  "frame-system",
@@ -8087,7 +8077,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8105,7 +8095,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8121,29 +8111,10 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-collator-selection"
-version = "3.0.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "log",
- "pallet-authorship",
- "pallet-session",
- "parity-scale-codec",
- "rand 0.8.5",
- "scale-info",
- "sp-runtime",
- "sp-staking",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8160,7 +8131,7 @@ dependencies = [
 [[package]]
 name = "pallet-conviction-voting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -8177,7 +8148,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8195,7 +8166,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8218,7 +8189,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8231,7 +8202,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8243,14 +8214,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?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-support",
@@ -8267,7 +8240,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8290,9 +8263,9 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "enumflags2 0.7.7",
+ "enumflags2",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8306,7 +8279,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8326,7 +8299,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8343,7 +8316,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8358,71 +8331,61 @@ dependencies = [
 ]
 
 [[package]]
-name = "pallet-mmr"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+name = "pallet-message-queue"
+version = "7.0.0-dev"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "scale-info",
+ "sp-arithmetic",
  "sp-core",
  "sp-io",
- "sp-mmr-primitives",
  "sp-runtime",
  "sp-std",
+ "sp-weights",
 ]
 
 [[package]]
-name = "pallet-multisig"
+name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
  "parity-scale-codec",
  "scale-info",
+ "sp-core",
  "sp-io",
+ "sp-mmr-primitives",
  "sp-runtime",
  "sp-std",
 ]
 
 [[package]]
-name = "pallet-nfts"
+name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "enumflags2 0.7.7",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
  "parity-scale-codec",
  "scale-info",
- "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-nfts-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
-dependencies = [
- "frame-support",
- "pallet-nfts",
- "parity-scale-codec",
- "sp-api",
-]
-
 [[package]]
 name = "pallet-nis"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8438,7 +8401,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8455,7 +8418,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8475,7 +8438,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
@@ -8486,7 +8449,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8503,7 +8466,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8527,7 +8490,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8544,7 +8507,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8559,7 +8522,7 @@ dependencies = [
 [[package]]
 name = "pallet-ranked-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8577,7 +8540,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8592,7 +8555,7 @@ dependencies = [
 [[package]]
 name = "pallet-referenda"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -8611,7 +8574,7 @@ dependencies = [
 [[package]]
 name = "pallet-root-testing"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8626,7 +8589,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8643,7 +8606,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8664,7 +8627,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8680,13 +8643,18 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "hex-literal 0.3.4",
+ "log",
  "parity-scale-codec",
  "rand_chacha 0.2.2",
  "scale-info",
+ "sp-arithmetic",
+ "sp-io",
  "sp-runtime",
  "sp-std",
 ]
@@ -8694,7 +8662,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8717,18 +8685,18 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -8737,7 +8705,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8746,7 +8714,7 @@ dependencies = [
 [[package]]
 name = "pallet-state-trie-migration"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8763,8 +8731,9 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
@@ -8777,7 +8746,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8795,7 +8764,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8814,7 +8783,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8830,7 +8799,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -8846,7 +8815,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -8858,7 +8827,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8872,25 +8841,10 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-uniques"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "log",
- "parity-scale-codec",
- "scale-info",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8906,7 +8860,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8921,7 +8875,7 @@ dependencies = [
 [[package]]
 name = "pallet-whitelist"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8935,8 +8889,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
@@ -8956,8 +8910,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm-benchmarks"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8976,40 +8930,15 @@ dependencies = [
 [[package]]
 name = "parachain-info"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
+source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
  "scale-info",
-]
-
-[[package]]
-name = "parachains-common"
-version = "1.0.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#f603a61ff370fc33740c9373833c3c6ba1486846"
-dependencies = [
- "cumulus-primitives-utility",
- "frame-support",
- "frame-system",
- "pallet-asset-tx-payment",
- "pallet-assets",
- "pallet-authorship",
- "pallet-balances",
- "pallet-collator-selection",
- "parity-scale-codec",
- "polkadot-primitives",
- "scale-info",
- "sp-consensus-aura",
- "sp-core",
- "sp-io",
  "sp-runtime",
  "sp-std",
- "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -9020,9 +8949,9 @@ checksum = "16b56e3a2420138bdb970f84dfb9c774aea80fa0e7371549eedec0d80c209c67"
 
 [[package]]
 name = "parity-db"
-version = "0.4.6"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00bfb81cf5c90a222db2fb7b3a7cbf8cc7f38dfb6647aca4d98edf8281f56ed5"
+checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8"
 dependencies = [
  "blake2",
  "crc32fast",
@@ -9040,11 +8969,11 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.4.0"
+version = "3.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac"
+checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "bitvec 1.0.1",
  "byte-slice-cast",
  "bytes",
@@ -9055,9 +8984,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.1.4"
+version = "3.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b"
+checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9110,7 +9039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.7",
+ "parking_lot_core 0.9.8",
 ]
 
 [[package]]
@@ -9129,17 +9058,23 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.3.5",
  "smallvec",
- "windows-sys 0.45.0",
+ "windows-targets 0.48.1",
 ]
 
+[[package]]
+name = "partial_sort"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156"
+
 [[package]]
 name = "password-hash"
 version = "0.4.2"
@@ -9153,9 +9088,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "pbkdf2"
@@ -9172,10 +9107,10 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
  "hmac 0.12.1",
  "password-hash",
- "sha2 0.10.6",
+ "sha2 0.10.7",
 ]
 
 [[package]]
@@ -9204,15 +9139,15 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pest"
-version = "2.6.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70"
+checksum = "0d2d1d55045829d65aad9d389139882ad623b33b904e7c9f1b10c5b8927298e5"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -9220,9 +9155,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.6.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb"
+checksum = "5f94bca7e7a599d89dea5dfa309e217e7906c3c007fb9c3299c40b10d6a315d3"
 dependencies = [
  "pest",
  "pest_generator",
@@ -9230,26 +9165,26 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.6.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e"
+checksum = "99d490fe7e8556575ff6911e45567ab95e71617f43781e5c05490dc8d75c965c"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.6.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411"
+checksum = "2674c66ebb4b4d9036012091b537aae5878970d6999f81a265034d85b136b341"
 dependencies = [
  "once_cell",
  "pest",
- "sha2 0.10.6",
+ "sha2 0.10.7",
 ]
 
 [[package]]
@@ -9259,27 +9194,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
 dependencies = [
  "fixedbitset",
- "indexmap",
+ "indexmap 1.9.3",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.0.12"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -9290,9 +9225,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
 
 [[package]]
 name = "pin-utils"
@@ -9316,15 +9251,15 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
- "der 0.7.6",
+ "der 0.7.7",
  "spki 0.7.2",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "plain_hasher"
@@ -9335,12 +9270,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "platforms"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
-
 [[package]]
 name = "platforms"
 version = "3.0.2"
@@ -9349,9 +9278,9 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
 
 [[package]]
 name = "plotters"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
+checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -9362,30 +9291,32 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
 dependencies = [
  "plotters-backend",
 ]
 
 [[package]]
 name = "polkadot-approval-distribution"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "futures 0.3.28",
+ "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",
@@ -9393,10 +9324,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "futures 0.3.28",
+ "futures-timer",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -9407,8 +9339,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-distribution"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "derive_more",
  "fatality",
@@ -9430,8 +9362,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-recovery"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "fatality",
  "futures 0.3.28",
@@ -9451,15 +9383,15 @@ dependencies = [
 
 [[package]]
 name = "polkadot-cli"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
  "frame-benchmarking-cli",
  "futures 0.3.28",
  "log",
- "polkadot-client",
- "polkadot-node-core-pvf-worker 0.9.42 (git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef)",
+ "polkadot-node-core-pvf-execute-worker",
+ "polkadot-node-core-pvf-prepare-worker",
  "polkadot-node-metrics",
  "polkadot-performance-test",
  "polkadot-service",
@@ -9478,53 +9410,10 @@ dependencies = [
  "try-runtime-cli",
 ]
 
-[[package]]
-name = "polkadot-client"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
-dependencies = [
- "async-trait",
- "frame-benchmarking",
- "frame-benchmarking-cli",
- "frame-system",
- "frame-system-rpc-runtime-api",
- "futures 0.3.28",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "polkadot-core-primitives",
- "polkadot-node-core-parachains-inherent",
- "polkadot-primitives",
- "polkadot-runtime",
- "polkadot-runtime-common",
- "rococo-runtime",
- "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?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "always-assert",
  "bitvec 1.0.1",
@@ -9545,8 +9434,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9557,14 +9446,14 @@ dependencies = [
 
 [[package]]
 name = "polkadot-dispute-distribution"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "derive_more",
  "fatality",
  "futures 0.3.28",
  "futures-timer",
- "indexmap",
+ "indexmap 1.9.3",
  "lru 0.9.0",
  "parity-scale-codec",
  "polkadot-erasure-coding",
@@ -9582,8 +9471,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -9596,8 +9485,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-gossip-support"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "futures 0.3.28",
  "futures-timer",
@@ -9616,8 +9505,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-network-bridge"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "always-assert",
  "async-trait",
@@ -9639,8 +9528,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-collation-generation"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "futures 0.3.28",
  "parity-scale-codec",
@@ -9657,8 +9546,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-approval-voting"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bitvec 1.0.1",
  "derive_more",
@@ -9686,8 +9575,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-av-store"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bitvec 1.0.1",
  "futures 0.3.28",
@@ -9695,6 +9584,7 @@ dependencies = [
  "kvdb",
  "parity-scale-codec",
  "polkadot-erasure-coding",
+ "polkadot-node-jaeger",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -9707,8 +9597,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-backing"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bitvec 1.0.1",
  "fatality",
@@ -9726,8 +9616,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "futures 0.3.28",
  "polkadot-node-subsystem",
@@ -9741,8 +9631,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-candidate-validation"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
@@ -9761,8 +9651,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-api"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "futures 0.3.28",
  "polkadot-node-metrics",
@@ -9776,8 +9666,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-selection"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "futures 0.3.28",
  "futures-timer",
@@ -9793,8 +9683,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "fatality",
  "futures 0.3.28",
@@ -9812,8 +9702,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
@@ -9829,8 +9719,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-provisioner"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bitvec 1.0.1",
  "fatality",
@@ -9847,8 +9737,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "always-assert",
  "futures 0.3.28",
@@ -9857,6 +9747,9 @@ dependencies = [
  "parity-scale-codec",
  "pin-project",
  "polkadot-core-primitives",
+ "polkadot-node-core-pvf-common",
+ "polkadot-node-core-pvf-execute-worker",
+ "polkadot-node-core-pvf-prepare-worker",
  "polkadot-node-metrics",
  "polkadot-node-primitives",
  "polkadot-parachain",
@@ -9868,14 +9761,15 @@ dependencies = [
  "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?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "futures 0.3.28",
  "polkadot-node-primitives",
@@ -9889,58 +9783,67 @@ dependencies = [
 ]
 
 [[package]]
-name = "polkadot-node-core-pvf-worker"
-version = "0.9.42"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+name = "polkadot-node-core-pvf-common"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
- "assert_matches",
  "cpu-time",
  "futures 0.3.28",
+ "landlock",
  "libc",
  "parity-scale-codec",
- "polkadot-node-core-pvf",
  "polkadot-parachain",
  "polkadot-primitives",
- "rayon",
  "sc-executor",
  "sc-executor-common",
  "sc-executor-wasmtime",
  "sp-core",
  "sp-externalities",
  "sp-io",
- "sp-maybe-compressed-blob",
  "sp-tracing",
  "substrate-build-script-utils",
- "tempfile",
- "tikv-jemalloc-ctl",
  "tokio",
  "tracing-gum",
 ]
 
 [[package]]
-name = "polkadot-node-core-pvf-worker"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+name = "polkadot-node-core-pvf-execute-worker"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
- "assert_matches",
  "cpu-time",
+ "futures 0.3.28",
+ "parity-scale-codec",
+ "polkadot-node-core-pvf-common",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "rayon",
+ "sp-core",
+ "sp-maybe-compressed-blob",
+ "sp-tracing",
+ "tikv-jemalloc-ctl",
+ "tokio",
+ "tracing-gum",
+]
+
+[[package]]
+name = "polkadot-node-core-pvf-prepare-worker"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
+dependencies = [
  "futures 0.3.28",
  "libc",
  "parity-scale-codec",
- "polkadot-node-core-pvf",
+ "polkadot-node-core-pvf-common",
  "polkadot-parachain",
  "polkadot-primitives",
  "rayon",
  "sc-executor",
  "sc-executor-common",
  "sc-executor-wasmtime",
- "sp-core",
- "sp-externalities",
  "sp-io",
  "sp-maybe-compressed-blob",
  "sp-tracing",
- "substrate-build-script-utils",
- "tempfile",
  "tikv-jemalloc-ctl",
  "tokio",
  "tracing-gum",
@@ -9948,8 +9851,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-runtime-api"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "futures 0.3.28",
  "lru 0.9.0",
@@ -9963,8 +9866,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-jaeger"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "lazy_static",
  "log",
@@ -9981,8 +9884,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-metrics"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bs58",
  "futures 0.3.28",
@@ -10000,9 +9903,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-network-protocol"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
+ "async-channel",
  "async-trait",
  "derive_more",
  "fatality",
@@ -10022,8 +9926,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-primitives"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bounded-vec",
  "futures 0.3.28",
@@ -10044,8 +9948,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -10054,8 +9958,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-types"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -10067,6 +9971,7 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-statement-table",
  "sc-network",
+ "sc-transaction-pool-api",
  "smallvec",
  "sp-api",
  "sp-authority-discovery",
@@ -10077,8 +9982,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-util"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -10110,8 +10015,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
@@ -10133,8 +10038,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bounded-collections",
  "derive_more",
@@ -10150,14 +10055,14 @@ dependencies = [
 
 [[package]]
 name = "polkadot-performance-test"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "env_logger 0.9.3",
  "kusama-runtime",
  "log",
  "polkadot-erasure-coding",
- "polkadot-node-core-pvf-worker 0.9.42 (git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef)",
+ "polkadot-node-core-pvf-prepare-worker",
  "polkadot-node-primitives",
  "polkadot-primitives",
  "quote",
@@ -10168,8 +10073,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-primitives"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bitvec 1.0.1",
  "hex-literal 0.4.1",
@@ -10194,8 +10099,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-rpc"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "jsonrpsee",
  "mmr-rpc",
@@ -10226,8 +10131,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bitvec 1.0.1",
  "frame-benchmarking",
@@ -10259,6 +10164,7 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-nomination-pools",
  "pallet-nomination-pools-benchmarking",
@@ -10320,8 +10226,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bitvec 1.0.1",
  "frame-benchmarking",
@@ -10366,8 +10272,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-constants"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -10380,8 +10286,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-metrics"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bs58",
  "parity-scale-codec",
@@ -10392,10 +10298,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "bitvec 1.0.1",
  "derive_more",
  "frame-benchmarking",
@@ -10406,6 +10312,7 @@ dependencies = [
  "pallet-authorship",
  "pallet-babe",
  "pallet-balances",
+ "pallet-message-queue",
  "pallet-session",
  "pallet-staking",
  "pallet-timestamp",
@@ -10436,12 +10343,14 @@ dependencies = [
 
 [[package]]
 name = "polkadot-service"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "async-trait",
+ "frame-benchmarking",
  "frame-benchmarking-cli",
  "frame-support",
+ "frame-system",
  "frame-system-rpc-runtime-api",
  "futures 0.3.28",
  "hex-literal 0.4.1",
@@ -10454,14 +10363,16 @@ dependencies = [
  "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",
@@ -10488,7 +10399,7 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-rpc",
  "polkadot-runtime",
- "polkadot-runtime-constants",
+ "polkadot-runtime-common",
  "polkadot-runtime-parachains",
  "polkadot-statement-distribution",
  "rococo-runtime",
@@ -10515,6 +10426,7 @@ dependencies = [
  "sc-sysinfo",
  "sc-telemetry",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "serde",
  "serde_json",
  "sp-api",
@@ -10528,6 +10440,7 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-io",
+ "sp-keyring",
  "sp-keystore",
  "sp-mmr-primitives",
  "sp-offchain",
@@ -10538,6 +10451,8 @@ dependencies = [
  "sp-timestamp",
  "sp-transaction-pool",
  "sp-trie",
+ "sp-version",
+ "sp-weights",
  "substrate-prometheus-endpoint",
  "thiserror",
  "tracing-gum",
@@ -10546,13 +10461,14 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-distribution"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "arrayvec 0.5.2",
  "fatality",
  "futures 0.3.28",
- "indexmap",
+ "futures-timer",
+ "indexmap 1.9.3",
  "parity-scale-codec",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -10567,8 +10483,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -10577,8 +10493,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-runtime"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bitvec 1.0.1",
  "frame-election-provider-support",
@@ -10638,10 +10554,9 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-service"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
- "frame-benchmarking",
  "frame-system",
  "futures 0.3.28",
  "hex",
@@ -10666,7 +10581,6 @@ dependencies = [
  "sc-consensus",
  "sc-consensus-babe",
  "sc-consensus-grandpa",
- "sc-executor",
  "sc-network",
  "sc-service",
  "sc-tracing",
@@ -10696,12 +10610,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
 dependencies = [
  "autocfg",
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "concurrent-queue",
  "libc",
  "log",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
  "windows-sys 0.48.0",
 ]
 
@@ -10730,16 +10644,22 @@ dependencies = [
 
 [[package]]
 name = "polyval"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6"
+checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "opaque-debug 0.3.0",
- "universal-hash 0.5.0",
+ "universal-hash 0.5.1",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6"
+
 [[package]]
 name = "portpicker"
 version = "0.1.1"
@@ -10795,6 +10715,16 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.27",
+]
+
 [[package]]
 name = "primitive-types"
 version = "0.12.1"
@@ -10861,20 +10791,20 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-warning"
-version = "0.3.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4"
+checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
@@ -10895,21 +10825,21 @@ 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.1",
- "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.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd"
+checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10939,7 +10869,7 @@ dependencies = [
  "log",
  "multimap",
  "petgraph",
- "prettyplease",
+ "prettyplease 0.1.25",
  "prost",
  "prost-types",
  "regex",
@@ -10948,19 +10878,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"
@@ -11007,6 +10924,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"
@@ -11020,9 +10950,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c"
+checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9"
 dependencies = [
  "bytes",
  "rand 0.8.5",
@@ -11038,9 +10968,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
 dependencies = [
  "proc-macro2",
 ]
@@ -11116,7 +11046,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -11173,7 +11103,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
 dependencies = [
  "pem",
  "ring",
- "time 0.3.20",
+ "time 0.3.23",
  "x509-parser 0.13.2",
  "yasna",
 ]
@@ -11186,7 +11116,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
 dependencies = [
  "pem",
  "ring",
- "time 0.3.20",
+ "time 0.3.23",
  "yasna",
 ]
 
@@ -11196,7 +11126,7 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -11205,7 +11135,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -11214,7 +11144,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
  "redox_syscall 0.2.16",
  "thiserror",
 ]
@@ -11234,29 +11164,29 @@ dependencies = [
 
 [[package]]
 name = "ref-cast"
-version = "1.0.16"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c"
+checksum = "61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.16"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7"
+checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[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",
@@ -11266,13 +11196,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.1"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
 dependencies = [
- "aho-corasick 1.0.1",
+ "aho-corasick",
  "memchr",
- "regex-syntax 0.7.1",
+ "regex-automata 0.3.3",
+ "regex-syntax 0.7.4",
 ]
 
 [[package]]
@@ -11285,28 +11216,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "regex-syntax"
-version = "0.6.29"
+name = "regex-automata"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.7.4",
+]
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.1"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
-name = "region"
-version = "3.0.0"
+name = "regex-syntax"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e"
-dependencies = [
- "bitflags",
- "libc",
- "mach",
- "winapi",
-]
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
 [[package]]
 name = "resolv-conf"
@@ -11360,18 +11290,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
 dependencies = [
- "digest 0.10.6",
-]
-
-[[package]]
-name = "ripemd160"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -11398,9 +11317,9 @@ dependencies = [
 
 [[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",
@@ -11408,8 +11327,8 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "binary-merkle-tree",
  "frame-benchmarking",
@@ -11437,6 +11356,7 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-message-queue",
  "pallet-mmr",
  "pallet-multisig",
  "pallet-nis",
@@ -11494,8 +11414,8 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime-constants"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11576,7 +11496,7 @@ dependencies = [
  "ethabi",
  "frame-support",
  "frame-system",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "log",
  "module-asset-registry",
  "module-cdp-engine",
@@ -11654,10 +11574,8 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "karura-runtime",
- "kusama-runtime",
- "kusama-runtime-constants",
  "libsecp256k1",
  "log",
  "mandala-runtime",
@@ -11724,11 +11642,6 @@ dependencies = [
  "parachain-info",
  "parity-scale-codec",
  "polkadot-cli",
- "polkadot-parachain",
- "polkadot-primitives",
- "polkadot-runtime",
- "polkadot-runtime-constants",
- "polkadot-runtime-parachains",
  "polkadot-test-runtime",
  "runtime-common",
  "serde_json",
@@ -11746,14 +11659,12 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "sp-tracing",
  "sp-transaction-pool",
  "sp-trie",
  "sp-version",
- "statemine-runtime",
- "statemint-runtime",
  "xcm",
  "xcm-builder",
- "xcm-emulator",
  "xcm-executor",
 ]
 
@@ -11781,7 +11692,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.17",
+ "semver 1.0.18",
 ]
 
 [[package]]
@@ -11795,43 +11706,42 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.35.13"
+version = "0.36.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
+checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
 dependencies = [
- "bitflags",
- "errno 0.2.8",
- "io-lifetimes 0.7.5",
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
  "libc",
- "linux-raw-sys 0.0.46",
- "windows-sys 0.42.0",
+ "linux-raw-sys 0.1.4",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.36.13"
+version = "0.37.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
 dependencies = [
- "bitflags",
- "errno 0.3.1",
- "io-lifetimes 1.0.10",
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
  "libc",
- "linux-raw-sys 0.1.4",
- "windows-sys 0.45.0",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.37.18"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
 dependencies = [
- "bitflags",
- "errno 0.3.1",
- "io-lifetimes 1.0.10",
+ "bitflags 2.3.3",
+ "errno",
  "libc",
- "linux-raw-sys 0.3.6",
+ "linux-raw-sys 0.4.3",
  "windows-sys 0.48.0",
 ]
 
@@ -11860,11 +11770,23 @@ dependencies = [
  "webpki 0.22.0",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct 0.7.0",
+]
+
 [[package]]
 name = "rustls-native-certs"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
  "rustls-pemfile",
@@ -11874,18 +11796,28 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.2"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
+dependencies = [
+ "base64 0.21.2",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
+checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e"
 dependencies = [
- "base64 0.21.0",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "rw-stream-sink"
@@ -11900,15 +11832,15 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "safe_arch"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529"
+checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
 dependencies = [
  "bytemuck",
 ]
@@ -11925,7 +11857,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "log",
  "sp-core",
@@ -11936,7 +11868,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
@@ -11944,13 +11876,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",
@@ -11964,7 +11896,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "futures 0.3.28",
  "futures-timer",
@@ -11987,7 +11919,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -12002,7 +11934,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "memmap2",
  "sc-chain-spec-derive",
@@ -12021,25 +11953,25 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "chrono",
- "clap 4.2.5",
+ "clap 4.3.19",
  "fdlimit",
  "futures 0.3.28",
- "libp2p",
+ "libp2p-identity",
  "log",
  "names",
  "parity-scale-codec",
@@ -12050,7 +11982,6 @@ dependencies = [
  "sc-client-db",
  "sc-keystore",
  "sc-network",
- "sc-network-common",
  "sc-service",
  "sc-telemetry",
  "sc-tracing",
@@ -12072,7 +12003,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "fnv",
  "futures 0.3.28",
@@ -12088,9 +12019,9 @@ dependencies = [
  "sp-core",
  "sp-database",
  "sp-externalities",
- "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
+ "sp-statement-store",
  "sp-storage",
  "substrate-prometheus-endpoint",
 ]
@@ -12098,7 +12029,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "hash-db 0.16.0",
  "kvdb",
@@ -12124,12 +12055,12 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
  "futures-timer",
- "libp2p",
+ "libp2p-identity",
  "log",
  "mockall",
  "parking_lot 0.12.1",
@@ -12149,7 +12080,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
@@ -12178,7 +12109,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -12193,8 +12124,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",
@@ -12214,7 +12145,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "futures 0.3.28",
  "jsonrpsee",
@@ -12236,9 +12167,10 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
+ "async-channel",
  "async-trait",
  "fnv",
  "futures 0.3.28",
@@ -12247,9 +12179,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "sc-client-api",
  "sc-consensus",
- "sc-keystore",
  "sc-network",
- "sc-network-common",
  "sc-network-gossip",
  "sc-network-sync",
  "sc-utils",
@@ -12271,7 +12201,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "futures 0.3.28",
  "jsonrpsee",
@@ -12290,7 +12220,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -12303,10 +12233,10 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "ahash 0.8.3",
- "array-bytes 4.2.0",
+ "array-bytes",
  "async-trait",
  "dyn-clone",
  "finality-grandpa",
@@ -12325,6 +12255,7 @@ dependencies = [
  "sc-network-common",
  "sc-network-gossip",
  "sc-telemetry",
+ "sc-transaction-pool-api",
  "sc-utils",
  "serde_json",
  "sp-api",
@@ -12343,7 +12274,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "finality-grandpa",
  "futures 0.3.28",
@@ -12363,11 +12294,12 @@ dependencies = [
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "assert_matches",
  "async-trait",
  "futures 0.3.28",
+ "futures-timer",
  "jsonrpsee",
  "log",
  "parity-scale-codec",
@@ -12397,7 +12329,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
@@ -12420,14 +12352,13 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "lru 0.8.1",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "sc-executor-common",
- "sc-executor-wasmi",
  "sc-executor-wasmtime",
+ "schnellru",
  "sp-api",
  "sp-core",
  "sp-externalities",
@@ -12438,46 +12369,30 @@ dependencies = [
  "sp-version",
  "sp-wasm-interface",
  "tracing",
- "wasmi",
 ]
 
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
  "sp-wasm-interface",
  "thiserror",
  "wasm-instrument",
- "wasmi",
-]
-
-[[package]]
-name = "sc-executor-wasmi"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
-dependencies = [
- "log",
- "sc-allocator",
- "sc-executor-common",
- "sp-runtime-interface",
- "sp-wasm-interface",
- "wasmi",
 ]
 
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "anyhow",
  "cfg-if",
  "libc",
  "log",
- "once_cell",
- "rustix 0.36.13",
+ "rustix 0.36.15",
  "sc-allocator",
  "sc-executor-common",
  "sp-runtime-interface",
@@ -12488,7 +12403,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "ansi_term",
  "futures 0.3.28",
@@ -12504,10 +12419,9 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
- "async-trait",
+ "array-bytes",
  "parking_lot 0.12.1",
  "serde_json",
  "sp-application-crypto",
@@ -12519,9 +12433,9 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "async-channel",
  "async-trait",
  "asynchronous-codec",
@@ -12534,47 +12448,43 @@ dependencies = [
  "libp2p",
  "linked_hash_set",
  "log",
- "lru 0.8.1",
  "mockall",
  "parity-scale-codec",
  "parking_lot 0.12.1",
+ "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?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
+ "async-channel",
  "cid",
  "futures 0.3.28",
- "libp2p",
+ "libp2p-identity",
  "log",
  "prost",
  "prost-build",
  "sc-client-api",
  "sc-network",
- "sc-network-common",
  "sp-blockchain",
  "sp-runtime",
  "thiserror",
@@ -12584,45 +12494,33 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
  "async-trait",
- "bitflags",
- "bytes",
+ "bitflags 1.3.2",
  "futures 0.3.28",
- "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?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "ahash 0.8.3",
  "futures 0.3.28",
  "futures-timer",
  "libp2p",
  "log",
- "lru 0.8.1",
  "sc-network",
  "sc-network-common",
- "sc-peerset",
+ "schnellru",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "tracing",
@@ -12631,19 +12529,18 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
+ "async-channel",
  "futures 0.3.28",
- "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",
@@ -12653,16 +12550,16 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
+ "async-channel",
  "async-trait",
  "fork-tree",
  "futures 0.3.28",
  "futures-timer",
  "libp2p",
  "log",
- "lru 0.8.1",
  "mockall",
  "parity-scale-codec",
  "prost",
@@ -12671,8 +12568,8 @@ dependencies = [
  "sc-consensus",
  "sc-network",
  "sc-network-common",
- "sc-peerset",
  "sc-utils",
+ "schnellru",
  "smallvec",
  "sp-arithmetic",
  "sp-blockchain",
@@ -12687,17 +12584,15 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "futures 0.3.28",
  "libp2p",
  "log",
  "parity-scale-codec",
- "pin-project",
  "sc-network",
  "sc-network-common",
- "sc-peerset",
  "sc-utils",
  "sp-consensus",
  "sp-runtime",
@@ -12707,16 +12602,17 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "bytes",
  "fnv",
  "futures 0.3.28",
  "futures-timer",
  "hyper",
- "hyper-rustls",
+ "hyper-rustls 0.24.1",
  "libp2p",
+ "log",
  "num_cpus",
  "once_cell",
  "parity-scale-codec",
@@ -12725,33 +12621,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?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
-dependencies = [
- "futures 0.3.28",
- "libp2p",
- "log",
- "sc-utils",
- "serde_json",
- "wasm-timer",
-]
-
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -12760,7 +12645,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "futures 0.3.28",
  "jsonrpsee",
@@ -12783,6 +12668,7 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-session",
+ "sp-statement-store",
  "sp-version",
  "tokio",
 ]
@@ -12790,7 +12676,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -12809,7 +12695,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "http",
  "jsonrpsee",
@@ -12824,9 +12710,9 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "futures 0.3.28",
  "futures-util",
  "hex",
@@ -12850,7 +12736,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "directories",
@@ -12877,11 +12763,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",
@@ -12916,7 +12800,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -12927,14 +12811,12 @@ dependencies = [
 [[package]]
 name = "sc-storage-monitor"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
  "fs4",
- "futures 0.3.28",
  "log",
  "sc-client-db",
- "sc-utils",
  "sp-core",
  "thiserror",
  "tokio",
@@ -12943,7 +12825,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -12962,7 +12844,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "futures 0.3.28",
  "libc",
@@ -12981,7 +12863,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "chrono",
  "futures 0.3.28",
@@ -13000,7 +12882,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "ansi_term",
  "atty",
@@ -13008,12 +12890,10 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "once_cell",
  "parking_lot 0.12.1",
  "regex",
  "rustc-hash",
  "sc-client-api",
- "sc-rpc-server",
  "sc-tracing-proc-macro",
  "serde",
  "sp-api",
@@ -13031,25 +12911,24 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
  "futures-timer",
  "linked-hash-map",
  "log",
- "num-traits",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "sc-client-api",
@@ -13069,13 +12948,15 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
  "log",
+ "parity-scale-codec",
  "serde",
  "sp-blockchain",
+ "sp-core",
  "sp-runtime",
  "thiserror",
 ]
@@ -13083,7 +12964,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-channel",
  "futures 0.3.28",
@@ -13097,9 +12978,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfdef77228a4c05dc94211441595746732131ad7f6530c6c18f045da7b7ab937"
+checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782"
 dependencies = [
  "bitvec 1.0.1",
  "cfg-if",
@@ -13111,9 +12992,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482"
+checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -13123,11 +13004,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -13161,15 +13042,15 @@ dependencies = [
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scratch"
-version = "1.0.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
+checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"
 
 [[package]]
 name = "sct"
@@ -13219,12 +13100,12 @@ dependencies = [
 
 [[package]]
 name = "sec1"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
  "base16ct 0.2.0",
- "der 0.7.6",
+ "der 0.7.7",
  "generic-array 0.14.7",
  "pkcs8 0.10.2",
  "subtle",
@@ -13260,11 +13141,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.8.2"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -13273,9 +13154,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.8.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -13292,9 +13173,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
 dependencies = [
  "serde",
 ]
@@ -13313,9 +13194,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1"
 dependencies = [
  "serde_derive",
 ]
@@ -13332,20 +13213,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
 dependencies = [
  "itoa",
  "ryu",
@@ -13354,9 +13235,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
 dependencies = [
  "serde",
 ]
@@ -13382,7 +13263,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -13412,34 +13293,22 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.6",
-]
-
-[[package]]
-name = "sha3"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "keccak",
- "opaque-debug 0.3.0",
+ "digest 0.10.7",
 ]
 
 [[package]]
 name = "sha3"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
  "keccak",
 ]
 
@@ -13473,7 +13342,7 @@ version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
  "rand_core 0.6.4",
 ]
 
@@ -13483,7 +13352,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
  "rand_core 0.6.4",
 ]
 
@@ -13517,14 +13386,14 @@ dependencies = [
 
 [[package]]
 name = "slice-group-by"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
+checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
 
 [[package]]
 name = "slot-range-helper"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -13544,9 +13413,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "snap"
@@ -13567,7 +13436,7 @@ dependencies = [
  "rand_core 0.6.4",
  "ring",
  "rustc_version",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "subtle",
 ]
 
@@ -13581,6 +13450,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "soketto"
 version = "0.7.1"
@@ -13601,7 +13480,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "hash-db 0.16.0",
  "log",
@@ -13609,6 +13488,7 @@ dependencies = [
  "scale-info",
  "sp-api-proc-macro",
  "sp-core",
+ "sp-externalities",
  "sp-metadata-ir",
  "sp-runtime",
  "sp-state-machine",
@@ -13621,21 +13501,21 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "Inflector",
  "blake2",
- "expander 1.0.0",
+ "expander 2.0.0",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "sp-application-crypto"
-version = "7.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "23.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13647,8 +13527,8 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "6.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "16.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -13662,7 +13542,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13675,9 +13555,8 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "parity-scale-codec",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
@@ -13687,13 +13566,13 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "futures 0.3.28",
  "log",
- "lru 0.8.1",
  "parity-scale-codec",
  "parking_lot 0.12.1",
+ "schnellru",
  "sp-api",
  "sp-consensus",
  "sp-database",
@@ -13705,7 +13584,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
@@ -13720,14 +13599,13 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-application-crypto",
- "sp-consensus",
  "sp-consensus-slots",
  "sp-inherents",
  "sp-runtime",
@@ -13738,7 +13616,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -13746,11 +13624,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",
@@ -13759,7 +13635,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "lazy_static",
  "parity-scale-codec",
@@ -13778,7 +13654,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -13796,7 +13672,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13807,11 +13683,11 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "7.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "21.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
- "bitflags",
+ "array-bytes",
+ "bitflags 1.3.2",
  "blake2",
  "bounded-collections",
  "bs58",
@@ -13846,38 +13722,37 @@ dependencies = [
  "substrate-bip39",
  "thiserror",
  "tiny-bip39",
+ "tracing",
  "zeroize",
 ]
 
 [[package]]
 name = "sp-core-hashing"
-version = "5.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "9.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "blake2b_simd",
  "byteorder",
- "digest 0.10.6",
- "sha2 0.10.6",
- "sha3 0.10.7",
- "sp-std",
+ "digest 0.10.7",
+ "sha2 0.10.7",
+ "sha3",
  "twox-hash",
 ]
 
 [[package]]
 name = "sp-core-hashing-proc-macro"
-version = "5.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "9.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "proc-macro2",
  "quote",
  "sp-core-hashing",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -13885,18 +13760,18 @@ dependencies = [
 
 [[package]]
 name = "sp-debug-derive"
-version = "5.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "8.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "sp-externalities"
-version = "0.13.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "0.19.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -13907,13 +13782,12 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
- "sp-core",
  "sp-runtime",
  "sp-std",
  "thiserror",
@@ -13921,13 +13795,12 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "7.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "23.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "bytes",
  "ed25519",
  "ed25519-dalek",
- "futures 0.3.28",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
@@ -13947,8 +13820,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "7.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "24.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -13958,13 +13831,11 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.13.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "0.27.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "futures 0.3.28",
  "parity-scale-codec",
  "parking_lot 0.12.1",
- "serde",
  "sp-core",
  "sp-externalities",
  "thiserror",
@@ -13973,16 +13844,16 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "thiserror",
- "zstd 0.12.3+zstd.1.5.2",
+ "zstd 0.12.4",
 ]
 
 [[package]]
 name = "sp-metadata-ir"
 version = "0.1.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
@@ -13993,7 +13864,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -14011,7 +13882,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14025,7 +13896,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -14034,8 +13905,8 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "5.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "8.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -14045,7 +13916,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -14054,8 +13925,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "7.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "24.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -14076,8 +13947,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "7.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "17.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -14094,25 +13965,26 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "6.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "11.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-core",
+ "sp-keystore",
  "sp-runtime",
  "sp-staking",
  "sp-std",
@@ -14121,8 +13993,9 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -14133,8 +14006,8 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.13.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "0.28.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "hash-db 0.16.0",
  "log",
@@ -14149,17 +14022,35 @@ dependencies = [
  "sp-trie",
  "thiserror",
  "tracing",
+ "trie-db",
+]
+
+[[package]]
+name = "sp-statement-store"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-externalities",
+ "sp-runtime",
+ "sp-runtime-interface",
+ "sp-std",
+ "thiserror",
 ]
 
 [[package]]
 name = "sp-std"
-version = "5.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "8.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 
 [[package]]
 name = "sp-storage"
-version = "7.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "13.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -14172,11 +14063,9 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
- "futures-timer",
- "log",
  "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
@@ -14186,8 +14075,8 @@ dependencies = [
 
 [[package]]
 name = "sp-tracing"
-version = "6.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "10.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -14199,7 +14088,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -14208,10 +14097,9 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
- "log",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -14223,8 +14111,8 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "7.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "22.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "ahash 0.8.3",
  "hash-db 0.16.0",
@@ -14246,8 +14134,8 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "5.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "22.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -14263,33 +14151,32 @@ dependencies = [
 
 [[package]]
 name = "sp-version-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "8.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "sp-wasm-interface"
-version = "7.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "14.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "sp-std",
- "wasmi",
  "wasmtime",
 ]
 
 [[package]]
 name = "sp-weights"
-version = "4.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+version = "20.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14307,6 +14194,17 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "spinners"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08615eea740067d9899969bc2891c68a19c315cb1f66640af9a9ecb91b13bcab"
+dependencies = [
+ "lazy_static",
+ "maplit",
+ "strum",
+]
+
 [[package]]
 name = "spki"
 version = "0.6.0"
@@ -14324,14 +14222,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
 dependencies = [
  "base64ct",
- "der 0.7.6",
+ "der 0.7.7",
 ]
 
 [[package]]
 name = "ss58-registry"
-version = "1.40.0"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47a8ad42e5fc72d5b1eb104a5546937eaf39843499948bb666d6e93c62423b"
+checksum = "bfc443bad666016e012538782d9e3006213a7db43e9fb1dda91657dc06a6fa08"
 dependencies = [
  "Inflector",
  "num-format",
@@ -14348,141 +14246,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
-[[package]]
-name = "statemine-runtime"
-version = "2.0.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#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-benchmarking",
- "frame-executive",
- "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "hex-literal 0.4.1",
- "kusama-runtime-constants",
- "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-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",
- "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-transaction-pool",
- "sp-version",
- "sp-weights",
- "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
-
-[[package]]
-name = "statemint-runtime"
-version = "1.0.0"
-source = "git+https://github.com/paritytech//cumulus?rev=f603a61ff370fc33740c9373833c3c6ba1486846#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-benchmarking",
- "frame-executive",
- "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "hex-literal 0.4.1",
- "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",
- "pallet-xcm-benchmarks",
- "parachain-info",
- "parachains-common",
- "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain",
- "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-transaction-pool",
- "sp-version",
- "sp-weights",
- "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -14507,7 +14270,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg_aliases",
  "libc",
  "parking_lot 0.11.2",
@@ -14618,15 +14381,12 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
-dependencies = [
- "platforms 2.0.0",
-]
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.28",
@@ -14645,7 +14405,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "hyper",
  "log",
@@ -14657,7 +14417,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
  "jsonrpsee",
@@ -14670,14 +14430,12 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "jsonrpsee",
- "log",
  "parity-scale-codec",
  "sc-client-api",
  "sc-rpc-api",
- "scale-info",
  "serde",
  "sp-core",
  "sp-runtime",
@@ -14689,9 +14447,9 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
- "array-bytes 4.2.0",
+ "array-bytes",
  "async-trait",
  "futures 0.3.28",
  "parity-scale-codec",
@@ -14715,7 +14473,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "futures 0.3.28",
  "substrate-test-utils-derive",
@@ -14725,27 +14483,28 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "ansi_term",
  "build-helper",
  "cargo_metadata",
  "filetime",
+ "parity-wasm 0.45.0",
  "sp-maybe-compressed-blob",
  "strum",
  "tempfile",
- "toml 0.7.3",
+ "toml 0.7.6",
  "walkdir",
  "wasm-opt",
 ]
@@ -14778,9 +14537,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -14801,11 +14560,11 @@ dependencies = [
 
 [[package]]
 name = "system-configuration"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "system-configuration-sys",
 ]
@@ -14828,21 +14587,21 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.7"
+version = "0.12.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
+checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e"
 
 [[package]]
 name = "tempfile"
-version = "3.5.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
 dependencies = [
  "cfg-if",
- "fastrand",
+ "fastrand 2.0.0",
  "redox_syscall 0.3.5",
- "rustix 0.37.18",
- "windows-sys 0.45.0",
+ "rustix 0.38.4",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -14862,8 +14621,8 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "test-runtime-constants"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -14888,7 +14647,7 @@ dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-consensus-relay-chain",
  "cumulus-client-network",
- "cumulus-client-pov-recovery 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42)",
+ "cumulus-client-pov-recovery",
  "cumulus-client-service",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
@@ -14901,7 +14660,7 @@ dependencies = [
  "frame-system",
  "frame-system-rpc-runtime-api",
  "futures 0.3.28",
- "hex-literal 0.3.4",
+ "hex-literal 0.4.1",
  "jsonrpsee",
  "log",
  "mandala-runtime",
@@ -14933,6 +14692,7 @@ dependencies = [
  "sc-executor",
  "sc-network",
  "sc-network-common",
+ "sc-offchain",
  "sc-rpc",
  "sc-rpc-server",
  "sc-service",
@@ -14940,7 +14700,7 @@ dependencies = [
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "serde",
- "sha3 0.10.7",
+ "sha3",
  "sp-api",
  "sp-arithmetic",
  "sp-blockchain",
@@ -14973,22 +14733,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -15063,9 +14823,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.20"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
 dependencies = [
  "itoa",
  "serde",
@@ -15075,15 +14835,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
 
 [[package]]
 name = "time-macros"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
 dependencies = [
  "time-core",
 ]
@@ -15100,7 +14860,7 @@ dependencies = [
  "pbkdf2 0.11.0",
  "rand 0.8.5",
  "rustc-hash",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "thiserror",
  "unicode-normalization",
  "wasm-bindgen",
@@ -15143,19 +14903,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.28.0"
+version = "1.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
 dependencies = [
  "autocfg",
+ "backtrace",
  "bytes",
  "libc",
  "mio",
  "num_cpus",
  "parking_lot 0.12.1",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.4.9",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
@@ -15168,7 +14929,18 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "tokio-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
+dependencies = [
+ "pin-project",
+ "rand 0.8.5",
+ "tokio",
 ]
 
 [[package]]
@@ -15182,6 +14954,16 @@ dependencies = [
  "webpki 0.22.0",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls 0.21.5",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.14"
@@ -15189,7 +14971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
  "tokio",
  "tokio-util",
 ]
@@ -15204,7 +14986,7 @@ dependencies = [
  "futures-core",
  "futures-io",
  "futures-sink",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
  "tokio",
  "tracing",
 ]
@@ -15220,9 +15002,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.3"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -15232,20 +15014,20 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.8"
+version = "0.19.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
 dependencies = [
- "indexmap",
+ "indexmap 2.0.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -15265,18 +15047,18 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.3.5"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
+checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82"
 dependencies = [
- "bitflags",
+ "bitflags 2.3.3",
  "bytes",
  "futures-core",
  "futures-util",
  "http",
  "http-body",
  "http-range-header",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
  "tower-layer",
  "tower-service",
 ]
@@ -15301,27 +15083,27 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if",
  "log",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
  "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -15339,8 +15121,8 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-primitives",
@@ -15350,14 +15132,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum-proc-macro"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "expander 2.0.0",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -15463,7 +15245,7 @@ dependencies = [
  "lazy_static",
  "rand 0.8.5",
  "smallvec",
- "socket2",
+ "socket2 0.4.9",
  "thiserror",
  "tinyvec",
  "tokio",
@@ -15500,10 +15282,10 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech//substrate?rev=569aae5341ea0c1d10426fa1ec13a36c0b64393b#569aae5341ea0c1d10426fa1ec13a36c0b64393b"
+source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
 dependencies = [
  "async-trait",
- "clap 4.2.5",
+ "clap 4.3.19",
  "frame-remote-externalities",
  "frame-try-runtime",
  "hex",
@@ -15511,7 +15293,6 @@ dependencies = [
  "parity-scale-codec",
  "sc-cli",
  "sc-executor",
- "sc-service",
  "serde",
  "serde_json",
  "sp-api",
@@ -15531,7 +15312,7 @@ dependencies = [
  "sp-version",
  "sp-weights",
  "substrate-rpc-client",
- "zstd 0.12.3+zstd.1.5.2",
+ "zstd 0.12.4",
 ]
 
 [[package]]
@@ -15566,7 +15347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
- "digest 0.10.6",
+ "digest 0.10.7",
  "rand 0.8.5",
  "static_assertions",
 ]
@@ -15579,9 +15360,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "uint"
@@ -15603,9 +15384,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "unicode-normalization"
@@ -15640,9 +15421,9 @@ dependencies = [
 
 [[package]]
 name = "universal-hash"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
  "crypto-common",
  "subtle",
@@ -15668,12 +15449,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
 dependencies = [
  "form_urlencoded",
- "idna 0.3.0",
+ "idna 0.4.0",
  "percent-encoding",
 ]
 
@@ -15685,11 +15466,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -15743,11 +15524,10 @@ dependencies = [
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log",
  "try-lock",
 ]
 
@@ -15771,9 +15551,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -15781,24 +15561,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -15808,9 +15588,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -15818,22 +15598,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "wasm-gc-api"
@@ -15857,9 +15637,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt"
-version = "0.111.0"
+version = "0.112.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a303793cbc01fb96551badfc7367db6007396bba6bac97936b3c8b6f7fdb41"
+checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c"
 dependencies = [
  "anyhow",
  "libc",
@@ -15873,9 +15653,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-cxx-sys"
-version = "0.111.0"
+version = "0.112.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c9deb56f8a9f2ec177b3bd642a8205621835944ed5da55f2388ef216aca5a4"
+checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445"
 dependencies = [
  "anyhow",
  "cxx",
@@ -15885,15 +15665,14 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-sys"
-version = "0.111.0"
+version = "0.112.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4432e28b542738a9776cedf92e8a99d8991c7b4667ee2c7ccddfb479dd2856a7"
+checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14"
 dependencies = [
  "anyhow",
  "cc",
  "cxx",
  "cxx-build",
- "regex",
 ]
 
 [[package]]
@@ -15911,63 +15690,29 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wasmi"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422"
-dependencies = [
- "parity-wasm 0.45.0",
- "wasmi-validation",
- "wasmi_core",
-]
-
-[[package]]
-name = "wasmi-validation"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b"
-dependencies = [
- "parity-wasm 0.45.0",
-]
-
-[[package]]
-name = "wasmi_core"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
-dependencies = [
- "downcast-rs",
- "libm 0.2.6",
- "memory_units",
- "num-rational",
- "num-traits",
- "region",
-]
-
 [[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",
+ "indexmap 1.9.3",
  "url",
 ]
 
 [[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",
  "cfg-if",
- "indexmap",
+ "indexmap 1.9.3",
  "libc",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "once_cell",
  "paste",
  "psm",
@@ -15980,43 +15725,43 @@ 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.2",
  "bincode",
  "directories-next",
  "file-per-thread-logger",
  "log",
- "rustix 0.36.13",
+ "rustix 0.36.15",
  "serde",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "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",
@@ -16024,27 +15769,43 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli 0.26.2",
+ "gimli",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "target-lexicon",
  "thiserror",
  "wasmparser",
+ "wasmtime-cranelift-shared",
+ "wasmtime-environ",
+]
+
+[[package]]
+name = "wasmtime-cranelift-shared"
+version = "8.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd041e382ef5aea1b9fc78442394f1a4f6d676ce457e7076ca4cb3f397882f8b"
+dependencies = [
+ "anyhow",
+ "cranelift-codegen",
+ "cranelift-native",
+ "gimli",
+ "object 0.30.4",
+ "target-lexicon",
  "wasmtime-environ",
 ]
 
 [[package]]
 name = "wasmtime-environ"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7"
+checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949"
 dependencies = [
  "anyhow",
  "cranelift-entity",
- "gimli 0.26.2",
- "indexmap",
+ "gimli",
+ "indexmap 1.9.3",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "serde",
  "target-lexicon",
  "thiserror",
@@ -16054,18 +15815,18 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa"
+checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244"
 dependencies = [
- "addr2line 0.17.0",
+ "addr2line 0.19.0",
  "anyhow",
  "bincode",
  "cfg-if",
  "cpp_demangle",
- "gimli 0.26.2",
+ "gimli",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "rustc-demangle",
  "serde",
  "target-lexicon",
@@ -16073,60 +15834,60 @@ dependencies = [
  "wasmtime-jit-debug",
  "wasmtime-jit-icache-coherence",
  "wasmtime-runtime",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "wasmtime-jit-debug"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2"
+checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
 dependencies = [
- "object 0.29.0",
+ "object 0.30.4",
  "once_cell",
- "rustix 0.36.13",
+ "rustix 0.36.15",
 ]
 
 [[package]]
 name = "wasmtime-jit-icache-coherence"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c"
+checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd"
 dependencies = [
  "cfg-if",
  "libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "wasmtime-runtime"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b"
+checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441"
 dependencies = [
  "anyhow",
  "cc",
  "cfg-if",
- "indexmap",
+ "indexmap 1.9.3",
  "libc",
  "log",
  "mach",
  "memfd",
- "memoffset 0.6.5",
+ "memoffset 0.8.0",
  "paste",
  "rand 0.8.5",
- "rustix 0.36.13",
+ "rustix 0.36.15",
  "wasmtime-asm-macros",
  "wasmtime-environ",
  "wasmtime-jit-debug",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "wasmtime-types"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568"
+checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
 dependencies = [
  "cranelift-entity",
  "serde",
@@ -16136,9 +15897,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.61"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -16196,10 +15957,10 @@ dependencies = [
  "sdp",
  "serde",
  "serde_json",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "stun",
  "thiserror",
- "time 0.3.20",
+ "time 0.3.23",
  "tokio",
  "turn",
  "url",
@@ -16236,7 +15997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05"
 dependencies = [
  "aes 0.6.0",
- "aes-gcm 0.10.1",
+ "aes-gcm 0.10.2",
  "async-trait",
  "bincode",
  "block-modes",
@@ -16259,7 +16020,7 @@ dependencies = [
  "sec1 0.3.0",
  "serde",
  "sha1",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "signature 1.6.4",
  "subtle",
  "thiserror",
@@ -16301,7 +16062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106"
 dependencies = [
  "log",
- "socket2",
+ "socket2 0.4.9",
  "thiserror",
  "tokio",
  "webrtc-util",
@@ -16368,7 +16129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87"
 dependencies = [
  "async-trait",
- "bitflags",
+ "bitflags 1.3.2",
  "bytes",
  "cc",
  "ipnet",
@@ -16386,7 +16147,7 @@ dependencies = [
 name = "weight-gen"
 version = "0.4.1-dev"
 dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
  "handlebars",
  "serde",
  "serde_json",
@@ -16403,8 +16164,8 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bitvec 1.0.1",
  "frame-benchmarking",
@@ -16433,6 +16194,7 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-nomination-pools",
  "pallet-nomination-pools-benchmarking",
@@ -16495,8 +16257,8 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime-constants"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -16520,9 +16282,9 @@ dependencies = [
 
 [[package]]
 name = "wide"
-version = "0.7.8"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223"
+checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -16530,9 +16292,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "0.5.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
 
 [[package]]
 name = "winapi"
@@ -16584,22 +16346,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows-targets 0.48.0",
-]
-
-[[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",
+ "windows-targets 0.48.1",
 ]
 
 [[package]]
@@ -16617,7 +16364,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.1",
 ]
 
 [[package]]
@@ -16637,9 +16384,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
 dependencies = [
  "windows_aarch64_gnullvm 0.48.0",
  "windows_aarch64_msvc 0.48.0",
@@ -16766,20 +16513,21 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "winnow"
-version = "0.4.5"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69af645a61644c6dd379ade8b77cc87efb5393c988707bad12d3c8e00c50f669"
+checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winreg"
-version = "0.10.1"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "winapi",
+ "cfg-if",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -16829,7 +16577,7 @@ dependencies = [
  "ring",
  "rusticata-macros",
  "thiserror",
- "time 0.3.20",
+ "time 0.3.23",
 ]
 
 [[package]]
@@ -16847,13 +16595,13 @@ dependencies = [
  "oid-registry 0.6.1",
  "rusticata-macros",
  "thiserror",
- "time 0.3.20",
+ "time 0.3.23",
 ]
 
 [[package]]
 name = "xcm"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "bounded-collections",
  "derivative",
@@ -16868,8 +16616,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-builder"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -16883,40 +16631,15 @@ dependencies = [
  "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"
-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",
- "parity-scale-codec",
- "paste",
- "polkadot-primitives",
- "polkadot-runtime-parachains",
- "quote",
- "sp-arithmetic",
- "sp-io",
- "sp-std",
+ "sp-weights",
  "xcm",
  "xcm-executor",
 ]
 
 [[package]]
 name = "xcm-executor"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -16935,19 +16658,19 @@ dependencies = [
 
 [[package]]
 name = "xcm-procedural"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "xcm-simulator"
-version = "0.9.42"
-source = "git+https://github.com/paritytech//polkadot?rev=9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -16958,6 +16681,7 @@ dependencies = [
  "sp-io",
  "sp-std",
  "xcm",
+ "xcm-builder",
  "xcm-executor",
 ]
 
@@ -16981,7 +16705,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
 dependencies = [
- "time 0.3.20",
+ "time 0.3.23",
 ]
 
 [[package]]
@@ -17001,7 +16725,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -17015,11 +16739,11 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.12.3+zstd.1.5.2"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
+checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
 dependencies = [
- "zstd-safe 6.0.5+zstd.1.5.4",
+ "zstd-safe 6.0.6",
 ]
 
 [[package]]
@@ -17034,9 +16758,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-safe"
-version = "6.0.5+zstd.1.5.4"
+version = "6.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
+checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
 dependencies = [
  "libc",
  "zstd-sys",
diff --git a/Cargo.toml b/Cargo.toml
index ade48408fa..f76d3ecfa4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -115,244 +115,235 @@ smallvec = { opt-level = 3 }
 snow = { opt-level = 3 }
 twox-hash = { opt-level = 3 }
 uint = { opt-level = 3 }
-wasmi = { opt-level = 3 }
 x25519-dalek = { opt-level = 3 }
 yamux = { opt-level = 3 }
 zeroize = { opt-level = 3 }
 
 [patch."https://github.com/paritytech/substrate"]
-binary-merkle-tree = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-executive = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-support = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-system = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-mmr-gadget = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-asset-tx-payment = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-assets = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-child-bounties = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-conviction-voting = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-election-provider-support-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-fast-unstake = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-nfts = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-nfts-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-nis = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-nomination-pools = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-nomination-pools-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-ranked-collective = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-referenda = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-root-testing = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-session = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-session-benchmarking  = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-society = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-staking-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-state-trie-migration = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-uniques = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-pallet-whitelist = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-cli = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus-beefy = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus-grandpa = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-executor = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-informant = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-network = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-network-common = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-network-light = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-network-sync = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-network-transactions = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-peerset = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-service = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-storage-monitor = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-sysinfo = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-utils = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-api = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sc-consensus-beefy-rpc = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-consensus-beefy = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-consensus-grandpa = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-core = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-io = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-session = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-staking = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-std = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-storage = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-trie = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-version = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-sp-weights = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
-try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "569aae5341ea0c1d10426fa1ec13a36c0b64393b" }
+binary-merkle-tree = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-executive = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-support = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-system = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+mmr-gadget = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-child-bounties = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-conviction-voting = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-election-provider-support-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-fast-unstake = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-message-queue = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-nis = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-nomination-pools = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-nomination-pools-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-ranked-collective = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-referenda = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-root-testing = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-session = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-session-benchmarking  = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-society = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-staking-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-state-trie-migration = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+pallet-whitelist = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-cli = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus-beefy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus-beefy-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus-grandpa = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-executor = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-informant = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-network = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-network-common = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-network-light = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-network-sync = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-network-transactions = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-service = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-storage-monitor = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-sysinfo = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sc-utils = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-consensus-beefy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-consensus-grandpa = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-core = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-io = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-session = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-staking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-std = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-storage = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-trie = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-version = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+sp-weights = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
+try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" }
 
 [patch."https://github.com/paritytech/polkadot"]
-kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-kusama-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-pallet-xcm-benchmarks = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-network-bridge = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-node-core-av-store = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-node-metrics = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-node-subsystem-util= { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-tracing-gum = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-xcm = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-node-core-runtime-api = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-node-collation-generation = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-collator-protocol = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
-polkadot-availability-recovery = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" }
+kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+kusama-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+pallet-xcm-benchmarks = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-network-bridge = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-node-core-av-store = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-node-metrics = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-node-subsystem-util= { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+tracing-gum = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+xcm = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-node-core-runtime-api = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-node-collation-generation = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-collator-protocol = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
+polkadot-availability-recovery = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" }
 
 [patch."https://github.com/paritytech/cumulus"]
-cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-pallet-parachain-system  = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-parachains-common  = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-statemine-runtime  = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
-statemint-runtime  = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" }
+cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-client-pov-recovery = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-pallet-parachain-system  = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
+parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" }
diff --git a/Makefile b/Makefile
index 1c522aba5e..d5f089082b 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ check-tests: githooks
 	SKIP_WASM_BUILD= cargo check --features with-all-runtime --tests --all
 
 .PHONY: check-all
-check-all: check-runtimes check-benchmarks check-integration-tests
+check-all: check-runtimes check-benchmarks check-tests check-integration-tests
 
 .PHONY: check-runtimes
 check-runtimes:
@@ -249,19 +249,19 @@ endif
 ifeq ($(words $(pallet_folder)), 0)
 	$(error pallet_folder not defined)
 endif
-	cargo run $(options) --release --bin=acala --features=runtime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 --pallet=$(pallet) --extrinsic="*" --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./modules/$(pallet_folder)/src/weights.rs --template=./templates/module-weight-template.hbs
+	cargo run $(options) --release --bin=acala --features=runtime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 --pallet=$(pallet) --extrinsic="*" --wasm-execution=compiled --heap-pages=4096 --output=./modules/$(pallet_folder)/src/weights.rs --template=./templates/module-weight-template.hbs
 
 .PHONY: benchmark-mandala
 benchmark-mandala:
-	cargo run $(options) --profile production --features=runtime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/mandala/src/weights/
+	cargo run $(options) --profile production --features=runtime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/mandala/src/weights/
 
 .PHONY: benchmark-karura
 benchmark-karura:
-	 cargo run $(options) --profile production --features=runtime-benchmarks --features=with-karura-runtime -- benchmark pallet --chain=karura-dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/karura/src/weights/
+	 cargo run $(options) --profile production --features=runtime-benchmarks --features=with-karura-runtime -- benchmark pallet --chain=karura-dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/karura/src/weights/
 
 .PHONY: benchmark-acala
 benchmark-acala:
-	 cargo run $(options) --profile production --features=runtime-benchmarks --features=with-acala-runtime -- benchmark pallet --chain=acala-dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/acala/src/weights/
+	 cargo run $(options) --profile production --features=runtime-benchmarks --features=with-acala-runtime -- benchmark pallet --chain=acala-dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/acala/src/weights/
 
 .PHONY: benchmark-machine
 benchmark-machine:
diff --git a/ecosystem-modules/stable-asset b/ecosystem-modules/stable-asset
index 2414bfcfe6..04a34495f1 160000
--- a/ecosystem-modules/stable-asset
+++ b/ecosystem-modules/stable-asset
@@ -1 +1 @@
-Subproject commit 2414bfcfe681867bf80233ffd9e35153109bbf1d
+Subproject commit 04a34495f1c4b56f15f9e1bd7e767f722a400c5a
diff --git a/evm-tests b/evm-tests
index cfee8a1958..368633df09 160000
--- a/evm-tests
+++ b/evm-tests
@@ -1 +1 @@
-Subproject commit cfee8a1958286d7abfe8d5f4c98ca37b58495fc7
+Subproject commit 368633df09088721f1e783f0b430534ffe7e8188
diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml
index 4f8480c8d4..fbef05938e 100644
--- a/inspect/Cargo.toml
+++ b/inspect/Cargo.toml
@@ -9,9 +9,9 @@ codec = { package = "parity-scale-codec", version = "3.4.0" }
 clap = { version = "4.0.9", features = ["derive"] }
 derive_more = "0.99"
 log = "0.4.17"
-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-service = { 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-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" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
diff --git a/launch/config.yml b/launch/config.yml
index b7825bf4b5..efee3c6c1f 100644
--- a/launch/config.yml
+++ b/launch/config.yml
@@ -11,7 +11,6 @@ relaychain:
   flags:
     - --rpc-methods=unsafe
     - --wasm-execution=compiled
-    - --execution=wasm
   nodes:
     - name: alice
     - name: bob
@@ -32,10 +31,8 @@ parachains:
     - --rpc-methods=unsafe
     - --force-authoring
     - --wasm-execution=compiled
-    - --execution=wasm
   relaychainFlags:
     - --wasm-execution=compiled
-    - --execution=wasm
   env:
     RUST_LOG: sc_basic_authorship=trace,cumulus-consensus=trace,cumulus-collator=trace,collator_protocol=trace,collation_generation=trace,aura=debug
   volumePath: /acala/data
diff --git a/launch/karura-bifrost.yml b/launch/karura-bifrost.yml
index 7b7c55366d..349b342267 100644
--- a/launch/karura-bifrost.yml
+++ b/launch/karura-bifrost.yml
@@ -22,7 +22,6 @@ relaychain:
   flags:
     - --rpc-methods=unsafe
     - --wasm-execution=compiled
-    - --execution=wasm
   nodes:
     - name: alice
     - name: bob
@@ -43,10 +42,8 @@ parachains:
     - --rpc-methods=unsafe
     - --force-authoring
     - --wasm-execution=compiled
-    - --execution=wasm
   relaychainFlags:
     - --wasm-execution=compiled
-    - --execution=wasm
   env:
     RUST_LOG: sc_basic_authorship=trace,cumulus-consensus=trace,cumulus-collator=trace,collator_protocol=trace,collation_generation=trace,aura=debug
   volumePath: /acala/data
@@ -67,10 +64,8 @@ parachains:
     - --rpc-methods=unsafe
     - --force-authoring
     - --wasm-execution=compiled
-    - --execution=wasm
   relaychainFlags:
     - --wasm-execution=compiled
-    - --execution=wasm
   env:
     RUST_LOG: sc_basic_authorship=trace,cumulus-consensus=trace,cumulus-collator=trace,collator_protocol=trace,collation_generation=trace,aura=debug
   volumePath: /data
diff --git a/modules/aggregated-dex/Cargo.toml b/modules/aggregated-dex/Cargo.toml
index e51590801e..a3b92656b7 100644
--- a/modules/aggregated-dex/Cargo.toml
+++ b/modules/aggregated-dex/Cargo.toml
@@ -6,12 +6,12 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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 }
-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-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
@@ -21,9 +21,9 @@ orml-tokens = { path = "../../orml/tokens", default-features = false }
 
 [dev-dependencies]
 orml-tokens = { path = "../../orml/tokens" }
-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-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/modules/aggregated-dex/src/lib.rs b/modules/aggregated-dex/src/lib.rs
index 5abad7e111..3a84f1d1d2 100644
--- a/modules/aggregated-dex/src/lib.rs
+++ b/modules/aggregated-dex/src/lib.rs
@@ -54,7 +54,7 @@ pub mod module {
 			AtLeast64BitUnsigned = Balance,
 			Balance = Balance,
 			AccountId = Self::AccountId,
-			BlockNumber = Self::BlockNumber,
+			BlockNumber = BlockNumberFor<Self>,
 		>;
 
 		/// Origin represented Governance
@@ -96,7 +96,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
diff --git a/modules/aggregated-dex/src/mock.rs b/modules/aggregated-dex/src/mock.rs
index 37dab211da..a03e63379e 100644
--- a/modules/aggregated-dex/src/mock.rs
+++ b/modules/aggregated-dex/src/mock.rs
@@ -30,15 +30,10 @@ use frame_system::EnsureSignedBy;
 use orml_tokens::ConvertBalance;
 pub use orml_traits::{parameter_type_with_key, MultiCurrency};
 use primitives::{Amount, TokenSymbol, TradingPair};
-use sp_runtime::{
-	testing::{Header, H256},
-	traits::IdentityLookup,
-	AccountId32, ArithmeticError, FixedPointNumber,
-};
+use sp_runtime::{testing::H256, traits::IdentityLookup, AccountId32, ArithmeticError, BuildStorage, FixedPointNumber};
 pub use support::{ExchangeRate, RebasedStableAsset};
 
 pub type AccountId = AccountId32;
-pub type BlockNumber = u64;
 
 mod aggregated_dex {
 	pub use super::super::*;
@@ -57,13 +52,12 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
@@ -206,20 +200,15 @@ impl Config for Runtime {
 pub type StableAssetWrapper =
 	RebasedStableAsset<StableAsset, ConvertBalanceHoma, RebasedStableAssetErrorConvertor<Runtime>>;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		AggregatedDex: aggregated_dex::{Pallet, Call, Storage},
-		Dex: module_dex::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		StableAsset: nutsfinance_stable_asset::{Pallet, Call, Storage, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		AggregatedDex: aggregated_dex,
+		Dex: module_dex,
+		Tokens: orml_tokens,
+		StableAsset: nutsfinance_stable_asset,
 	}
 );
 
@@ -242,8 +231,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		orml_tokens::GenesisConfig::<Runtime> {
diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml
index 3ef99501f4..a67a823d64 100644
--- a/modules/asset-registry/Cargo.toml
+++ b/modules/asset-registry/Cargo.toml
@@ -6,25 +6,25 @@ edition = "2021"
 
 [dependencies]
 log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", 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/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-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false  }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
 
 module-support = { path = "../support", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.81"
 hex = "0.4"
-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-balances = { 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-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 module-evm = { path = "../evm" }
 module-evm-bridge = { path = "../evm-bridge" }
diff --git a/modules/asset-registry/src/lib.rs b/modules/asset-registry/src/lib.rs
index 0cec3b2ef4..535164351c 100644
--- a/modules/asset-registry/src/lib.rs
+++ b/modules/asset-registry/src/lib.rs
@@ -175,21 +175,13 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::genesis_config]
+	#[derive(frame_support::DefaultNoBound)]
 	pub struct GenesisConfig<T: Config> {
 		pub assets: Vec<(CurrencyId, BalanceOf<T>)>,
 	}
 
-	#[cfg(feature = "std")]
-	impl<T: Config> Default for GenesisConfig<T> {
-		fn default() -> Self {
-			GenesisConfig {
-				assets: Default::default(),
-			}
-		}
-	}
-
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			self.assets.iter().for_each(|(asset, ed)| {
 				frame_support::assert_ok!(Pallet::<T>::do_register_native_asset(
diff --git a/modules/asset-registry/src/mock.rs b/modules/asset-registry/src/mock.rs
index 08d6c74e86..c41466c143 100644
--- a/modules/asset-registry/src/mock.rs
+++ b/modules/asset-registry/src/mock.rs
@@ -22,9 +22,7 @@
 
 use crate as asset_registry;
 use frame_support::{
-	assert_ok, construct_runtime, ord_parameter_types,
-	pallet_prelude::GenesisBuild,
-	parameter_types,
+	assert_ok, construct_runtime, ord_parameter_types, parameter_types,
 	traits::{ConstU128, ConstU32, ConstU64, Everything},
 };
 use frame_system::EnsureSignedBy;
@@ -33,19 +31,19 @@ use primitives::{
 	evm::convert_decimals_to_evm, evm::EvmAddress, AccountId, Balance, CurrencyId, ReserveIdentifier, TokenSymbol,
 };
 use sp_core::{H160, H256, U256};
+use sp_runtime::BuildStorage;
 use std::str::FromStr;
 
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -72,7 +70,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -139,20 +137,15 @@ impl asset_registry::Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		AssetRegistry: asset_registry::{Pallet, Call, Event<T>, Storage},
-		EVM: module_evm::{Pallet, Config<T>, Call, Storage, Event<T>},
-		EVMBridge: module_evm_bridge::{Pallet},
+	pub enum Runtime {
+		System: frame_system,
+		Balances: pallet_balances,
+		AssetRegistry: asset_registry,
+		EVM: module_evm,
+		EVMBridge: module_evm_bridge,
 	}
 );
 
@@ -274,8 +267,8 @@ impl ExtBuilder {
 	}
 
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		asset_registry::GenesisConfig::<Runtime> {
diff --git a/modules/auction-manager/Cargo.toml b/modules/auction-manager/Cargo.toml
index 80796d6649..9a008656dc 100644
--- a/modules/auction-manager/Cargo.toml
+++ b/modules/auction-manager/Cargo.toml
@@ -6,20 +6,20 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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 }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 orml-utilities = { path = "../../orml/utilities", default-features = false }
-sp-io = { 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-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-auction = { path = "../../orml/auction" }
 cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" }
 module-dex = { path = "../dex" }
diff --git a/modules/auction-manager/src/lib.rs b/modules/auction-manager/src/lib.rs
index 443a71aacf..4da7f10e93 100644
--- a/modules/auction-manager/src/lib.rs
+++ b/modules/auction-manager/src/lib.rs
@@ -140,12 +140,12 @@ pub mod module {
 
 		/// The extended time for the auction to end after each successful bid
 		#[pallet::constant]
-		type AuctionTimeToClose: Get<Self::BlockNumber>;
+		type AuctionTimeToClose: Get<BlockNumberFor<Self>>;
 
 		/// When the total duration of the auction exceeds this soft cap, push
 		/// the auction to end more faster
 		#[pallet::constant]
-		type AuctionDurationSoftCap: Get<Self::BlockNumber>;
+		type AuctionDurationSoftCap: Get<BlockNumberFor<Self>>;
 
 		/// The stable currency id
 		#[pallet::constant]
@@ -155,7 +155,7 @@ pub mod module {
 		type Currency: MultiCurrency<Self::AccountId, CurrencyId = CurrencyId, Balance = Balance>;
 
 		/// Auction to manager the auction process
-		type Auction: Auction<Self::AccountId, Self::BlockNumber, AuctionId = AuctionId, Balance = Balance>;
+		type Auction: Auction<Self::AccountId, BlockNumberFor<Self>, AuctionId = AuctionId, Balance = Balance>;
 
 		/// CDP treasury to escrow assets related to auction
 		type CDPTreasury: CDPTreasuryExtended<Self::AccountId, Balance = Balance, CurrencyId = CurrencyId>;
@@ -237,7 +237,7 @@ pub mod module {
 	#[pallet::storage]
 	#[pallet::getter(fn collateral_auctions)]
 	pub type CollateralAuctions<T: Config> =
-		StorageMap<_, Twox64Concat, AuctionId, CollateralAuctionItem<T::AccountId, T::BlockNumber>, OptionQuery>;
+		StorageMap<_, Twox64Concat, AuctionId, CollateralAuctionItem<T::AccountId, BlockNumberFor<T>>, OptionQuery>;
 
 	/// Record of the total collateral amount of all active collateral auctions
 	/// under specific collateral type CollateralType -> TotalAmount
@@ -258,10 +258,10 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		/// Start offchain worker in order to submit unsigned tx to cancel
 		/// active auction after system shutdown.
-		fn offchain_worker(now: T::BlockNumber) {
+		fn offchain_worker(now: BlockNumberFor<T>) {
 			if T::EmergencyShutdown::is_shutdown() && sp_io::offchain::is_validator() {
 				if let Err(e) = Self::_offchain_worker() {
 					log::info!(
@@ -420,7 +420,7 @@ impl<T: Config> Pallet<T> {
 
 	fn cancel_collateral_auction(
 		id: AuctionId,
-		collateral_auction: CollateralAuctionItem<T::AccountId, T::BlockNumber>,
+		collateral_auction: CollateralAuctionItem<T::AccountId, BlockNumberFor<T>>,
 	) -> DispatchResult {
 		let last_bid = Self::get_last_bid(id);
 
@@ -495,7 +495,7 @@ impl<T: Config> Pallet<T> {
 		}
 	}
 
-	fn get_minimum_increment_size(now: T::BlockNumber, start_block: T::BlockNumber) -> Rate {
+	fn get_minimum_increment_size(now: BlockNumberFor<T>, start_block: BlockNumberFor<T>) -> Rate {
 		if now >= start_block + T::AuctionDurationSoftCap::get() {
 			// double the minimum increment size when reach soft cap
 			T::MinimumIncrementSize::get().saturating_mul(Rate::saturating_from_integer(2))
@@ -504,7 +504,7 @@ impl<T: Config> Pallet<T> {
 		}
 	}
 
-	fn get_auction_time_to_close(now: T::BlockNumber, start_block: T::BlockNumber) -> T::BlockNumber {
+	fn get_auction_time_to_close(now: BlockNumberFor<T>, start_block: BlockNumberFor<T>) -> BlockNumberFor<T> {
 		if now >= start_block + T::AuctionDurationSoftCap::get() {
 			// halve the extended time of bid when reach soft cap
 			T::AuctionTimeToClose::get()
@@ -521,18 +521,18 @@ impl<T: Config> Pallet<T> {
 	/// Ensured atomic.
 	#[transactional]
 	pub fn collateral_auction_bid_handler(
-		now: T::BlockNumber,
+		now: BlockNumberFor<T>,
 		id: AuctionId,
 		new_bid: (T::AccountId, Balance),
 		last_bid: Option<(T::AccountId, Balance)>,
-	) -> sp_std::result::Result<T::BlockNumber, DispatchError> {
+	) -> sp_std::result::Result<BlockNumberFor<T>, DispatchError> {
 		let (new_bidder, new_bid_price) = new_bid;
 		ensure!(!new_bid_price.is_zero(), Error::<T>::InvalidBidPrice);
 
 		<CollateralAuctions<T>>::try_mutate_exists(
 			id,
-			|collateral_auction| -> sp_std::result::Result<T::BlockNumber, DispatchError> {
-				let mut collateral_auction = collateral_auction.as_mut().ok_or(Error::<T>::AuctionNotExists)?;
+			|collateral_auction| -> sp_std::result::Result<BlockNumberFor<T>, DispatchError> {
+				let collateral_auction = collateral_auction.as_mut().ok_or(Error::<T>::AuctionNotExists)?;
 				let last_bid_price = last_bid.clone().map_or(Zero::zero(), |(_, price)| price); // get last bid price
 
 				// ensure new bid price is valid
@@ -595,7 +595,7 @@ impl<T: Config> Pallet<T> {
 
 	fn collateral_auction_end_handler(
 		auction_id: AuctionId,
-		collateral_auction: CollateralAuctionItem<T::AccountId, T::BlockNumber>,
+		collateral_auction: CollateralAuctionItem<T::AccountId, BlockNumberFor<T>>,
 		last_bid: Option<(T::AccountId, Balance)>,
 	) {
 		let (last_bidder, bid_price) = if let Some((bidder, bid_price)) = last_bid.clone() {
@@ -679,7 +679,7 @@ impl<T: Config> Pallet<T> {
 
 	// Refund stable to the last_bidder.
 	fn try_refund_bid(
-		collateral_auction: &CollateralAuctionItem<T::AccountId, T::BlockNumber>,
+		collateral_auction: &CollateralAuctionItem<T::AccountId, BlockNumberFor<T>>,
 		last_bid: Option<(T::AccountId, Balance)>,
 	) {
 		if let Some((bidder, bid_price)) = last_bid {
@@ -736,13 +736,13 @@ impl<T: Config> Pallet<T> {
 	}
 }
 
-impl<T: Config> AuctionHandler<T::AccountId, Balance, T::BlockNumber, AuctionId> for Pallet<T> {
+impl<T: Config> AuctionHandler<T::AccountId, Balance, BlockNumberFor<T>, AuctionId> for Pallet<T> {
 	fn on_new_bid(
-		now: T::BlockNumber,
+		now: BlockNumberFor<T>,
 		id: AuctionId,
 		new_bid: (T::AccountId, Balance),
 		last_bid: Option<(T::AccountId, Balance)>,
-	) -> OnNewBidResult<T::BlockNumber> {
+	) -> OnNewBidResult<BlockNumberFor<T>> {
 		let bid_result = Self::collateral_auction_bid_handler(now, id, new_bid, last_bid);
 
 		match bid_result {
diff --git a/modules/auction-manager/src/mock.rs b/modules/auction-manager/src/mock.rs
index bab1b363d0..db9052dfdd 100644
--- a/modules/auction-manager/src/mock.rs
+++ b/modules/auction-manager/src/mock.rs
@@ -33,6 +33,7 @@ use sp_core::H256;
 use sp_runtime::{
 	testing::{Header, TestXt},
 	traits::{AccountIdConversion, IdentityLookup, One as OneT},
+	BuildStorage,
 };
 use sp_std::cell::RefCell;
 pub use support::Price;
@@ -56,14 +57,13 @@ mod auction_manager {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -220,17 +220,13 @@ pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, u32, ()>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		AuctionManagerModule: auction_manager::{Pallet, Storage, Call, Event<T>, ValidateUnsigned},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		AuctionModule: orml_auction::{Pallet, Storage, Call, Event<T>},
-		CDPTreasuryModule: cdp_treasury::{Pallet, Storage, Call, Event<T>},
-		DEXModule: module_dex::{Pallet, Storage, Call, Event<T>, Config<T>},
+	pub enum Runtime {
+		System: frame_system,
+		AuctionManagerModule: auction_manager,
+		Tokens: orml_tokens,
+		AuctionModule: orml_auction,
+		CDPTreasuryModule: cdp_treasury,
+		DEXModule: module_dex,
 	}
 );
 
@@ -268,8 +264,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		orml_tokens::GenesisConfig::<Runtime> {
diff --git a/modules/cdp-engine/Cargo.toml b/modules/cdp-engine/Cargo.toml
index fb9606ea10..a87ea9ceef 100644
--- a/modules/cdp-engine/Cargo.toml
+++ b/modules/cdp-engine/Cargo.toml
@@ -6,15 +6,15 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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 }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 orml-utilities = { path = "../../orml/utilities", default-features = false }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-io = { 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-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 loans = { package = "module-loans", path = "../loans", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
@@ -22,9 +22,9 @@ rand_chacha = { version = "0.2", default-features = false }
 nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" }
 
 [dev-dependencies]
-sp-core = { 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-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-currencies = { path = "../../orml/currencies" }
 dex = { package = "module-dex", path = "../dex" }
 cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" }
diff --git a/modules/cdp-engine/src/lib.rs b/modules/cdp-engine/src/lib.rs
index 85fe124bc0..afc5e5e639 100644
--- a/modules/cdp-engine/src/lib.rs
+++ b/modules/cdp-engine/src/lib.rs
@@ -339,8 +339,8 @@ pub mod module {
 		StorageValue<_, BoundedVec<EvmAddress, T::MaxLiquidationContracts>, ValueQuery>;
 
 	#[pallet::genesis_config]
-	#[cfg_attr(feature = "std", derive(Default))]
-	pub struct GenesisConfig {
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T> {
 		#[allow(clippy::type_complexity)]
 		pub collaterals_params: Vec<(
 			CurrencyId,
@@ -350,10 +350,11 @@ pub mod module {
 			Option<Ratio>,
 			Balance,
 		)>,
+		pub _phantom: PhantomData<T>,
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			self.collaterals_params.iter().for_each(
 				|(
@@ -385,10 +386,10 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		/// Issue interest in stable currency for all types of collateral has
 		/// debit when block end, and update their debit exchange rate
-		fn on_initialize(now: T::BlockNumber) -> Weight {
+		fn on_initialize(now: BlockNumberFor<T>) -> Weight {
 			// only after the block #1, `T::UnixTime::now()` will not report error.
 			// https://github.com/paritytech/substrate/blob/4ff92f10058cfe1b379362673dd369e33a919e66/frame/timestamp/src/lib.rs#L276
 			// so accumulate interest at the beginning of the block #2
@@ -405,7 +406,7 @@ pub mod module {
 
 		/// Runs after every block. Start offchain worker to check CDP and
 		/// submit unsigned tx to trigger liquidation or settlement.
-		fn offchain_worker(now: T::BlockNumber) {
+		fn offchain_worker(now: BlockNumberFor<T>) {
 			if let Err(e) = Self::_offchain_worker() {
 				log::info!(
 					target: "cdp-engine offchain worker",
diff --git a/modules/cdp-engine/src/mock.rs b/modules/cdp-engine/src/mock.rs
index 1b5c1c6efe..fba03b0383 100644
--- a/modules/cdp-engine/src/mock.rs
+++ b/modules/cdp-engine/src/mock.rs
@@ -31,8 +31,9 @@ use orml_traits::parameter_type_with_key;
 use primitives::{DexShare, Moment, TokenSymbol, TradingPair};
 use sp_core::{crypto::AccountId32, H256};
 use sp_runtime::{
-	testing::{Header, TestXt},
+	testing::TestXt,
 	traits::{AccountIdConversion, IdentityLookup, One as OneT},
+	BuildStorage,
 };
 use sp_std::{cell::RefCell, str::FromStr};
 use support::mocks::MockStableAsset;
@@ -59,14 +60,13 @@ mod cdp_engine {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -114,7 +114,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -408,25 +408,20 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		CDPEngineModule: cdp_engine::{Pallet, Storage, Call, Event<T>, Config, ValidateUnsigned},
-		CDPTreasuryModule: cdp_treasury::{Pallet, Storage, Call, Config, Event<T>},
-		Currencies: orml_currencies::{Pallet, Call},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		LoansModule: loans::{Pallet, Storage, Call, Event<T>},
-		PalletBalances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		DEXModule: dex::{Pallet, Storage, Call, Event<T>, Config<T>},
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-		EvmAccounts: evm_accounts::{Pallet, Call, Storage, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		CDPEngineModule: cdp_engine,
+		CDPTreasuryModule: cdp_treasury,
+		Currencies: orml_currencies,
+		Tokens: orml_tokens,
+		LoansModule: loans,
+		PalletBalances: pallet_balances,
+		DEXModule: dex,
+		Timestamp: pallet_timestamp,
+		EvmAccounts: evm_accounts,
 	}
 );
 
@@ -463,8 +458,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/cdp-treasury/Cargo.toml b/modules/cdp-treasury/Cargo.toml
index 5546c1b612..199a8ec984 100644
--- a/modules/cdp-treasury/Cargo.toml
+++ b/modules/cdp-treasury/Cargo.toml
@@ -6,20 +6,20 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", 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 }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" }
 
 [dev-dependencies]
-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-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-currencies = { path = "../../orml/currencies" }
 orml-auction = { path = "../../orml/auction" }
 module-dex = { path = "../dex" }
diff --git a/modules/cdp-treasury/src/lib.rs b/modules/cdp-treasury/src/lib.rs
index bb21375621..c8ef9ad4eb 100644
--- a/modules/cdp-treasury/src/lib.rs
+++ b/modules/cdp-treasury/src/lib.rs
@@ -82,7 +82,7 @@ pub mod module {
 			AtLeast64BitUnsigned = Balance,
 			Balance = Balance,
 			AccountId = Self::AccountId,
-			BlockNumber = Self::BlockNumber,
+			BlockNumber = BlockNumberFor<Self>,
 		>;
 
 		/// The cap of lots number when create collateral auction on a
@@ -154,13 +154,14 @@ pub mod module {
 	pub type DebitOffsetBuffer<T: Config> = StorageValue<_, Balance, ValueQuery>;
 
 	#[pallet::genesis_config]
-	#[cfg_attr(feature = "std", derive(Default))]
-	pub struct GenesisConfig {
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T> {
 		pub expected_collateral_auction_size: Vec<(CurrencyId, Balance)>,
+		pub _phantom: sp_std::marker::PhantomData<T>,
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			self.expected_collateral_auction_size
 				.iter()
@@ -174,9 +175,9 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		/// Handle excessive surplus or debits of system when block end
-		fn on_finalize(_now: T::BlockNumber) {
+		fn on_finalize(_now: BlockNumberFor<T>) {
 			// offset the same amount between debit pool and surplus pool
 			Self::offset_surplus_and_debit();
 		}
diff --git a/modules/cdp-treasury/src/mock.rs b/modules/cdp-treasury/src/mock.rs
index 04d1ef4c40..d8390abc40 100644
--- a/modules/cdp-treasury/src/mock.rs
+++ b/modules/cdp-treasury/src/mock.rs
@@ -33,7 +33,7 @@ use nutsfinance_stable_asset::{
 use orml_traits::parameter_type_with_key;
 use primitives::{DexShare, TokenSymbol, TradingPair};
 use sp_core::H256;
-use sp_runtime::{testing::Header, traits::IdentityLookup};
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
 use sp_std::cell::RefCell;
 use support::SpecificJointsSwap;
 
@@ -59,14 +59,13 @@ mod cdp_treasury {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -114,7 +113,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -223,21 +222,16 @@ impl Config for Runtime {
 	type StableAsset = MockStableAsset;
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		CDPTreasuryModule: cdp_treasury::{Pallet, Storage, Call, Config, Event<T>},
-		Currencies: orml_currencies::{Pallet, Call},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		PalletBalances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		DEXModule: module_dex::{Pallet, Storage, Call, Event<T>, Config<T>},
+	pub enum Runtime {
+		System: frame_system,
+		CDPTreasuryModule: cdp_treasury,
+		Currencies: orml_currencies,
+		Tokens: orml_tokens,
+		PalletBalances: pallet_balances,
+		DEXModule: module_dex,
 	}
 );
 
@@ -266,8 +260,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		orml_tokens::GenesisConfig::<Runtime> {
diff --git a/modules/collator-selection/Cargo.toml b/modules/collator-selection/Cargo.toml
index 53a02f0807..bf8f51b12e 100644
--- a/modules/collator-selection/Cargo.toml
+++ b/modules/collator-selection/Cargo.toml
@@ -10,28 +10,28 @@ targets = ['x86_64-unknown-linux-gnu']
 [dependencies]
 log = { version = "0.4.17", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-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-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-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
 [dev-dependencies]
-pallet-aura = { 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-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" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ['std']
diff --git a/modules/collator-selection/src/lib.rs b/modules/collator-selection/src/lib.rs
index ddc79f9732..ae2d7d6778 100644
--- a/modules/collator-selection/src/lib.rs
+++ b/modules/collator-selection/src/lib.rs
@@ -54,7 +54,7 @@
 //!   fees are deposited into the Pot.
 //!
 //! Note: Eventually the Pot distribution may be modified as discussed in
-//! [this issue](https://github.com/paritytech/statemint/issues/21#issuecomment-810481073).
+//! [this issue](https://github.com/paritytech/asset_hub_polkadot/issues/21#issuecomment-810481073).
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![allow(clippy::unused_unit)]
@@ -83,7 +83,6 @@ pub mod pallet {
 		},
 	};
 	use frame_support::{
-		inherent::Vec,
 		pallet_prelude::*,
 		storage::bounded_btree_set::BoundedBTreeSet,
 		traits::{
@@ -97,7 +96,7 @@ pub mod pallet {
 	use pallet_session::SessionManager;
 	use primitives::ReserveIdentifier;
 	use sp_staking::SessionIndex;
-	use sp_std::{ops::Div, vec};
+	use sp_std::{ops::Div, prelude::*};
 
 	pub const RESERVE_ID: ReserveIdentifier = ReserveIdentifier::CollatorSelection;
 	pub const POINT_PER_BLOCK: u32 = 10;
@@ -213,27 +212,20 @@ pub mod pallet {
 	pub type NonCandidates<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, SessionIndex, ValueQuery>;
 
 	#[pallet::genesis_config]
+	#[derive(frame_support::DefaultNoBound)]
 	pub struct GenesisConfig<T: Config> {
 		pub invulnerables: Vec<T::AccountId>,
 		pub candidacy_bond: BalanceOf<T>,
 		pub desired_candidates: u32,
 	}
 
-	#[cfg(feature = "std")]
-	impl<T: Config> Default for GenesisConfig<T> {
-		fn default() -> Self {
-			Self {
-				invulnerables: Default::default(),
-				candidacy_bond: Default::default(),
-				desired_candidates: Default::default(),
-			}
-		}
-	}
-
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
-			let duplicate_invulnerables = self.invulnerables.iter().collect::<std::collections::BTreeSet<_>>();
+			let duplicate_invulnerables = self
+				.invulnerables
+				.iter()
+				.collect::<sp_std::collections::btree_set::BTreeSet<_>>();
 			assert_eq!(
 				duplicate_invulnerables.len(),
 				self.invulnerables.len(),
@@ -448,7 +440,7 @@ pub mod pallet {
 
 	/// Keep track of number of authored blocks per authority, uncles are counted as well since
 	/// they're a valid proof of being online.
-	impl<T: Config + pallet_authorship::Config> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber>
+	impl<T: Config + pallet_authorship::Config> pallet_authorship::EventHandler<T::AccountId, BlockNumberFor<T>>
 		for Pallet<T>
 	{
 		fn note_author(author: T::AccountId) {
diff --git a/modules/collator-selection/src/mock.rs b/modules/collator-selection/src/mock.rs
index 9d8d5adba4..1b14232d0f 100644
--- a/modules/collator-selection/src/mock.rs
+++ b/modules/collator-selection/src/mock.rs
@@ -20,35 +20,30 @@ use super::*;
 use crate as collator_selection;
 use frame_support::{
 	ord_parameter_types, parameter_types,
-	traits::{ConstU16, ConstU32, ConstU64, Everything, FindAuthor, GenesisBuild},
+	traits::{ConstU16, ConstU32, ConstU64, Everything, FindAuthor},
 	PalletId,
 };
 use frame_system::EnsureSignedBy;
 use primitives::ReserveIdentifier;
 use sp_core::H256;
 use sp_runtime::{
-	testing::{Header, UintAuthorityId},
-	traits::{BlakeTwo256, IdentityLookup, OpaqueKeys},
-	Permill, RuntimeAppPublic,
+	testing::UintAuthorityId,
+	traits::{BlakeTwo256, ConstBool, IdentityLookup, OpaqueKeys},
+	BuildStorage, Permill, RuntimeAppPublic,
 };
 
-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, Config, Storage, Event<T>},
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
-		Aura: pallet_aura::{Pallet, Storage, Config<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		CollatorSelection: collator_selection::{Pallet, Call, Storage, Event<T>},
-		Authorship: pallet_authorship::{Pallet, Storage},
+	pub enum Test {
+		System: frame_system,
+		Timestamp: pallet_timestamp,
+		Session: pallet_session,
+		Aura: pallet_aura,
+		Balances: pallet_balances,
+		CollatorSelection: collator_selection,
+		Authorship: pallet_authorship,
 	}
 );
 
@@ -59,13 +54,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
-	type BlockNumber = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
@@ -89,7 +83,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -121,6 +115,7 @@ impl pallet_aura::Config for Test {
 	type AuthorityId = sp_consensus_aura::sr25519::AuthorityId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<32>;
+	type AllowMultipleBlocksPerSlot = ConstBool<false>;
 }
 
 sp_runtime::impl_opaque_keys! {
@@ -195,7 +190,7 @@ impl Config for Test {
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	sp_tracing::try_init_simple();
-	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 	let invulnerables = vec![1, 2];
 	let keys = invulnerables
 		.iter()
diff --git a/modules/collator-selection/src/tests.rs b/modules/collator-selection/src/tests.rs
index 6f43bd3b86..9d4b560a2d 100644
--- a/modules/collator-selection/src/tests.rs
+++ b/modules/collator-selection/src/tests.rs
@@ -21,10 +21,10 @@ use crate::{mock::*, Error, NonCandidates, RESERVE_ID};
 use frame_support::{
 	assert_noop, assert_ok,
 	storage::bounded_btree_set::BoundedBTreeSet,
-	traits::{ConstU32, Currency, GenesisBuild, NamedReservableCurrency, OnInitialize},
+	traits::{ConstU32, Currency, NamedReservableCurrency, OnInitialize},
 };
 use pallet_balances::Error as BalancesError;
-use sp_runtime::{testing::UintAuthorityId, traits::BadOrigin};
+use sp_runtime::{testing::UintAuthorityId, traits::BadOrigin, BuildStorage};
 
 type Collators = BoundedBTreeSet<u64, ConstU32<4>>;
 
@@ -574,7 +574,7 @@ fn exceeding_max_invulnerables_should_fail() {
 #[should_panic = "duplicate invulnerables in genesis."]
 fn cannot_set_genesis_value_twice() {
 	sp_tracing::try_init_simple();
-	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 	let invulnerables = vec![1, 1];
 
 	let collator_selection = collator_selection::GenesisConfig::<Test> {
diff --git a/modules/currencies/Cargo.toml b/modules/currencies/Cargo.toml
index 6e85ec6d7d..248dd71ae3 100644
--- a/modules/currencies/Cargo.toml
+++ b/modules/currencies/Cargo.toml
@@ -6,14 +6,14 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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-io = { 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 }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.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 }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 orml-traits = { path = "../../orml/traits", default-features = false }
 
@@ -23,10 +23,10 @@ support = { package = "module-support", path = "../support", default-features =
 [dev-dependencies]
 serde_json = "1.0.81"
 hex = "0.4"
-hex-literal = "0.3.4"
-sp-core = { 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-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+hex-literal = "0.4.1"
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 tokens = { package = "orml-tokens", path = "../../orml/tokens" }
 module-evm = { path = "../evm" }
 module-evm-bridge = { path = "../evm-bridge" }
diff --git a/modules/currencies/src/lib.rs b/modules/currencies/src/lib.rs
index bb28f224a5..92780c0737 100644
--- a/modules/currencies/src/lib.rs
+++ b/modules/currencies/src/lib.rs
@@ -164,7 +164,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
@@ -536,7 +536,7 @@ impl<T: Config> MultiCurrencyExtended<T::AccountId> for Pallet<T> {
 }
 
 impl<T: Config> MultiLockableCurrency<T::AccountId> for Pallet<T> {
-	type Moment = T::BlockNumber;
+	type Moment = BlockNumberFor<T>;
 
 	fn set_lock(
 		lock_id: LockIdentifier,
@@ -1225,7 +1225,7 @@ where
 	T: Config,
 	GetCurrencyId: Get<CurrencyId>,
 {
-	type Moment = T::BlockNumber;
+	type Moment = BlockNumberFor<T>;
 
 	fn set_lock(lock_id: LockIdentifier, who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
 		<Pallet<T> as MultiLockableCurrency<T::AccountId>>::set_lock(lock_id, GetCurrencyId::get(), who, amount)
diff --git a/modules/currencies/src/mock.rs b/modules/currencies/src/mock.rs
index 939551f1a4..dc445f8e22 100644
--- a/modules/currencies/src/mock.rs
+++ b/modules/currencies/src/mock.rs
@@ -25,7 +25,7 @@ pub use crate as currencies;
 
 use frame_support::{
 	assert_ok, ord_parameter_types, parameter_types,
-	traits::{ConstU128, ConstU32, ConstU64, Everything, GenesisBuild, Nothing},
+	traits::{ConstU128, ConstU32, ConstU64, Everything, Nothing},
 	PalletId,
 };
 use frame_system::EnsureSignedBy;
@@ -36,7 +36,7 @@ use sp_core::{H160, U256};
 use sp_runtime::{
 	testing::Header,
 	traits::{AccountIdConversion, IdentityLookup},
-	AccountId32,
+	AccountId32, BuildStorage,
 };
 use sp_std::str::FromStr;
 use support::{mocks::MockAddressMapping, AddressMapping};
@@ -50,13 +50,12 @@ pub type AccountId = AccountId32;
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
-	type BlockNumber = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -134,7 +133,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<1>;
 	type MaxFreezes = ();
@@ -228,17 +227,13 @@ pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, u32, SignedExtra>;
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-	NodeBlock = Block,
-	UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Tokens: tokens::{Pallet, Storage, Event<T>, Config<T>},
-		Currencies: currencies::{Pallet, Call, Event<T>},
-		EVM: module_evm::{Pallet, Config<T>, Call, Storage, Event<T>},
-		EVMBridge: module_evm_bridge::{Pallet},
+	pub enum Runtime {
+		System: frame_system,
+		Balances: pallet_balances,
+		Tokens: tokens,
+		Currencies: currencies,
+		EVM: module_evm,
+		EVMBridge: module_evm_bridge,
 	}
 );
 
@@ -343,8 +338,8 @@ impl ExtBuilder {
 	}
 
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/currencies/src/tests.rs b/modules/currencies/src/tests.rs
index cdd8bc086d..fc41c5a6fd 100644
--- a/modules/currencies/src/tests.rs
+++ b/modules/currencies/src/tests.rs
@@ -331,25 +331,10 @@ fn force_set_lock_and_force_remove_lock_should_work() {
 
 			// do nothing
 			assert_ok!(Currencies::force_set_lock(RuntimeOrigin::root(), alice(), DOT, 0, ID_1,));
-			assert_ok!(Currencies::force_set_lock(
-				RuntimeOrigin::root(),
-				alice(),
-				NATIVE_CURRENCY_ID,
-				0,
-				ID_1,
-			));
 			assert_eq!(
 				Tokens::locks(&alice(), DOT)[0],
 				tokens::BalanceLock { id: ID_1, amount: 10 }
 			);
-			assert_eq!(
-				PalletBalances::locks(&alice())[0],
-				pallet_balances::BalanceLock {
-					id: ID_1,
-					amount: 100,
-					reasons: WithdrawReasons::all().into(),
-				}
-			);
 
 			// remove lock
 			assert_noop!(
diff --git a/modules/dex-oracle/Cargo.toml b/modules/dex-oracle/Cargo.toml
index 519ca6c422..c9af3b7aa4 100644
--- a/modules/dex-oracle/Cargo.toml
+++ b/modules/dex-oracle/Cargo.toml
@@ -6,21 +6,21 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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 }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-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-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
 [dev-dependencies]
-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-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/modules/dex-oracle/src/lib.rs b/modules/dex-oracle/src/lib.rs
index a289c8c699..36499b7a97 100644
--- a/modules/dex-oracle/src/lib.rs
+++ b/modules/dex-oracle/src/lib.rs
@@ -102,8 +102,8 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
-		fn on_initialize(_n: T::BlockNumber) -> Weight {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(_n: BlockNumberFor<T>) -> Weight {
 			let now = T::Time::now();
 			let mut iterate_count: u32 = 0;
 			let mut update_count: u32 = 0;
diff --git a/modules/dex-oracle/src/mock.rs b/modules/dex-oracle/src/mock.rs
index f4c0472ba9..9044b652de 100644
--- a/modules/dex-oracle/src/mock.rs
+++ b/modules/dex-oracle/src/mock.rs
@@ -29,15 +29,13 @@ use frame_system::EnsureSignedBy;
 use primitives::{DexShare, Moment, TokenSymbol};
 use sp_core::{H160, H256};
 use sp_runtime::{
-	testing::Header,
 	traits::{IdentityLookup, Zero},
-	DispatchError,
+	BuildStorage, DispatchError,
 };
 use sp_std::cell::RefCell;
 use support::SwapLimit;
 
 pub type AccountId = u128;
-pub type BlockNumber = u64;
 
 pub const ACA: CurrencyId = CurrencyId::Token(TokenSymbol::ACA);
 pub const AUSD: CurrencyId = CurrencyId::Token(TokenSymbol::AUSD);
@@ -56,14 +54,13 @@ parameter_types! {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -178,18 +175,13 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-		DexOracle: dex_oracle::{Pallet, Call, Storage},
+	pub enum Runtime {
+		System: frame_system,
+		Timestamp: pallet_timestamp,
+		DexOracle: dex_oracle,
 	}
 );
 
@@ -203,8 +195,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		t.into()
diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml
index 3aebe66765..ae77e9f9cf 100644
--- a/modules/dex/Cargo.toml
+++ b/modules/dex/Cargo.toml
@@ -6,21 +6,21 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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 }
-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-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
 [dev-dependencies]
 orml-tokens = { path = "../../orml/tokens" }
-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-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/modules/dex/src/lib.rs b/modules/dex/src/lib.rs
index f67c331a1c..30e358fb70 100644
--- a/modules/dex/src/lib.rs
+++ b/modules/dex/src/lib.rs
@@ -129,7 +129,7 @@ pub mod module {
 
 		/// The extended provisioning blocks since the `not_before` of provisioning.
 		#[pallet::constant]
-		type ExtendedProvisioningBlocks: Get<Self::BlockNumber>;
+		type ExtendedProvisioningBlocks: Get<BlockNumberFor<Self>>;
 
 		/// Event handler which calls when update liquidity pool.
 		type OnLiquidityPoolUpdated: Happened<(TradingPair, Balance, Balance)>;
@@ -262,7 +262,7 @@ pub mod module {
 	#[pallet::storage]
 	#[pallet::getter(fn trading_pair_statuses)]
 	pub type TradingPairStatuses<T: Config> =
-		StorageMap<_, Twox64Concat, TradingPair, TradingPairStatus<Balance, T::BlockNumber>, ValueQuery>;
+		StorageMap<_, Twox64Concat, TradingPair, TradingPairStatus<Balance, BlockNumberFor<T>>, ValueQuery>;
 
 	/// Provision of TradingPair by AccountId.
 	///
@@ -282,25 +282,16 @@ pub mod module {
 		StorageMap<_, Twox64Concat, TradingPair, (ExchangeRate, ExchangeRate), ValueQuery>;
 
 	#[pallet::genesis_config]
+	#[derive(frame_support::DefaultNoBound)]
 	pub struct GenesisConfig<T: Config> {
-		pub initial_listing_trading_pairs: Vec<(TradingPair, (Balance, Balance), (Balance, Balance), T::BlockNumber)>,
+		pub initial_listing_trading_pairs:
+			Vec<(TradingPair, (Balance, Balance), (Balance, Balance), BlockNumberFor<T>)>,
 		pub initial_enabled_trading_pairs: Vec<TradingPair>,
 		pub initial_added_liquidity_pools: Vec<(T::AccountId, Vec<(TradingPair, (Balance, Balance))>)>,
 	}
 
-	#[cfg(feature = "std")]
-	impl<T: Config> Default for GenesisConfig<T> {
-		fn default() -> Self {
-			GenesisConfig {
-				initial_listing_trading_pairs: vec![],
-				initial_enabled_trading_pairs: vec![],
-				initial_added_liquidity_pools: vec![],
-			}
-		}
-	}
-
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			self.initial_listing_trading_pairs.iter().for_each(
 				|(trading_pair, min_contribution, target_provision, not_before)| {
@@ -349,7 +340,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
@@ -526,7 +517,7 @@ pub mod module {
 			#[pallet::compact] min_contribution_b: Balance,
 			#[pallet::compact] target_provision_a: Balance,
 			#[pallet::compact] target_provision_b: Balance,
-			#[pallet::compact] not_before: T::BlockNumber,
+			#[pallet::compact] not_before: BlockNumberFor<T>,
 		) -> DispatchResult {
 			T::ListingOrigin::ensure_origin(origin)?;
 
@@ -594,7 +585,7 @@ pub mod module {
 			#[pallet::compact] min_contribution_b: Balance,
 			#[pallet::compact] target_provision_a: Balance,
 			#[pallet::compact] target_provision_b: Balance,
-			#[pallet::compact] not_before: T::BlockNumber,
+			#[pallet::compact] not_before: BlockNumberFor<T>,
 		) -> DispatchResult {
 			T::ListingOrigin::ensure_origin(origin)?;
 			let trading_pair =
diff --git a/modules/dex/src/mock.rs b/modules/dex/src/mock.rs
index e6d5cb8a93..a9bf5ddf59 100644
--- a/modules/dex/src/mock.rs
+++ b/modules/dex/src/mock.rs
@@ -29,7 +29,7 @@ use frame_system::EnsureSignedBy;
 use orml_traits::{parameter_type_with_key, MultiReservableCurrency};
 use primitives::{Amount, TokenSymbol};
 use sp_core::H256;
-use sp_runtime::{testing::Header, traits::IdentityLookup};
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
 use sp_std::cell::RefCell;
 use support::{mocks::MockErc20InfoMapping, SpecificJointsSwap};
 
@@ -56,14 +56,13 @@ mod dex {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -161,18 +160,13 @@ parameter_types! {
 pub type AUSDJointSwap = SpecificJointsSwap<DexModule, AUSDJoint>;
 pub type ACAJointSwap = SpecificJointsSwap<DexModule, ACAJoint>;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		DexModule: dex::{Pallet, Storage, Call, Event<T>, Config<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
+	pub enum Runtime {
+		System: frame_system,
+		DexModule: dex,
+		Tokens: orml_tokens,
 	}
 );
 
@@ -222,8 +216,8 @@ impl ExtBuilder {
 	}
 
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		orml_tokens::GenesisConfig::<Runtime> {
diff --git a/modules/earning/Cargo.toml b/modules/earning/Cargo.toml
index c7166866fd..d5fa676cb0 100644
--- a/modules/earning/Cargo.toml
+++ b/modules/earning/Cargo.toml
@@ -6,13 +6,13 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 
-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/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false }
 
@@ -22,8 +22,8 @@ primitives = { package = "acala-primitives", path = "../../primitives", default-
 paste = "1.0"
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/modules/earning/src/lib.rs b/modules/earning/src/lib.rs
index c6bf43626b..e4583de7d8 100644
--- a/modules/earning/src/lib.rs
+++ b/modules/earning/src/lib.rs
@@ -59,7 +59,7 @@ pub mod module {
 		#[pallet::constant]
 		type MinBond: Get<Balance>;
 		#[pallet::constant]
-		type UnbondingPeriod: Get<Self::BlockNumber>;
+		type UnbondingPeriod: Get<BlockNumberFor<Self>>;
 		#[pallet::constant]
 		type InstantUnstakeFee: Get<Option<Permill>>;
 		#[pallet::constant]
@@ -121,7 +121,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
@@ -251,7 +251,7 @@ impl<T: Config> Pallet<T> {}
 impl<T: Config> BondingController for Pallet<T> {
 	type MinBond = T::MinBond;
 	type MaxUnbondingChunks = T::MaxUnbondingChunks;
-	type Moment = T::BlockNumber;
+	type Moment = BlockNumberFor<T>;
 	type AccountId = T::AccountId;
 
 	type Ledger = Ledger<T>;
diff --git a/modules/earning/src/mock.rs b/modules/earning/src/mock.rs
index 48ce62c416..7983f5b6cb 100644
--- a/modules/earning/src/mock.rs
+++ b/modules/earning/src/mock.rs
@@ -29,21 +29,19 @@ use frame_support::{
 use pallet_balances::NegativeImbalance;
 use primitives::mock_handler;
 use sp_core::H256;
-use sp_runtime::{testing::Header, traits::IdentityLookup};
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
 
 pub type AccountId = u128;
-pub type BlockNumber = u64;
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -71,7 +69,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -108,15 +106,10 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
+	pub enum Runtime {
 		System: frame_system,
 		Balances: pallet_balances,
 		Earning: earning,
@@ -135,8 +128,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/emergency-shutdown/Cargo.toml b/modules/emergency-shutdown/Cargo.toml
index c1c84e58d2..ce907f00cb 100644
--- a/modules/emergency-shutdown/Cargo.toml
+++ b/modules/emergency-shutdown/Cargo.toml
@@ -6,19 +6,19 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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-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 }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 loans = { package = "module-loans", path = "../loans", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
 [dev-dependencies]
-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-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-currencies = { path = "../../orml/currencies" }
 orml-traits = { path = "../../orml/traits" }
 orml-tokens = { path = "../../orml/tokens" }
diff --git a/modules/emergency-shutdown/src/lib.rs b/modules/emergency-shutdown/src/lib.rs
index a7c1224e0a..7757c73c38 100644
--- a/modules/emergency-shutdown/src/lib.rs
+++ b/modules/emergency-shutdown/src/lib.rs
@@ -93,9 +93,9 @@ pub mod module {
 	#[pallet::generate_deposit(fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// Emergency shutdown occurs.
-		Shutdown { block_number: T::BlockNumber },
+		Shutdown { block_number: BlockNumberFor<T> },
 		/// The final redemption opened.
-		OpenRefund { block_number: T::BlockNumber },
+		OpenRefund { block_number: BlockNumberFor<T> },
 		/// Refund info.
 		Refund {
 			who: T::AccountId,
@@ -122,7 +122,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
diff --git a/modules/emergency-shutdown/src/mock.rs b/modules/emergency-shutdown/src/mock.rs
index 2f1e104b15..7a001a959e 100644
--- a/modules/emergency-shutdown/src/mock.rs
+++ b/modules/emergency-shutdown/src/mock.rs
@@ -31,9 +31,8 @@ use orml_traits::parameter_type_with_key;
 use primitives::{Amount, TokenSymbol};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{AccountIdConversion, IdentityLookup},
-	DispatchResult,
+	BuildStorage, DispatchResult,
 };
 use support::mocks::MockStableAsset;
 use support::{AuctionManager, LockablePrice, RiskManager, SpecificJointsSwap};
@@ -55,14 +54,13 @@ mod emergency_shutdown {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -110,7 +108,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -240,22 +238,17 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		EmergencyShutdownModule: emergency_shutdown::{Pallet, Storage, Call, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		PalletBalances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		Currencies: orml_currencies::{Pallet, Call},
-		CDPTreasuryModule: cdp_treasury::{Pallet, Storage, Call, Event<T>},
-		Loans: loans::{Pallet, Storage, Call, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		EmergencyShutdownModule: emergency_shutdown,
+		Tokens: orml_tokens,
+		PalletBalances: pallet_balances,
+		Currencies: orml_currencies,
+		CDPTreasuryModule: cdp_treasury,
+		Loans: loans,
 	}
 );
 
@@ -278,8 +271,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		orml_tokens::GenesisConfig::<Runtime> {
diff --git a/modules/evm-accounts/Cargo.toml b/modules/evm-accounts/Cargo.toml
index 13c05e3640..912585b0c6 100644
--- a/modules/evm-accounts/Cargo.toml
+++ b/modules/evm-accounts/Cargo.toml
@@ -7,14 +7,14 @@ edition = "2021"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 libsecp256k1 = { version = "0.7", default-features = false, features = ["hmac", "static-context"], optional = true }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 
-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-io = { 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/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 orml-traits = { path = "../../orml/traits", default-features = false }
 
@@ -23,7 +23,7 @@ module-support = { path = "../support", default-features = false }
 module-evm-utility-macro = { path = "../evm-utility/macro" }
 
 [dev-dependencies]
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-currencies = { path = "../../orml/currencies" }
 orml-tokens = { path = "../../orml/tokens" }
 
diff --git a/modules/evm-accounts/src/lib.rs b/modules/evm-accounts/src/lib.rs
index 32956bbcea..6f9c0be6b0 100644
--- a/modules/evm-accounts/src/lib.rs
+++ b/modules/evm-accounts/src/lib.rs
@@ -129,7 +129,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
@@ -246,7 +246,8 @@ impl<T: Config> Pallet<T> {
 		domain_seperator_msg.extend_from_slice(keccak256!("Acala EVM claim")); // name
 		domain_seperator_msg.extend_from_slice(keccak256!("1")); // version
 		domain_seperator_msg.extend_from_slice(&to_bytes(T::ChainId::get())); // chain id
-		domain_seperator_msg.extend_from_slice(frame_system::Pallet::<T>::block_hash(T::BlockNumber::zero()).as_ref()); // genesis block hash
+		domain_seperator_msg
+			.extend_from_slice(frame_system::Pallet::<T>::block_hash(BlockNumberFor::<T>::zero()).as_ref()); // genesis block hash
 		keccak_256(domain_seperator_msg.as_slice())
 	}
 
diff --git a/modules/evm-accounts/src/mock.rs b/modules/evm-accounts/src/mock.rs
index 9966482dca..358a826402 100644
--- a/modules/evm-accounts/src/mock.rs
+++ b/modules/evm-accounts/src/mock.rs
@@ -29,7 +29,7 @@ use orml_traits::parameter_type_with_key;
 use primitives::{Amount, Balance, CurrencyId, TokenSymbol};
 use sp_core::{crypto::AccountId32, H256};
 use sp_io::hashing::keccak_256;
-use sp_runtime::{testing::Header, traits::IdentityLookup};
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
 
 pub type AccountId = AccountId32;
 pub type BlockNumber = u64;
@@ -42,14 +42,13 @@ mod evm_accounts {
 }
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -77,7 +76,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -124,20 +123,15 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		EvmAccountsModule: evm_accounts::{Pallet, Call, Storage, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Currencies: orml_currencies::{Pallet, Call},
+	pub enum Runtime {
+		System: frame_system,
+		EvmAccountsModule: evm_accounts,
+		Tokens: orml_tokens,
+		Balances: pallet_balances,
+		Currencies: orml_currencies,
 	}
 );
 
@@ -151,8 +145,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/evm-bridge/Cargo.toml b/modules/evm-bridge/Cargo.toml
index 2e58a20455..594fc08d9a 100644
--- a/modules/evm-bridge/Cargo.toml
+++ b/modules/evm-bridge/Cargo.toml
@@ -9,13 +9,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 impl-trait-for-tuples = "0.2.2"
 ethereum-types = { version = "0.14.0", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
@@ -27,8 +27,8 @@ num_enum = { version = "0.5.1", default-features = false }
 [dev-dependencies]
 serde_json = "1.0.81"
 hex = "0.4"
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/modules/evm-bridge/src/lib.rs b/modules/evm-bridge/src/lib.rs
index a05d2019a5..93a33982c8 100644
--- a/modules/evm-bridge/src/lib.rs
+++ b/modules/evm-bridge/src/lib.rs
@@ -24,6 +24,7 @@ use frame_support::{
 	dispatch::{DispatchError, DispatchResult},
 	pallet_prelude::*,
 };
+use frame_system::pallet_prelude::*;
 use module_evm::{ExitReason, ExitSucceed};
 use num_enum::{IntoPrimitive, TryFromPrimitive};
 use primitives::{evm::EvmAddress, Balance};
@@ -87,7 +88,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {}
diff --git a/modules/evm-bridge/src/mock.rs b/modules/evm-bridge/src/mock.rs
index 55c212d440..e1e8ca26a5 100644
--- a/modules/evm-bridge/src/mock.rs
+++ b/modules/evm-bridge/src/mock.rs
@@ -28,12 +28,11 @@ use frame_support::{
 use frame_system::EnsureSignedBy;
 use primitives::{evm::convert_decimals_to_evm, evm::EvmAddress, ReserveIdentifier};
 use sp_core::{crypto::AccountId32, H256};
-use sp_runtime::{testing::Header, traits::IdentityLookup};
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
 pub use sp_std::str::FromStr;
 use support::{mocks::MockAddressMapping, AddressMapping};
 
 pub type AccountId = AccountId32;
-pub type BlockNumber = u64;
 pub type Balance = u128;
 
 mod evm_bridge {
@@ -44,13 +43,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
@@ -77,7 +75,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -132,19 +130,14 @@ impl Config for Runtime {
 	type EVM = EVM;
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		EVMBridge: evm_bridge::{Pallet},
-		EVM: module_evm::{Pallet, Config<T>, Call, Storage, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		EVMBridgeModule: evm_bridge,
+		EVM: module_evm,
+		Balances: pallet_balances,
 	}
 );
 
@@ -280,8 +273,8 @@ impl ExtBuilder {
 	}
 
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml
index f6e23ee9dc..11aa4778e7 100644
--- a/modules/evm-utility/Cargo.toml
+++ b/modules/evm-utility/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 sha3 = { version = "0.10.6", default-features = false }
 
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 evm = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false, features = ["with-codec"] }
 evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false }
diff --git a/modules/evm/Cargo.toml b/modules/evm/Cargo.toml
index 0faf207f79..9de7622acd 100644
--- a/modules/evm/Cargo.toml
+++ b/modules/evm/Cargo.toml
@@ -11,27 +11,27 @@ required-features = ["bench"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-hex-literal = { version = "0.3.1" }
-ripemd160 = { version = "0.9", default-features = false }
+hex-literal = { version = "0.4.1" }
+ripemd = { version = "0.1.3", default-features = false }
 rlp = { version = "0.5.2", default-features = false }
-serde = { version = "1.0.145", optional = true, features = ["derive"] }
-sha3 = { version = "0.9.1", default-features = false }
+serde = { version = "1.0.145", default-features = false, features = ["alloc", "derive"] }
+sha3 = { version = "0.10.8", default-features = false }
 tiny-keccak = { version = "2.0", features = ["fips202"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"], optional = true }
 hex = { version = "0.4", default-features = false, features = ["alloc"], optional = true }
 num = { version = "0.4", features = ["alloc"], default-features = false }
 bn = { package = "substrate-bn", version = "0.6", 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-timestamp = { 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, optional = true }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
 
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-io = { 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-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 orml-bencher = { path = "../../orml/bencher", default-features = false, optional = true }
 orml-currencies = { path = "../../orml/currencies", default-features = false, optional = true }
@@ -44,18 +44,21 @@ module-idle-scheduler = { path = "../idle-scheduler", default-features = false,
 module-transaction-payment = { path = "../../modules/transaction-payment", default-features = false }
 module-dex = { path = "../dex", default-features = false, optional = true }
 
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+
+# we don't directly depends on this but need frame-benchmarking/std to fix build
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" , default-features = false, optional = true }
 
 [dev-dependencies]
 hex = "0.4"
-env_logger = "0.9.0"
+env_logger = "0.10.0"
 serde_json = "1.0.81"
-pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ["std"]
 std = [
-	"serde",
+	"serde/std",
 
 	"codec/std",
 	"frame-support/std",
@@ -73,7 +76,7 @@ std = [
 	"pallet-balances/std",
 	"pallet-timestamp/std",
 	"primitives/std",
-	"ripemd160/std",
+	"ripemd/std",
 	"rlp/std",
 	"scale-info/std",
 	"sha3/std",
@@ -81,7 +84,8 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"xcm-builder/std"
+	"xcm-builder/std",
+	"frame-benchmarking/std",
 ]
 with-ethereum-compatibility = []
 try-runtime = [
@@ -108,7 +112,7 @@ bench = [
 	"pallet-balances",
 	"serde_json",
 	"sp-runtime/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks"
+	"xcm-builder/runtime-benchmarks",
 ]
 evm-tests = [
 	"primitives/evm-tests"
diff --git a/modules/evm/rpc/runtime_api/Cargo.toml b/modules/evm/rpc/runtime_api/Cargo.toml
index 0e0a0bf969..1e83876027 100644
--- a/modules/evm/rpc/runtime_api/Cargo.toml
+++ b/modules/evm/rpc/runtime_api/Cargo.toml
@@ -5,10 +5,10 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-sp-runtime = { 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 }
-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-v1.0.0", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 primitives = { package = "acala-primitives", path = "../../../../primitives", default-features = false }
 
 [features]
diff --git a/modules/evm/src/bench/mock.rs b/modules/evm/src/bench/mock.rs
index 9e3fe08c9b..661c7cd693 100644
--- a/modules/evm/src/bench/mock.rs
+++ b/modules/evm/src/bench/mock.rs
@@ -33,11 +33,12 @@ use module_support::{
 };
 use orml_traits::{parameter_type_with_key, MultiReservableCurrency};
 pub use primitives::{
-	define_combined_task, Address, Amount, Block, BlockNumber, CurrencyId, Header, Multiplier, ReserveIdentifier,
-	Signature, TokenSymbol,
+	define_combined_task, Address, Amount, BlockNumber, CurrencyId, Header, Multiplier, ReserveIdentifier, Signature,
+	TokenSymbol,
 };
 use sp_core::{H160, H256};
 use sp_runtime::{
+	generic,
 	traits::{AccountIdConversion, BlakeTwo256, BlockNumberProvider, IdentityLookup},
 	AccountId32, FixedU128, Percent,
 };
@@ -56,13 +57,12 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId32;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU32<250>;
 	type DbWeight = ();
@@ -87,7 +87,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -304,20 +304,17 @@ impl module_dex::Config for Runtime {
 
 pub type SignedExtra = (frame_system::CheckWeight<Runtime>,);
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
+pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		Dex: module_dex::{Pallet, Call, Storage, Event<T>},
-		EVM: evm_mod::{Pallet, Config<T>, Call, Storage, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Currencies: orml_currencies::{Pallet, Call},
-		IdleScheduler: module_idle_scheduler::{Pallet, Call, Storage, Event<T>},
-		TransactionPayment: module_transaction_payment::{Pallet, Call, Storage, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		Dex: module_dex,
+		EVM: evm_mod,
+		Tokens: orml_tokens,
+		Balances: pallet_balances,
+		Currencies: orml_currencies,
+		IdleScheduler: module_idle_scheduler,
+		TransactionPayment: module_transaction_payment,
 	}
 );
diff --git a/modules/evm/src/lib.rs b/modules/evm/src/lib.rs
index c07d61008f..782c652519 100644
--- a/modules/evm/src/lib.rs
+++ b/modules/evm/src/lib.rs
@@ -66,7 +66,6 @@ pub use primitives::{
 	Balance, CurrencyId, Nonce, ReserveIdentifier,
 };
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sha3::{Digest, Keccak256};
 use sp_core::{H160, H256, U256};
@@ -275,8 +274,7 @@ pub mod module {
 		pub ref_count: u32,
 	}
 
-	#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo, Default)]
-	#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+	#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo, Default, Serialize, Deserialize)]
 	/// Account definition used for genesis block construction.
 	pub struct GenesisAccount<Balance, Index> {
 		/// Account nonce.
@@ -303,7 +301,7 @@ pub mod module {
 	/// Accounts: map EvmAddress => Option<AccountInfo<T>>
 	#[pallet::storage]
 	#[pallet::getter(fn accounts)]
-	pub type Accounts<T: Config> = StorageMap<_, Twox64Concat, EvmAddress, AccountInfo<T::Index>, OptionQuery>;
+	pub type Accounts<T: Config> = StorageMap<_, Twox64Concat, EvmAddress, AccountInfo<T::Nonce>, OptionQuery>;
 
 	/// The storage usage for contracts. Including code size, extra bytes and total AccountStorages
 	/// size.
@@ -359,23 +357,14 @@ pub mod module {
 	pub type XcmOrigin<T: Config> = StorageValue<_, Vec<T::AccountId>, OptionQuery>;
 
 	#[pallet::genesis_config]
+	#[derive(frame_support::DefaultNoBound)]
 	pub struct GenesisConfig<T: Config> {
 		pub chain_id: u64,
-		pub accounts: BTreeMap<EvmAddress, GenesisAccount<BalanceOf<T>, T::Index>>,
-	}
-
-	#[cfg(feature = "std")]
-	impl<T: Config> Default for GenesisConfig<T> {
-		fn default() -> Self {
-			GenesisConfig {
-				chain_id: Default::default(),
-				accounts: Default::default(),
-			}
-		}
+		pub accounts: BTreeMap<EvmAddress, GenesisAccount<BalanceOf<T>, T::Nonce>>,
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			use sp_std::rc::Rc;
 
@@ -386,7 +375,7 @@ pub mod module {
 			self.accounts.iter().for_each(|(address, account)| {
 				let account_id = T::AddressMapping::get_account_id(address);
 
-				let account_info = <AccountInfo<T::Index>>::new(account.nonce, None);
+				let account_info = <AccountInfo<T::Nonce>>::new(account.nonce, None);
 				<Accounts<T>>::insert(address, account_info);
 
 				let amount = if account.balance.is_zero() {
@@ -544,7 +533,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn integrity_test() {
 			assert!(convert_decimals_from_evm(T::StorageDepositPerByte::get()).is_some());
 		}
@@ -568,7 +557,7 @@ pub mod module {
 			#[pallet::compact] gas_limit: u64,
 			#[pallet::compact] storage_limit: u32,
 			access_list: Vec<AccessListItem>,
-			#[pallet::compact] _valid_until: T::BlockNumber, // checked by tx validation logic
+			#[pallet::compact] _valid_until: BlockNumberFor<T>, // checked by tx validation logic
 		) -> DispatchResultWithPostInfo {
 			match action {
 				TransactionAction::Call(target) => {
@@ -1488,7 +1477,7 @@ impl<T: Config> Pallet<T> {
 			if let Some(account_info) = maybe_account_info.as_mut() {
 				account_info.contract_info = Some(contract_info.clone());
 			} else {
-				let account_info = AccountInfo::<T::Index>::new(Default::default(), Some(contract_info.clone()));
+				let account_info = AccountInfo::<T::Nonce>::new(Default::default(), Some(contract_info.clone()));
 				*maybe_account_info = Some(account_info);
 			}
 		});
@@ -1905,10 +1894,10 @@ impl<T: Config> Pallet<T> {
 		// EVM changes reverted, increase nonce by ourselves
 		Accounts::<T>::mutate(origin, |account| {
 			if let Some(info) = account.as_mut() {
-				info.nonce = info.nonce.saturating_add(T::Index::one());
+				info.nonce = info.nonce.saturating_add(T::Nonce::one());
 			} else {
 				*account = Some(AccountInfo {
-					nonce: T::Index::one(),
+					nonce: T::Nonce::one(),
 					contract_info: None,
 				});
 			}
diff --git a/modules/evm/src/mock.rs b/modules/evm/src/mock.rs
index 73398c28a5..e67caaa466 100644
--- a/modules/evm/src/mock.rs
+++ b/modules/evm/src/mock.rs
@@ -31,9 +31,8 @@ use orml_traits::parameter_type_with_key;
 use primitives::{define_combined_task, Amount, BlockNumber, CurrencyId, ReserveIdentifier, TokenSymbol};
 use sp_core::{H160, H256};
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, BlockNumberProvider, IdentityLookup},
-	AccountId32,
+	AccountId32, BuildStorage,
 };
 use std::{collections::BTreeMap, str::FromStr};
 
@@ -49,13 +48,12 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
-	type BlockNumber = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId32;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
@@ -80,7 +78,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -224,15 +222,10 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
+	pub enum Runtime {
 		System: frame_system,
 		Timestamp: pallet_timestamp,
 		EVM: evm_mod,
@@ -267,8 +260,8 @@ pub fn charlie() -> H160 {
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	let mut t = frame_system::GenesisConfig::default()
-		.build_storage::<Runtime>()
+	let mut t = frame_system::GenesisConfig::<Runtime>::default()
+		.build_storage()
 		.unwrap();
 
 	let mut accounts = BTreeMap::new();
diff --git a/modules/evm/src/precompiles/mod.rs b/modules/evm/src/precompiles/mod.rs
index 308a98a9f8..e5a7287d2b 100644
--- a/modules/evm/src/precompiles/mod.rs
+++ b/modules/evm/src/precompiles/mod.rs
@@ -32,13 +32,13 @@ mod ripemd;
 mod sha256;
 mod sha3fips;
 
+pub use self::ripemd::Ripemd160;
 pub use blake2::Blake2F;
 pub use bn128::{Bn128Add, Bn128Mul, Bn128Pairing};
 pub use ecrecover::ECRecover;
 pub use ecrecover_publickey::ECRecoverPublicKey;
 pub use identity::Identity;
 pub use modexp::{IstanbulModexp, Modexp};
-pub use ripemd::Ripemd160;
 pub use sha256::Sha256;
 pub use sha3fips::{Sha3FIPS256, Sha3FIPS512};
 
diff --git a/modules/evm/src/precompiles/ripemd.rs b/modules/evm/src/precompiles/ripemd.rs
index 58b7ac1555..f677997689 100644
--- a/modules/evm/src/precompiles/ripemd.rs
+++ b/modules/evm/src/precompiles/ripemd.rs
@@ -31,7 +31,7 @@ impl LinearCostPrecompile for Ripemd160 {
 
 	fn execute(input: &[u8], _cost: u64) -> core::result::Result<(ExitSucceed, Vec<u8>), PrecompileFailure> {
 		let mut ret = [0u8; 32];
-		ret[12..32].copy_from_slice(&ripemd160::Ripemd160::digest(input));
+		ret[12..32].copy_from_slice(&ripemd::Ripemd160::digest(input));
 		Ok((ExitSucceed::Returned, ret.to_vec()))
 	}
 }
diff --git a/modules/evm/src/runner/stack.rs b/modules/evm/src/runner/stack.rs
index c49187183f..a37ebabb4a 100644
--- a/modules/evm/src/runner/stack.rs
+++ b/modules/evm/src/runner/stack.rs
@@ -33,6 +33,7 @@ use frame_support::{
 	traits::{Currency, ExistenceRequirement, Get},
 	transactional,
 };
+use frame_system::pallet_prelude::*;
 use module_evm_utility::{
 	ethereum::Log,
 	evm::{self, backend::Backend as BackendT, ExitError, ExitReason, Transfer},
@@ -623,7 +624,7 @@ impl<'vicinity, 'config, T: Config> BackendT for SubstrateStackState<'vicinity,
 		if number > U256::from(u32::MAX) {
 			H256::default()
 		} else {
-			let number = T::BlockNumber::from(number.as_u32());
+			let number = BlockNumberFor::<T>::from(number.as_u32());
 			H256::from_slice(frame_system::Pallet::<T>::block_hash(number).as_ref())
 		}
 	}
@@ -732,7 +733,7 @@ impl<'vicinity, 'config, T: Config> StackStateT<'config> for SubstrateStackState
 			if let Some(account) = maybe_account.as_mut() {
 				account.nonce += One::one()
 			} else {
-				let mut account_info = <AccountInfo<T::Index>>::new(Default::default(), None);
+				let mut account_info = <AccountInfo<T::Nonce>>::new(Default::default(), None);
 				account_info.nonce += One::one();
 				*maybe_account = Some(account_info);
 			}
diff --git a/modules/evm/src/tests.rs b/modules/evm/src/tests.rs
index 44fac4c4f3..995e5a60a8 100644
--- a/modules/evm/src/tests.rs
+++ b/modules/evm/src/tests.rs
@@ -2577,7 +2577,7 @@ fn strict_call_works() {
 			),
 			Err(DispatchErrorWithPostInfo {
 				post_info: PostDispatchInfo {
-					actual_weight: Some(Weight::from_parts(1468769052, 7186)),
+					actual_weight: Some(Weight::from_parts(1465812680, 7186)),
 					pays_fee: Pays::Yes
 				},
 				error: Error::<Runtime>::NoPermission.into(),
@@ -2610,7 +2610,7 @@ fn strict_call_works() {
 			),
 			Err(DispatchErrorWithPostInfo {
 				post_info: PostDispatchInfo {
-					actual_weight: Some(Weight::from_parts(1467812754, 7186)),
+					actual_weight: Some(Weight::from_parts(1464856382, 7186)),
 					pays_fee: Pays::Yes
 				},
 				error: Error::<Runtime>::StrictCallFailed.into(),
diff --git a/modules/homa-validator-list/Cargo.toml b/modules/homa-validator-list/Cargo.toml
index 02c8262d45..fa1e51d848 100644
--- a/modules/homa-validator-list/Cargo.toml
+++ b/modules/homa-validator-list/Cargo.toml
@@ -7,19 +7,19 @@ edition = "2021"
 [dependencies]
 serde = { version = "1.0.145", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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/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 }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 
 [dev-dependencies]
-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-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-tokens = { path = "../../orml/tokens" }
 orml-currencies = { path = "../../orml/currencies" }
 
diff --git a/modules/homa-validator-list/src/lib.rs b/modules/homa-validator-list/src/lib.rs
index b8f8784547..21a729d1c2 100644
--- a/modules/homa-validator-list/src/lib.rs
+++ b/modules/homa-validator-list/src/lib.rs
@@ -184,7 +184,7 @@ pub mod module {
 		type MinBondAmount: Get<Balance>;
 		#[pallet::constant]
 		/// The number of blocks a token is bonded to a validator for.
-		type BondingDuration: Get<Self::BlockNumber>;
+		type BondingDuration: Get<BlockNumberFor<Self>>;
 		#[pallet::constant]
 		/// The minimum amount of insurance a validator needs.
 		type ValidatorInsuranceThreshold: Get<Balance>;
@@ -203,7 +203,7 @@ pub mod module {
 		type OnDecreaseGuarantee: Happened<(Self::AccountId, Self::RelaychainAccountId, Balance)>;
 
 		// The block number provider
-		type BlockNumberProvider: BlockNumberProvider<BlockNumber = Self::BlockNumber>;
+		type BlockNumberProvider: BlockNumberProvider<BlockNumber = BlockNumberFor<Self>>;
 	}
 
 	#[pallet::error]
@@ -255,7 +255,7 @@ pub mod module {
 		T::RelaychainAccountId,
 		Twox64Concat,
 		T::AccountId,
-		Guarantee<T::BlockNumber>,
+		Guarantee<BlockNumberFor<T>>,
 		OptionQuery,
 	>;
 
@@ -278,7 +278,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
@@ -519,7 +519,7 @@ impl<T: Config> Pallet<T> {
 	fn update_guarantee(
 		guarantor: &T::AccountId,
 		validator: &T::RelaychainAccountId,
-		f: impl FnOnce(&mut Guarantee<T::BlockNumber>) -> DispatchResult,
+		f: impl FnOnce(&mut Guarantee<BlockNumberFor<T>>) -> DispatchResult,
 	) -> DispatchResult {
 		Guarantees::<T>::try_mutate_exists(validator, guarantor, |maybe_guarantee| -> DispatchResult {
 			let mut guarantee = maybe_guarantee.take().unwrap_or_default();
diff --git a/modules/homa-validator-list/src/mock.rs b/modules/homa-validator-list/src/mock.rs
index 12d0339d84..b8cc74b75c 100644
--- a/modules/homa-validator-list/src/mock.rs
+++ b/modules/homa-validator-list/src/mock.rs
@@ -29,7 +29,7 @@ use frame_system::EnsureSignedBy;
 use orml_traits::parameter_type_with_key;
 use primitives::{Amount, Balance, CurrencyId, TokenSymbol};
 use sp_core::H256;
-use sp_runtime::{testing::Header, traits::IdentityLookup};
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
 use sp_std::cell::RefCell;
 use std::collections::HashMap;
 use support::ExchangeRate;
@@ -51,14 +51,13 @@ mod homa_validator_list {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -106,7 +105,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -213,20 +212,15 @@ impl Config for Runtime {
 	type BlockNumberProvider = MockBlockNumberProvider;
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		OrmlTokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		PalletBalances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		OrmlCurrencies: orml_currencies::{Pallet, Call},
-		HomaValidatorListModule: homa_validator_list::{Pallet, Call, Storage, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		OrmlTokens: orml_tokens,
+		PalletBalances: pallet_balances,
+		OrmlCurrencies: orml_currencies,
+		HomaValidatorListModule: homa_validator_list,
 	}
 );
 
@@ -244,8 +238,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		orml_tokens::GenesisConfig::<Runtime> {
diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml
index 0c9ff45509..21fce262f1 100644
--- a/modules/homa/Cargo.toml
+++ b/modules/homa/Cargo.toml
@@ -6,24 +6,24 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true}
-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-arithmetic = { 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-core = { 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  }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true}
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false  }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false  }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 module-support = { path = "../../modules/support", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 module-currencies = { path = "../../modules/currencies" }
 orml-tokens = { path = "../../orml/tokens" }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/modules/homa/src/lib.rs b/modules/homa/src/lib.rs
index da7c7f4e4c..7377d0d8d2 100644
--- a/modules/homa/src/lib.rs
+++ b/modules/homa/src/lib.rs
@@ -145,7 +145,7 @@ pub mod module {
 		type RedeemThreshold: Get<Balance>;
 
 		/// Block number provider for the relaychain.
-		type RelayChainBlockNumber: BlockNumberProvider<BlockNumber = Self::BlockNumber>;
+		type RelayChainBlockNumber: BlockNumberProvider<BlockNumber = BlockNumberFor<Self>>;
 
 		/// The XcmInterface to manage the staking of sub-account on relaychain.
 		type XcmInterface: HomaSubAccountXcm<Self::AccountId, Balance>;
@@ -239,9 +239,9 @@ pub mod module {
 		/// The fast match fee rate has been updated.
 		FastMatchFeeRateUpdated { fast_match_fee_rate: Rate },
 		/// The relaychain block number of last era bumped updated.
-		LastEraBumpedBlockUpdated { last_era_bumped_block: T::BlockNumber },
+		LastEraBumpedBlockUpdated { last_era_bumped_block: BlockNumberFor<T> },
 		/// The frequency to bump era has been updated.
-		BumpEraFrequencyUpdated { frequency: T::BlockNumber },
+		BumpEraFrequencyUpdated { frequency: BlockNumberFor<T> },
 	}
 
 	/// The current era of relaychain
@@ -341,25 +341,25 @@ pub mod module {
 
 	/// The relaychain block number of last era bumped.
 	///
-	/// LastEraBumpedBlock: value: T::BlockNumber
+	/// LastEraBumpedBlock: value: BlockNumberFor<T>
 	#[pallet::storage]
 	#[pallet::getter(fn last_era_bumped_block)]
-	pub type LastEraBumpedBlock<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+	pub type LastEraBumpedBlock<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
 	/// The internal of relaychain block number of relaychain to bump local current era.
 	///
-	/// LastEraBumpedRelayChainBlock: value: T::BlockNumber
+	/// LastEraBumpedRelayChainBlock: value: BlockNumberFor<T>
 	#[pallet::storage]
 	#[pallet::getter(fn bump_era_frequency)]
-	pub type BumpEraFrequency<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+	pub type BumpEraFrequency<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
 	#[pallet::pallet]
 	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
-		fn on_initialize(_: T::BlockNumber) -> Weight {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(_: BlockNumberFor<T>) -> Weight {
 			let bump_era_number = Self::era_amount_should_to_bump(T::RelayChainBlockNumber::current_block_number());
 			if !bump_era_number.is_zero() {
 				let _ = Self::bump_current_era(bump_era_number);
@@ -537,8 +537,8 @@ pub mod module {
 		#[transactional]
 		pub fn update_bump_era_params(
 			origin: OriginFor<T>,
-			last_era_bumped_block: Option<T::BlockNumber>,
-			frequency: Option<T::BlockNumber>,
+			last_era_bumped_block: Option<BlockNumberFor<T>>,
+			frequency: Option<BlockNumberFor<T>>,
 		) -> DispatchResult {
 			T::GovernanceOrigin::ensure_origin(origin)?;
 
@@ -1097,7 +1097,7 @@ pub mod module {
 			Self::burn_liquid_currency(&Self::account_id(), total_redeem_amount)
 		}
 
-		pub fn era_amount_should_to_bump(relaychain_block_number: T::BlockNumber) -> EraIndex {
+		pub fn era_amount_should_to_bump(relaychain_block_number: BlockNumberFor<T>) -> EraIndex {
 			relaychain_block_number
 				.checked_sub(&Self::last_era_bumped_block())
 				.and_then(|n| n.checked_div(&Self::bump_era_frequency()))
diff --git a/modules/homa/src/mock.rs b/modules/homa/src/mock.rs
index 0735f4fba3..f4acbe65fd 100644
--- a/modules/homa/src/mock.rs
+++ b/modules/homa/src/mock.rs
@@ -30,7 +30,7 @@ use module_support::mocks::MockAddressMapping;
 use orml_traits::parameter_type_with_key;
 use primitives::{Amount, TokenSymbol};
 use sp_core::{H160, H256};
-use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
+use sp_runtime::{traits::IdentityLookup, AccountId32, BuildStorage};
 use xcm::v3::prelude::*;
 
 pub type AccountId = AccountId32;
@@ -83,13 +83,12 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
@@ -134,7 +133,7 @@ impl pallet_balances::Config for Runtime {
 	type WeightInfo = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -204,20 +203,15 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Homa: homa::{Pallet, Call, Storage, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		Currencies: module_currencies::{Pallet, Call, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		Homa: homa,
+		Balances: pallet_balances,
+		Tokens: orml_tokens,
+		Currencies: module_currencies,
 	}
 );
 
@@ -238,8 +232,8 @@ impl ExtBuilder {
 	}
 
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/honzon-bridge/Cargo.toml b/modules/honzon-bridge/Cargo.toml
index dc88935498..693d48d4f9 100644
--- a/modules/honzon-bridge/Cargo.toml
+++ b/modules/honzon-bridge/Cargo.toml
@@ -5,22 +5,22 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", 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/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-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.81"
 hex = "0.4"
-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-balances = { 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-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 module-currencies = { path = "../../modules/currencies" }
 module-evm = { path = "../evm" }
diff --git a/modules/honzon-bridge/src/lib.rs b/modules/honzon-bridge/src/lib.rs
index 7d2f141291..647ae37fa3 100644
--- a/modules/honzon-bridge/src/lib.rs
+++ b/modules/honzon-bridge/src/lib.rs
@@ -92,7 +92,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn integrity_test() {
 			assert!(T::StableCoinCurrencyId::get() == KUSD);
 		}
diff --git a/modules/honzon-bridge/src/mock.rs b/modules/honzon-bridge/src/mock.rs
index e1e20f0e80..618918a6a7 100644
--- a/modules/honzon-bridge/src/mock.rs
+++ b/modules/honzon-bridge/src/mock.rs
@@ -24,7 +24,7 @@ pub use crate as module_honzon_bridge;
 
 pub use frame_support::{
 	assert_ok, construct_runtime, ord_parameter_types,
-	pallet_prelude::GenesisBuild,
+	pallet_prelude::*,
 	parameter_types,
 	traits::{ConstU128, ConstU32, ConstU64, Everything, Nothing},
 	PalletId,
@@ -34,7 +34,7 @@ pub use module_evm_accounts::EvmAddressMapping;
 pub use module_support::{mocks::MockAddressMapping, AddressMapping};
 pub use orml_traits::{parameter_type_with_key, MultiCurrency};
 use sp_core::{H160, H256, U256};
-use sp_runtime::traits::AccountIdConversion;
+use sp_runtime::{traits::AccountIdConversion, BuildStorage};
 use std::str::FromStr;
 
 pub use primitives::{
@@ -53,14 +53,13 @@ pub const KUSD: CurrencyId = CurrencyId::Token(TokenSymbol::KUSD);
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -106,7 +105,7 @@ impl pallet_balances::Config for Runtime {
 	type WeightInfo = ();
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -204,15 +203,10 @@ impl module_honzon_bridge::Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
+	pub enum Runtime {
 		System: frame_system,
 		Balances: pallet_balances,
 		Tokens: orml_tokens,
@@ -291,8 +285,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml
index feec80f208..113236fa01 100644
--- a/modules/honzon/Cargo.toml
+++ b/modules/honzon/Cargo.toml
@@ -6,22 +6,22 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-sp-runtime = { 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 }
-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-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 cdp-engine = { package = "module-cdp-engine", path = "../cdp-engine", default-features = false }
 loans = { package = "module-loans", path = "../loans", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-core = { 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-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-currencies = { path = "../../orml/currencies" }
 orml-traits = { path = "../../orml/traits" }
 orml-tokens = { path = "../../orml/tokens" }
diff --git a/modules/honzon/src/lib.rs b/modules/honzon/src/lib.rs
index b8bec33b3d..3228fd15c2 100644
--- a/modules/honzon/src/lib.rs
+++ b/modules/honzon/src/lib.rs
@@ -132,7 +132,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
diff --git a/modules/honzon/src/mock.rs b/modules/honzon/src/mock.rs
index a248eab8e9..63155a5ef5 100644
--- a/modules/honzon/src/mock.rs
+++ b/modules/honzon/src/mock.rs
@@ -32,9 +32,9 @@ use orml_traits::parameter_type_with_key;
 use primitives::{Balance, Moment, ReserveIdentifier, TokenSymbol};
 use sp_core::{crypto::AccountId32, H256};
 use sp_runtime::{
-	testing::{Header, TestXt},
+	testing::TestXt,
 	traits::{AccountIdConversion, IdentityLookup, One as OneT},
-	FixedPointNumber,
+	BuildStorage, FixedPointNumber,
 };
 use sp_std::cell::RefCell;
 use support::mocks::MockStableAsset;
@@ -58,14 +58,13 @@ pub const DOT: CurrencyId = CurrencyId::Token(TokenSymbol::DOT);
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -113,7 +112,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -284,7 +283,6 @@ impl cdp_engine::Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 impl Config for Runtime {
@@ -296,21 +294,17 @@ impl Config for Runtime {
 }
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		HonzonModule: honzon::{Pallet, Storage, Call, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		PalletBalances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		Currencies: orml_currencies::{Pallet, Call},
-		LoansModule: loans::{Pallet, Storage, Call, Event<T>},
-		CDPTreasuryModule: cdp_treasury::{Pallet, Storage, Call, Event<T>},
-		CDPEngineModule: cdp_engine::{Pallet, Storage, Call, Event<T>, Config, ValidateUnsigned},
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-		EvmAccounts: evm_accounts::{Pallet, Call, Storage, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		HonzonModule: honzon,
+		Tokens: orml_tokens,
+		PalletBalances: pallet_balances,
+		Currencies: orml_currencies,
+		LoansModule: loans,
+		CDPTreasuryModule: cdp_treasury,
+		CDPEngineModule: cdp_engine,
+		Timestamp: pallet_timestamp,
+		EvmAccounts: evm_accounts,
 	}
 );
 
@@ -346,8 +340,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/idle-scheduler/Cargo.toml b/modules/idle-scheduler/Cargo.toml
index 2e09ce828c..57efc5951e 100644
--- a/modules/idle-scheduler/Cargo.toml
+++ b/modules/idle-scheduler/Cargo.toml
@@ -5,18 +5,18 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", 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/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-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 acala-primitives = { path = "../../primitives", default-features = false }
 module-support = { path = "../support", default-features = false }
 
 [dev-dependencies]
-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" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/modules/idle-scheduler/src/lib.rs b/modules/idle-scheduler/src/lib.rs
index 9909ee5fd9..13d1c2d33f 100644
--- a/modules/idle-scheduler/src/lib.rs
+++ b/modules/idle-scheduler/src/lib.rs
@@ -101,8 +101,8 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
-		fn on_initialize(_n: T::BlockNumber) -> Weight {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(_n: BlockNumberFor<T>) -> Weight {
 			// This is the previous relay block because `on_initialize` is executed
 			// before the inherent that sets the new relay chain block number
 			let previous_relay_block: BlockNumber = T::RelayChainBlockNumberProvider::current_block_number();
@@ -111,7 +111,7 @@ pub mod module {
 			T::WeightInfo::on_initialize()
 		}
 
-		fn on_idle(_n: T::BlockNumber, remaining_weight: Weight) -> Weight {
+		fn on_idle(_n: BlockNumberFor<T>, remaining_weight: Weight) -> Weight {
 			// Checks if we have skipped enough relay blocks without block production to skip dispatching
 			// scheduled tasks
 			let current_relay_block_number: BlockNumber = T::RelayChainBlockNumberProvider::current_block_number();
@@ -132,7 +132,7 @@ pub mod module {
 			}
 		}
 
-		fn on_finalize(_n: T::BlockNumber) {
+		fn on_finalize(_n: BlockNumberFor<T>) {
 			// Don't commit to storage, needed for the case block is full and `on_idle` isn't called
 			PreviousRelayBlockNumber::<T>::kill();
 		}
diff --git a/modules/idle-scheduler/src/mock.rs b/modules/idle-scheduler/src/mock.rs
index 7d8b18aab7..2ee82e0546 100644
--- a/modules/idle-scheduler/src/mock.rs
+++ b/modules/idle-scheduler/src/mock.rs
@@ -29,6 +29,7 @@ use frame_support::{
 };
 use module_support::DispatchableTask;
 pub use sp_runtime::offchain::storage::StorageValueRef;
+use sp_runtime::BuildStorage;
 
 use super::*;
 use codec::{Decode, Encode};
@@ -41,14 +42,13 @@ pub type AccountId = u32;
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -128,17 +128,12 @@ define_combined_task! {
 	}
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Event<T>},
-		IdleScheduler: module_idle_scheduler::{Pallet, Call, Event<T>, Storage},
+	pub enum Runtime {
+		System: frame_system,
+		IdleScheduler: module_idle_scheduler,
 	}
 );
 
@@ -146,8 +141,8 @@ construct_runtime!(
 pub struct ExtBuilder;
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		let mut ext = sp_io::TestExternalities::new(t);
diff --git a/modules/incentives/Cargo.toml b/modules/incentives/Cargo.toml
index c9718eb456..363a1d41dc 100644
--- a/modules/incentives/Cargo.toml
+++ b/modules/incentives/Cargo.toml
@@ -6,20 +6,20 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", 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 }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 orml-rewards = { path = "../../orml/rewards", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
 [dev-dependencies]
-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-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-tokens = { path = "../../orml/tokens" }
 orml-rewards = { path = "../../orml/rewards" }
 
diff --git a/modules/incentives/src/lib.rs b/modules/incentives/src/lib.rs
index 393499e5be..d210293134 100644
--- a/modules/incentives/src/lib.rs
+++ b/modules/incentives/src/lib.rs
@@ -70,7 +70,7 @@ pub mod module {
 
 		/// The period to accumulate rewards
 		#[pallet::constant]
-		type AccumulatePeriod: Get<Self::BlockNumber>;
+		type AccumulatePeriod: Get<BlockNumberFor<Self>>;
 
 		/// The native currency for earning staking
 		#[pallet::constant]
@@ -176,8 +176,8 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
-		fn on_initialize(now: T::BlockNumber) -> Weight {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(now: BlockNumberFor<T>) -> Weight {
 			// accumulate reward periodically
 			if now % T::AccumulatePeriod::get() == Zero::zero() {
 				let mut count: u32 = 0;
diff --git a/modules/incentives/src/mock.rs b/modules/incentives/src/mock.rs
index 0d180d0c4d..0cf6f81848 100644
--- a/modules/incentives/src/mock.rs
+++ b/modules/incentives/src/mock.rs
@@ -30,12 +30,11 @@ use frame_system::EnsureSignedBy;
 use orml_traits::parameter_type_with_key;
 use primitives::{DexShare, TokenSymbol};
 use sp_core::H256;
-use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
+use sp_runtime::{traits::IdentityLookup, AccountId32, BuildStorage};
 use sp_std::cell::RefCell;
 pub use support::{Price, Ratio, SwapLimit};
 
 pub type AccountId = AccountId32;
-pub type BlockNumber = u64;
 
 pub const ACA: CurrencyId = CurrencyId::Token(TokenSymbol::ACA);
 pub const AUSD: CurrencyId = CurrencyId::Token(TokenSymbol::AUSD);
@@ -61,14 +60,13 @@ ord_parameter_types! {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -154,19 +152,14 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		IncentivesModule: incentives::{Pallet, Storage, Call, Event<T>},
-		TokensModule: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		RewardsModule: orml_rewards::{Pallet, Storage, Call},
+	pub enum Runtime {
+		System: frame_system,
+		IncentivesModule: incentives,
+		TokensModule: orml_tokens,
+		RewardsModule: orml_rewards,
 	}
 );
 
@@ -182,8 +175,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 		orml_tokens::GenesisConfig::<Runtime> {
 			balances: self.balances,
diff --git a/modules/liquid-crowdloan/Cargo.toml b/modules/liquid-crowdloan/Cargo.toml
index 1737479b09..f39188692a 100644
--- a/modules/liquid-crowdloan/Cargo.toml
+++ b/modules/liquid-crowdloan/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
diff --git a/modules/liquid-crowdloan/src/mock.rs b/modules/liquid-crowdloan/src/mock.rs
index 2b719082c8..d6acb14e8c 100644
--- a/modules/liquid-crowdloan/src/mock.rs
+++ b/modules/liquid-crowdloan/src/mock.rs
@@ -31,7 +31,7 @@ use frame_system::{EnsureRoot, EnsureSignedBy};
 use orml_traits::parameter_type_with_key;
 use primitives::{Amount, TokenSymbol};
 use sp_core::{H160, H256};
-use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
+use sp_runtime::{traits::IdentityLookup, AccountId32, BuildStorage};
 use std::cell::RefCell;
 use support::mocks::MockAddressMapping;
 
@@ -53,13 +53,12 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
@@ -104,7 +103,7 @@ impl pallet_balances::Config for Runtime {
 	type WeightInfo = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -173,20 +172,15 @@ impl liquid_crowdloan::Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		Currencies: module_currencies::{Pallet, Call, Event<T>},
-		LiquidCrowdloan: liquid_crowdloan::{Pallet, Call, Event<T>, Storage},
+	pub enum Runtime {
+		System: frame_system,
+		Balances: pallet_balances,
+		Tokens: orml_tokens,
+		Currencies: module_currencies,
+		LiquidCrowdloan: liquid_crowdloan,
 	}
 );
 
@@ -219,8 +213,8 @@ impl ExtBuilder {
 		TRANSFER_RECORD.with(|v| *v.borrow_mut() = None);
 		TRANSFER_OK.with(|v| *v.borrow_mut() = self.transfer_ok);
 
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml
index e5af348549..9fd14976d7 100644
--- a/modules/loans/Cargo.toml
+++ b/modules/loans/Cargo.toml
@@ -6,19 +6,19 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-frame-support = { 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-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 
 [dev-dependencies]
-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-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-currencies = { path = "../../orml/currencies" }
 orml-tokens = { path = "../../orml/tokens" }
 cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" }
diff --git a/modules/loans/src/lib.rs b/modules/loans/src/lib.rs
index cb7bdd6b6d..853198645a 100644
--- a/modules/loans/src/lib.rs
+++ b/modules/loans/src/lib.rs
@@ -123,9 +123,6 @@ pub mod module {
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {}
 }
diff --git a/modules/loans/src/mock.rs b/modules/loans/src/mock.rs
index bd5c5f474f..4f6a51ca6a 100644
--- a/modules/loans/src/mock.rs
+++ b/modules/loans/src/mock.rs
@@ -31,8 +31,8 @@ use orml_traits::parameter_type_with_key;
 use primitives::TokenSymbol;
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{AccountIdConversion, IdentityLookup},
+	BuildStorage,
 };
 use sp_std::cell::RefCell;
 use std::collections::HashMap;
@@ -56,14 +56,13 @@ mod loans {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -111,7 +110,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -258,21 +257,16 @@ impl Config for Runtime {
 	type OnUpdateLoan = MockOnUpdateLoan;
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		LoansModule: loans::{Pallet, Storage, Call, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		PalletBalances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		Currencies: orml_currencies::{Pallet, Call},
-		CDPTreasuryModule: cdp_treasury::{Pallet, Storage, Call, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		LoansModule: loans,
+		Tokens: orml_tokens,
+		PalletBalances: pallet_balances,
+		Currencies: orml_currencies,
+		CDPTreasuryModule: cdp_treasury,
 	}
 );
 
@@ -295,8 +289,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 		orml_tokens::GenesisConfig::<Runtime> {
 			balances: self.balances,
diff --git a/modules/nft/Cargo.toml b/modules/nft/Cargo.toml
index 7eb062e474..9974f6cd4d 100644
--- a/modules/nft/Cargo.toml
+++ b/modules/nft/Cargo.toml
@@ -5,26 +5,26 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.145", optional = true }
+serde = { version = "1.0.145", default-features = false, features = ["alloc", "derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
 scale-info = { version = "2.1", default-features = false, features = ["derive"] }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true}
-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-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true}
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", 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-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 orml-nft = { path = "../../orml/nft", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 
 [dev-dependencies]
-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-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 orml-tokens = { path = "../../orml/tokens" }
 module-currencies = { path = "../../modules/currencies" }
@@ -33,7 +33,7 @@ support = { package = "module-support", path = "../../modules/support" }
 [features]
 default = ["std"]
 std = [
-	"serde",
+	"serde/std",
 
 	"codec/std",
 	"frame-benchmarking/std",
diff --git a/modules/nft/src/benchmarking.rs b/modules/nft/src/benchmarking.rs
index 1988539105..aa2f577015 100644
--- a/modules/nft/src/benchmarking.rs
+++ b/modules/nft/src/benchmarking.rs
@@ -163,8 +163,8 @@ mod mock {
 	};
 	use sp_core::{crypto::AccountId32, H256};
 	use sp_runtime::{
-		testing::Header,
 		traits::{BlakeTwo256, IdentityLookup},
+		BuildStorage,
 	};
 
 	pub type AccountId = AccountId32;
@@ -172,14 +172,13 @@ mod mock {
 	impl frame_system::Config for Runtime {
 		type BaseCallFilter = BaseFilter;
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = u64;
-		type BlockNumber = u64;
+		type Nonce = u64;
 		type Hash = H256;
 		type RuntimeCall = RuntimeCall;
 		type Hashing = BlakeTwo256;
 		type AccountId = AccountId;
 		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
+		type Block = Block;
 		type RuntimeEvent = ();
 		type BlockHashCount = ConstU64<250>;
 		type BlockWeights = ();
@@ -205,7 +204,7 @@ mod mock {
 		type MaxReserves = ConstU32<50>;
 		type ReserveIdentifier = ReserveIdentifier;
 		type WeightInfo = ();
-		type HoldIdentifier = ();
+		type RuntimeHoldReason = ();
 		type FreezeIdentifier = ();
 		type MaxHolds = ();
 		type MaxFreezes = ();
@@ -289,29 +288,24 @@ mod mock {
 		type MaxTokenMetadata = ConstU32<1024>;
 	}
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 	type Block = frame_system::mocking::MockBlock<Runtime>;
 
 	frame_support::construct_runtime!(
-		pub enum Runtime where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
-		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-			Utility: pallet_utility::{Pallet, Call, Event},
-			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-			Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>},
-			OrmlNFT: orml_nft::{Pallet, Storage, Config<T>},
-			NFT: nft::{Pallet, Call, Event<T>},
+		pub enum Runtime {
+			System: frame_system,
+			Utility: pallet_utility,
+			Balances: pallet_balances,
+			Proxy: pallet_proxy,
+			OrmlNFT: orml_nft,
+			NFT: nft,
 		}
 	);
 
 	use frame_system::Call as SystemCall;
 
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		let mut ext = sp_io::TestExternalities::new(t);
diff --git a/modules/nft/src/lib.rs b/modules/nft/src/lib.rs
index 2702982676..38641524b7 100644
--- a/modules/nft/src/lib.rs
+++ b/modules/nft/src/lib.rs
@@ -40,7 +40,6 @@ use primitives::{
 };
 use scale_info::TypeInfo;
 
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::{
 	traits::{AccountIdConversion, Hash, Saturating, StaticLookup, Zero},
@@ -56,8 +55,7 @@ pub mod weights;
 pub use module::*;
 pub use weights::WeightInfo;
 
-#[derive(Encode, Decode, Clone, RuntimeDebug, PartialEq, Eq, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Encode, Decode, Clone, RuntimeDebug, PartialEq, Eq, TypeInfo, Serialize, Deserialize)]
 pub struct ClassData<Balance> {
 	/// Deposit reserved to create token class
 	pub deposit: Balance,
@@ -67,8 +65,7 @@ pub struct ClassData<Balance> {
 	pub attributes: Attributes,
 }
 
-#[derive(Encode, Decode, Clone, RuntimeDebug, PartialEq, Eq, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Encode, Decode, Clone, RuntimeDebug, PartialEq, Eq, TypeInfo, Serialize, Deserialize)]
 pub struct TokenData<Balance> {
 	/// Deposit reserved to create token
 	pub deposit: Balance,
@@ -199,9 +196,6 @@ pub mod module {
 	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Create NFT class, tokens belong to the class.
@@ -385,7 +379,7 @@ pub mod module {
 				let class_info = class_info.as_mut().ok_or(Error::<T>::ClassIdNotFound)?;
 				ensure!(who == class_info.owner, Error::<T>::NoPermission);
 
-				let mut data = &mut class_info.data;
+				let data = &mut class_info.data;
 				ensure!(
 					data.properties.0.contains(ClassProperty::ClassPropertiesMutable),
 					Error::<T>::Immutable
diff --git a/modules/nft/src/mock.rs b/modules/nft/src/mock.rs
index 4a0c226889..20811099f7 100644
--- a/modules/nft/src/mock.rs
+++ b/modules/nft/src/mock.rs
@@ -32,8 +32,8 @@ use orml_traits::parameter_type_with_key;
 use primitives::{Amount, Balance, CurrencyId, ReserveIdentifier, TokenSymbol};
 use sp_core::{crypto::AccountId32, H160, H256};
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
 };
 use support::mocks::MockAddressMapping;
 
@@ -42,14 +42,13 @@ pub type AccountId = AccountId32;
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = BaseFilter;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
@@ -76,7 +75,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -214,23 +213,18 @@ impl orml_nft::Config for Runtime {
 
 use frame_system::Call as SystemCall;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		NFTModule: nft::{Pallet, Call, Event<T>},
-		OrmlNFT: orml_nft::{Pallet, Storage, Config<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>},
-		Utility: pallet_utility::{Pallet, Call, Event},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		Currency: module_currencies::{Pallet, Call, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		NFTModule: nft,
+		OrmlNFT: orml_nft,
+		Balances: pallet_balances,
+		Proxy: pallet_proxy,
+		Utility: pallet_utility,
+		Tokens: orml_tokens,
+		Currency: module_currencies,
 	}
 );
 
@@ -250,8 +244,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/nominees-election/Cargo.toml b/modules/nominees-election/Cargo.toml
index 1138cb0ead..fcd016d97b 100644
--- a/modules/nominees-election/Cargo.toml
+++ b/modules/nominees-election/Cargo.toml
@@ -6,19 +6,19 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", 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 }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
 [dev-dependencies]
-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-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-currencies = { path = "../../orml/currencies" }
 orml-tokens = { path = "../../orml/tokens" }
 
diff --git a/modules/nominees-election/src/lib.rs b/modules/nominees-election/src/lib.rs
index 216873764f..cce5731cc5 100644
--- a/modules/nominees-election/src/lib.rs
+++ b/modules/nominees-election/src/lib.rs
@@ -52,7 +52,7 @@ pub mod module {
 	#[pallet::config]
 	pub trait Config<I: 'static = ()>: frame_system::Config {
 		type RuntimeEvent: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-		type Currency: BasicLockableCurrency<Self::AccountId, Moment = Self::BlockNumber, Balance = Balance>;
+		type Currency: BasicLockableCurrency<Self::AccountId, Moment = BlockNumberFor<Self>, Balance = Balance>;
 		type NomineeId: Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + Ord;
 		#[pallet::constant]
 		type PalletId: Get<LockIdentifier>;
@@ -136,7 +136,7 @@ pub mod module {
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::hooks]
-	impl<T: Config<I>, I: 'static> Hooks<T::BlockNumber> for Pallet<T, I> {}
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
 
 	#[pallet::call]
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
diff --git a/modules/nominees-election/src/mock.rs b/modules/nominees-election/src/mock.rs
index 24fd99e4ac..e601279d13 100644
--- a/modules/nominees-election/src/mock.rs
+++ b/modules/nominees-election/src/mock.rs
@@ -30,7 +30,7 @@ use frame_support::{
 use orml_traits::parameter_type_with_key;
 use primitives::{Amount, CurrencyId, TokenSymbol};
 use sp_core::H256;
-use sp_runtime::{testing::Header, traits::IdentityLookup};
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
 
 pub type AccountId = u128;
 pub type BlockNumber = u64;
@@ -42,14 +42,13 @@ pub const LDOT: CurrencyId = CurrencyId::Token(TokenSymbol::LDOT);
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -101,7 +100,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -146,20 +145,15 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		NomineesElectionModule: nominees_election::{Pallet, Call, Storage, Event<T>},
-		TokensModule: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		PalletBalances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		OrmlCurrencies: orml_currencies::{Pallet, Call},
+	pub enum Runtime {
+		System: frame_system,
+		NomineesElectionModule: nominees_election,
+		TokensModule: orml_tokens,
+		PalletBalances: pallet_balances,
+		OrmlCurrencies: orml_currencies,
 	}
 );
 
@@ -177,8 +171,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		orml_tokens::GenesisConfig::<Runtime> {
diff --git a/modules/prices/Cargo.toml b/modules/prices/Cargo.toml
index 1a8676c2b6..6bd0708dd1 100644
--- a/modules/prices/Cargo.toml
+++ b/modules/prices/Cargo.toml
@@ -6,18 +6,18 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", 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 }
-sp-core = { 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 }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-tokens = { path = "../../orml/tokens" }
 
 [features]
diff --git a/modules/prices/src/lib.rs b/modules/prices/src/lib.rs
index 2b91bfaf0d..bb1d54b28d 100644
--- a/modules/prices/src/lib.rs
+++ b/modules/prices/src/lib.rs
@@ -92,10 +92,10 @@ pub mod module {
 		type Erc20InfoMapping: Erc20InfoMapping;
 
 		/// Get the lease block number of relaychain for specific Lease
-		type LiquidCrowdloanLeaseBlockNumber: GetByKey<Lease, Option<Self::BlockNumber>>;
+		type LiquidCrowdloanLeaseBlockNumber: GetByKey<Lease, Option<BlockNumberFor<Self>>>;
 
 		/// Block number provider for the relaychain.
-		type RelayChainBlockNumber: BlockNumberProvider<BlockNumber = Self::BlockNumber>;
+		type RelayChainBlockNumber: BlockNumberProvider<BlockNumber = BlockNumberFor<Self>>;
 
 		/// The staking reward rate per relaychain block for StakingCurrency.
 		/// In fact, the staking reward is not settled according to the block on relaychain.
@@ -141,7 +141,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
diff --git a/modules/prices/src/mock.rs b/modules/prices/src/mock.rs
index 305ba62fc4..f3443e345c 100644
--- a/modules/prices/src/mock.rs
+++ b/modules/prices/src/mock.rs
@@ -30,9 +30,8 @@ use orml_traits::{parameter_type_with_key, DataFeeder};
 use primitives::{currency::DexShare, Amount, TokenSymbol};
 use sp_core::{H160, H256};
 use sp_runtime::{
-	testing::Header,
 	traits::{IdentityLookup, One as OneT, Zero},
-	DispatchError, FixedPointNumber,
+	BuildStorage, DispatchError, FixedPointNumber,
 };
 use sp_std::cell::RefCell;
 use support::{mocks::MockErc20InfoMapping, ExchangeRate, SwapLimit};
@@ -59,14 +58,13 @@ mod prices {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -274,18 +272,13 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		PricesModule: prices::{Pallet, Storage, Call, Event<T>},
-		Tokens: orml_tokens::{Pallet, Call, Storage, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		PricesModule: prices,
+		Tokens: orml_tokens,
 	}
 );
 
@@ -299,8 +292,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		t.into()
diff --git a/modules/relaychain/Cargo.toml b/modules/relaychain/Cargo.toml
index 8c32509f22..ed264e3b34 100644
--- a/modules/relaychain/Cargo.toml
+++ b/modules/relaychain/Cargo.toml
@@ -6,18 +6,18 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", 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/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-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 module-support = { path = "../support", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
 
 [dev-dependencies]
-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" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/modules/session-manager/Cargo.toml b/modules/session-manager/Cargo.toml
index ccd66e4f65..893fab6cd7 100644
--- a/modules/session-manager/Cargo.toml
+++ b/modules/session-manager/Cargo.toml
@@ -7,16 +7,16 @@ edition = "2021"
 [dependencies]
 log = { version = "0.4.17", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", 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-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/modules/session-manager/src/lib.rs b/modules/session-manager/src/lib.rs
index 1edf22f2f4..0dc3157e1d 100644
--- a/modules/session-manager/src/lib.rs
+++ b/modules/session-manager/src/lib.rs
@@ -72,25 +72,25 @@ pub mod module {
 	pub enum Event<T: Config> {
 		/// Scheduled session duration.
 		ScheduledSessionDuration {
-			block_number: T::BlockNumber,
+			block_number: BlockNumberFor<T>,
 			session_index: SessionIndex,
-			session_duration: T::BlockNumber,
+			session_duration: BlockNumberFor<T>,
 		},
 	}
 
 	/// The current session duration.
 	///
-	/// SessionDuration: T::BlockNumber
+	/// SessionDuration: BlockNumberFor<T>
 	#[pallet::storage]
 	#[pallet::getter(fn session_duration)]
-	pub type SessionDuration<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+	pub type SessionDuration<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
 	/// The current session duration offset.
 	///
-	/// DurationOffset: T::BlockNumber
+	/// DurationOffset: BlockNumberFor<T>
 	#[pallet::storage]
 	#[pallet::getter(fn duration_offset)]
-	pub type DurationOffset<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+	pub type DurationOffset<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
 	/// Mapping from block number to new session index and duration.
 	///
@@ -98,24 +98,16 @@ pub mod module {
 	#[pallet::storage]
 	#[pallet::getter(fn session_duration_changes)]
 	pub type SessionDurationChanges<T: Config> =
-		StorageMap<_, Twox64Concat, T::BlockNumber, (SessionIndex, T::BlockNumber), ValueQuery>;
+		StorageMap<_, Twox64Concat, BlockNumberFor<T>, (SessionIndex, BlockNumberFor<T>), ValueQuery>;
 
 	#[pallet::genesis_config]
+	#[derive(frame_support::DefaultNoBound)]
 	pub struct GenesisConfig<T: Config> {
-		pub session_duration: T::BlockNumber,
-	}
-
-	#[cfg(feature = "std")]
-	impl<T: Config> Default for GenesisConfig<T> {
-		fn default() -> Self {
-			GenesisConfig {
-				session_duration: Default::default(),
-			}
-		}
+		pub session_duration: BlockNumberFor<T>,
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			assert!(!self.session_duration.is_zero(), "SessionDuration can't be zero");
 			SessionDuration::<T>::put(self.session_duration);
@@ -126,8 +118,8 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(n: BlockNumberFor<T>) -> Weight {
 			let mut skip = true;
 			SessionDurationChanges::<T>::mutate_exists(n, |maybe_changes| {
 				if let Some((_, duration)) = maybe_changes.take() {
@@ -156,7 +148,7 @@ pub mod module {
 		pub fn schedule_session_duration(
 			origin: OriginFor<T>,
 			#[pallet::compact] start_session: SessionIndex,
-			#[pallet::compact] duration: T::BlockNumber,
+			#[pallet::compact] duration: BlockNumberFor<T>,
 		) -> DispatchResult {
 			ensure_root(origin)?;
 
@@ -175,8 +167,8 @@ pub mod module {
 impl<T: Config> Pallet<T> {
 	pub fn do_schedule_session_duration(
 		start_session: SessionIndex,
-		duration: T::BlockNumber,
-	) -> Result<T::BlockNumber, DispatchError> {
+		duration: BlockNumberFor<T>,
+	) -> Result<BlockNumberFor<T>, DispatchError> {
 		let block_number = <frame_system::Pallet<T>>::block_number();
 		let current_session = T::ValidatorSet::session_index();
 
@@ -191,7 +183,7 @@ impl<T: Config> Pallet<T> {
 			.0
 			.ok_or(Error::<T>::EstimateNextSessionFailed)?;
 		let target_block_number =
-			Into::<T::BlockNumber>::into(start_session.saturating_sub(current_session).saturating_sub(1))
+			Into::<BlockNumberFor<T>>::into(start_session.saturating_sub(current_session).saturating_sub(1))
 				.saturating_mul(Self::session_duration())
 				.saturating_add(next_session);
 
@@ -201,8 +193,8 @@ impl<T: Config> Pallet<T> {
 	}
 }
 
-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 {
 		let offset = Self::duration_offset();
 		let period = Self::session_duration();
 
@@ -214,12 +206,12 @@ impl<T: Config> ShouldEndSession<T::BlockNumber> for Pallet<T> {
 	}
 }
 
-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> {
 		Self::session_duration()
 	}
 
-	fn estimate_current_session_progress(now: T::BlockNumber) -> (Option<Permill>, Weight) {
+	fn estimate_current_session_progress(now: BlockNumberFor<T>) -> (Option<Permill>, Weight) {
 		let offset = Self::duration_offset();
 		let period = Self::session_duration();
 
@@ -240,7 +232,7 @@ impl<T: Config> EstimateNextSessionRotation<T::BlockNumber> for Pallet<T> {
 		(progress, T::WeightInfo::estimate_next_session_rotation())
 	}
 
-	fn estimate_next_session_rotation(now: T::BlockNumber) -> (Option<T::BlockNumber>, Weight) {
+	fn estimate_next_session_rotation(now: BlockNumberFor<T>) -> (Option<BlockNumberFor<T>>, Weight) {
 		let offset = Self::duration_offset();
 		let period = Self::session_duration();
 
diff --git a/modules/session-manager/src/migrations.rs b/modules/session-manager/src/migrations.rs
index 142b8d588e..39447ff57e 100644
--- a/modules/session-manager/src/migrations.rs
+++ b/modules/session-manager/src/migrations.rs
@@ -18,6 +18,7 @@
 
 use crate::{Config, DurationOffset, SessionDuration, Weight};
 use frame_support::traits::Get;
+use frame_system::pallet_prelude::*;
 use sp_runtime::traits::Zero;
 
 pub mod v1 {
@@ -34,7 +35,7 @@ pub mod v1 {
 
 	pub fn post_migrate<T: Config>() -> Result<(), &'static str> {
 		assert!(
-			SessionDuration::<T>::get() == Into::<T::BlockNumber>::into(PERIOD),
+			SessionDuration::<T>::get() == Into::<BlockNumberFor<T>>::into(PERIOD),
 			"SessionDuration not set."
 		);
 		assert!(DurationOffset::<T>::get().is_zero(), "DurationOffset has been set.");
@@ -45,7 +46,7 @@ pub mod v1 {
 		log::info!(target: "session-manager", "Migrating session-manager v1");
 
 		if SessionDuration::<T>::get().is_zero() {
-			SessionDuration::<T>::put(Into::<T::BlockNumber>::into(PERIOD));
+			SessionDuration::<T>::put(Into::<BlockNumberFor<T>>::into(PERIOD));
 		}
 		log::info!(target: "session-manager", "Completed session-manager migration to v1");
 
diff --git a/modules/session-manager/src/mock.rs b/modules/session-manager/src/mock.rs
index d3c5fb4f93..9511ceb564 100644
--- a/modules/session-manager/src/mock.rs
+++ b/modules/session-manager/src/mock.rs
@@ -23,22 +23,20 @@
 use crate as session_manager;
 use frame_support::{
 	construct_runtime,
-	pallet_prelude::GenesisBuild,
 	traits::{ConstU32, ConstU64, Everything},
 };
-use sp_runtime::{testing::UintAuthorityId, traits::OpaqueKeys, RuntimeAppPublic};
+use sp_runtime::{testing::UintAuthorityId, traits::OpaqueKeys, BuildStorage, RuntimeAppPublic};
 
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -102,24 +100,19 @@ impl session_manager::Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Event<T>},
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
-		SessionManager: session_manager::{Pallet, Call, Event<T>, Config<T>, Storage},
+	pub enum Runtime {
+		System: frame_system,
+		Session: pallet_session,
+		SessionManager: session_manager,
 	}
 );
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	let mut t = frame_system::GenesisConfig::default()
-		.build_storage::<Runtime>()
+	let mut t = frame_system::GenesisConfig::<Runtime>::default()
+		.build_storage()
 		.unwrap();
 	session_manager::GenesisConfig::<Runtime> { session_duration: 10 }
 		.assimilate_storage(&mut t)
diff --git a/modules/support/Cargo.toml b/modules/support/Cargo.toml
index ab61780f6b..ebcb9c045c 100644
--- a/modules/support/Cargo.toml
+++ b/modules/support/Cargo.toml
@@ -7,16 +7,16 @@ edition = "2021"
 [dependencies]
 impl-trait-for-tuples = "0.2.2"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.145", optional = true }
 
-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-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-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
 
 orml-tokens = { path = "../../orml/tokens", default-features = false }
 nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" }
diff --git a/modules/transaction-pause/Cargo.toml b/modules/transaction-pause/Cargo.toml
index f60a5f6a58..d4a3e50d09 100644
--- a/modules/transaction-pause/Cargo.toml
+++ b/modules/transaction-pause/Cargo.toml
@@ -5,19 +5,19 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-hex-literal = "0.3.4"
+hex-literal = "0.4.1"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-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 }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 module-support = { path = "../support", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-tokens = { path = "../../orml/tokens" }
 orml-traits = { path = "../../orml/traits" }
 primitives = { package = "acala-primitives", path = "../../primitives" }
diff --git a/modules/transaction-pause/src/lib.rs b/modules/transaction-pause/src/lib.rs
index 5a8d29bb97..6dd9e8cd65 100644
--- a/modules/transaction-pause/src/lib.rs
+++ b/modules/transaction-pause/src/lib.rs
@@ -99,7 +99,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
diff --git a/modules/transaction-pause/src/mock.rs b/modules/transaction-pause/src/mock.rs
index 19147d3580..bc71214ef4 100644
--- a/modules/transaction-pause/src/mock.rs
+++ b/modules/transaction-pause/src/mock.rs
@@ -29,7 +29,7 @@ use frame_system::EnsureSignedBy;
 use orml_traits::parameter_type_with_key;
 use primitives::{Amount, Balance, CurrencyId, TokenSymbol};
 use sp_core::H256;
-use sp_runtime::{testing::Header, traits::IdentityLookup};
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
 
 pub type AccountId = u128;
 pub const ALICE: AccountId = 1;
@@ -41,14 +41,13 @@ mod transaction_pause {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -76,7 +75,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ();
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -112,19 +111,14 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		TransactionPause: transaction_pause::{Pallet, Storage, Call, Event<T>},
-		Balances: pallet_balances::{Pallet, Storage, Call, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Call, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		TransactionPause: transaction_pause,
+		Balances: pallet_balances,
+		Tokens: orml_tokens,
 	}
 );
 
@@ -138,8 +132,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		t.into()
diff --git a/modules/transaction-payment/Cargo.toml b/modules/transaction-payment/Cargo.toml
index dad277bc93..9f2f7429cc 100644
--- a/modules/transaction-payment/Cargo.toml
+++ b/modules/transaction-payment/Cargo.toml
@@ -6,23 +6,23 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", 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 }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 support = { package = "module-support", path = "../support", default-features = false }
 
 orml-traits = { path = "../../orml/traits", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 orml-tokens = { path = "../../orml/tokens" }
 module-currencies = { path = "../../modules/currencies" }
 module-dex = { path = "../dex" }
diff --git a/modules/transaction-payment/src/lib.rs b/modules/transaction-payment/src/lib.rs
index e340203855..765431856c 100644
--- a/modules/transaction-payment/src/lib.rs
+++ b/modules/transaction-payment/src/lib.rs
@@ -499,13 +499,13 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		/// `on_initialize` to return the weight used in `on_finalize`.
-		fn on_initialize(_: T::BlockNumber) -> Weight {
+		fn on_initialize(_: BlockNumberFor<T>) -> Weight {
 			<T as Config>::WeightInfo::on_finalize()
 		}
 
-		fn on_finalize(_: T::BlockNumber) {
+		fn on_finalize(_: BlockNumberFor<T>) {
 			NextFeeMultiplier::<T>::mutate(|fm| {
 				*fm = T::FeeMultiplierUpdate::convert(*fm);
 			});
diff --git a/modules/transaction-payment/src/mock.rs b/modules/transaction-payment/src/mock.rs
index dbabbbc7d0..5a62d0bcc5 100644
--- a/modules/transaction-payment/src/mock.rs
+++ b/modules/transaction-payment/src/mock.rs
@@ -34,9 +34,8 @@ use primitives::{Amount, ReserveIdentifier, TokenSymbol, TradingPair};
 use smallvec::smallvec;
 use sp_core::{crypto::AccountId32, H160, H256};
 use sp_runtime::{
-	testing::Header,
 	traits::{AccountIdConversion, IdentityLookup, One},
-	Perbill,
+	BuildStorage, Perbill,
 };
 use sp_std::cell::RefCell;
 use support::{
@@ -77,14 +76,13 @@ impl Get<frame_system::limits::BlockWeights> for BlockWeights {
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = BlockWeights;
@@ -136,7 +134,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -323,21 +321,16 @@ impl WeightToFeePolynomial for WeightToFee {
 	}
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		TransactionPayment: transaction_payment::{Pallet, Call, Storage, Event<T>},
-		PalletBalances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Tokens: orml_tokens::{Pallet, Storage, Event<T>, Config<T>},
-		Currencies: module_currencies::{Pallet, Call, Event<T>},
-		DEXModule: module_dex::{Pallet, Storage, Call, Event<T>, Config<T>},
+	pub enum Runtime {
+		System: frame_system,
+		TransactionPayment: transaction_payment,
+		PalletBalances: pallet_balances,
+		Tokens: orml_tokens,
+		Currencies: module_currencies,
+		DEXModule: module_dex,
 	}
 );
 
@@ -392,8 +385,8 @@ impl ExtBuilder {
 	}
 	pub fn build(self) -> sp_io::TestExternalities {
 		self.set_constants();
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		pallet_balances::GenesisConfig::<Runtime> {
diff --git a/modules/xcm-interface/Cargo.toml b/modules/xcm-interface/Cargo.toml
index ab5155f2b1..b649cda410 100644
--- a/modules/xcm-interface/Cargo.toml
+++ b/modules/xcm-interface/Cargo.toml
@@ -6,28 +6,28 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true}
-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-runtime = { 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-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false  }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true}
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false  }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false  }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 orml-traits = { path = "../../orml/traits", default-features = false }
 module-support = { path = "../../modules/support", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 module-currencies = { path = "../../modules/currencies" }
 orml-tokens = { path = "../../orml/tokens" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
 module-relaychain = { path = "../relaychain", features = ["polkadot"] }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/modules/xcm-interface/src/lib.rs b/modules/xcm-interface/src/lib.rs
index 36b2ace68e..f845b7a035 100644
--- a/modules/xcm-interface/src/lib.rs
+++ b/modules/xcm-interface/src/lib.rs
@@ -133,7 +133,7 @@ pub mod module {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
diff --git a/modules/xcm-interface/src/mock.rs b/modules/xcm-interface/src/mock.rs
index 6b41256d77..65ca9a00df 100644
--- a/modules/xcm-interface/src/mock.rs
+++ b/modules/xcm-interface/src/mock.rs
@@ -30,25 +30,23 @@ use frame_system::{EnsureRoot, EnsureSignedBy};
 use orml_traits::xcm_transfer::Transferred;
 use primitives::{CurrencyId, TokenSymbol};
 use sp_core::H256;
-use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
+use sp_runtime::{traits::IdentityLookup, AccountId32, BuildStorage};
 use xcm_builder::{EnsureXcmOrigin, FixedWeightBounds, SignedToAccountId32};
 
 pub type AccountId = AccountId32;
-pub type BlockNumber = u64;
 
 pub const ALICE: AccountId = AccountId32::new([1u8; 32]);
 pub const DOT: CurrencyId = CurrencyId::Token(TokenSymbol::DOT);
 
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
@@ -76,7 +74,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
-	type HoldIdentifier = ();
+	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
@@ -123,9 +121,11 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = ();
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = pallet_xcm::TestWeightInfo;
+	type AdminOrigin = EnsureRoot<AccountId>;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 	#[cfg(feature = "runtime-benchmarks")]
 	type ReachableDest = ReachableDest;
-	type AdminOrigin = EnsureRoot<AccountId>;
 }
 
 ord_parameter_types! {
@@ -235,19 +235,14 @@ impl Config for Runtime {
 	type AccountIdToMultiLocation = AccountIdToMultiLocation;
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Event<T>},
-		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin},
-		XcmInterface: xcm_interface::{Pallet, Storage, Call, Event<T>},
+	pub enum Runtime {
+		System: frame_system,
+		Balances: pallet_balances,
+		PolkadotXcm: pallet_xcm,
+		XcmInterface: xcm_interface,
 	}
 );
 
@@ -261,8 +256,8 @@ impl Default for ExtBuilder {
 
 impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
-		let t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		let mut ext = sp_io::TestExternalities::new(t);
diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml
index 90f3f9bc04..1caca774ab 100644
--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -9,31 +9,31 @@ log = "0.4.17"
 clap = { version = "4.2.4", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.4.0" }
 
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true }
-sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-telemetry = { 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", optional = true }
-try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true }
+sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true }
+try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true }
 
-cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-cli = { 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" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-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" }
+cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
 
 inspect = { package = "acala-inspect", path = "../../inspect" }
 service = { package = "acala-service", path = "../service", default-features = false, optional = true }
 
 [build-dependencies]
 orml-build-script-utils = { path = "../../orml/build-script-utils" }
-substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 [features]
 default = [ "cli" ]
diff --git a/node/cli/src/cli.rs b/node/cli/src/cli.rs
index 015b0667f5..eddd34a03e 100644
--- a/node/cli/src/cli.rs
+++ b/node/cli/src/cli.rs
@@ -136,18 +136,18 @@ pub struct RelayChainCli {
 }
 
 impl RelayChainCli {
-	/// Parse the relay chain CLI parameters using the parachain `Configuration`.
+	/// Parse the relay chain CLI parameters using the para chain `Configuration`.
 	pub fn new<'a>(
 		para_config: &sc_service::Configuration,
 		relay_chain_args: impl Iterator<Item = &'a String>,
 	) -> Self {
 		let extension = chain_spec::Extensions::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"));
+		let base_path = para_config.base_path.path().join("polkadot");
 		Self {
-			base_path,
+			base_path: Some(base_path),
 			chain_id,
-			base: polkadot_cli::RunCmd::parse_from(relay_chain_args),
+			base: clap::Parser::parse_from(relay_chain_args),
 		}
 	}
 }
diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs
index 06ad6939e7..8aba1c28a8 100644
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -25,11 +25,11 @@ use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
 use log::info;
 use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result,
-	RuntimeVersion, SharedParams, SubstrateCli,
+	SharedParams, SubstrateCli,
 };
+use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
 use sc_service::config::{BasePath, PrometheusConfig};
 use service::{chain_spec, new_partial, IdentifyVariant};
-use std::net::SocketAddr;
 
 fn chain_name() -> String {
 	"Acala".into()
@@ -121,25 +121,6 @@ impl SubstrateCli for Cli {
 			}
 		})
 	}
-
-	fn native_runtime_version(spec: &Box<dyn sc_service::ChainSpec>) -> &'static RuntimeVersion {
-		if spec.is_acala() {
-			#[cfg(feature = "with-acala-runtime")]
-			return &service::acala_runtime::VERSION;
-			#[cfg(not(feature = "with-acala-runtime"))]
-			panic!("{}", service::ACALA_RUNTIME_NOT_AVAILABLE);
-		} else if spec.is_karura() {
-			#[cfg(feature = "with-karura-runtime")]
-			return &service::karura_runtime::VERSION;
-			#[cfg(not(feature = "with-karura-runtime"))]
-			panic!("{}", service::KARURA_RUNTIME_NOT_AVAILABLE);
-		} else {
-			#[cfg(feature = "with-mandala-runtime")]
-			return &service::mandala_runtime::VERSION;
-			#[cfg(not(feature = "with-mandala-runtime"))]
-			panic!("{}", service::MANDALA_RUNTIME_NOT_AVAILABLE);
-		}
-	}
 }
 
 impl SubstrateCli for RelayChainCli {
@@ -176,10 +157,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)
-	}
 }
 
 fn set_default_ss58_version(spec: &Box<dyn service::ChainSpec>) {
@@ -274,7 +251,10 @@ pub fn run() -> sc_cli::Result<()> {
 									.into());
 							}
 
-							cmd.run::<Block, Executor>(config)
+							cmd.run::<Block, ExtendedHostFunctions<
+								sp_io::SubstrateHostFunctions,
+								<Executor as NativeExecutionDispatch>::ExtendHostFunctions,
+							>>(config)
 						}
 						BenchmarkCmd::Block(cmd) => {
 							let partials = new_partial::<RuntimeApi>(&config, true, false)?;
@@ -401,10 +381,9 @@ pub fn run() -> sc_cli::Result<()> {
 			let chain_spec = &runner.config().chain_spec;
 
 			with_runtime_or_err!(chain_spec, {
-				return 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)
+				return runner.sync_run(|config| {
+					let partials = new_partial::<RuntimeApi>(&config, false, false)?;
+					cmd.run::<service::Block>(&*config.chain_spec, &*partials.client)
 				});
 			})
 		}
@@ -419,7 +398,6 @@ pub fn run() -> sc_cli::Result<()> {
 
 		#[cfg(feature = "try-runtime")]
 		Some(Subcommand::TryRuntime(cmd)) => {
-			use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
 			let runner = cli.create_runner(cmd)?;
 			let chain_spec = &runner.config().chain_spec;
 			set_default_ss58_version(chain_spec);
@@ -504,14 +482,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
 	}
@@ -541,18 +511,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,
@@ -600,10 +558,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/e2e-tests/test-service/Cargo.toml b/node/e2e-tests/test-service/Cargo.toml
index 9f9721b3e5..a18591915b 100644
--- a/node/e2e-tests/test-service/Cargo.toml
+++ b/node/e2e-tests/test-service/Cargo.toml
@@ -8,76 +8,77 @@ edition = "2021"
 codec = { package = "parity-scale-codec", version = "3.4.0" }
 rand = "0.8.5"
 serde = { version = "1.0.145", features = ["derive"] }
-async-trait = "0.1.59"
+async-trait = "0.1.71"
 tokio = { version = "1.21.2", features = ["macros"] }
 criterion = { version = "0.3.6", features = [ "async_tokio" ] }
 jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
 log = "0.4.17"
 futures = { package = "futures", version = "0.3", features = ["compat"] }
-tempfile = "3.1.0"
-hex-literal = "0.3.4"
+tempfile = "3.7.0"
+hex-literal = "0.4.1"
 url = "2.3.1"
 rlp = "0.5.2"
 sha3 = "0.10"
 
 # Substrate dependencies
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-balances = { 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-client-api = { 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" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-consensus-aura = { 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" }
-sp-consensus-aura = { 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-common = { 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-rpc-server = { 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" }
-sp-arithmetic = { 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-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" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-keyring = { 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-state-machine = { 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-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 # Polkadot dependencies
-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" }
-polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
 
 # Cumulus dependencies
-cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-pov-recovery = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-service = { 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-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
+cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-pov-recovery = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
 
 runtime-common = { path = "../../../runtime/common" }
 node-runtime = { package = "mandala-runtime", path = "../../../runtime/mandala" }
@@ -98,5 +99,5 @@ orml-traits = { path = "../../../orml/traits" }
 portpicker = "0.1.1"
 
 # Substrate dependencies
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
diff --git a/node/e2e-tests/test-service/src/builder.rs b/node/e2e-tests/test-service/src/builder.rs
index fb184cc7da..2efee31e98 100644
--- a/node/e2e-tests/test-service/src/builder.rs
+++ b/node/e2e-tests/test-service/src/builder.rs
@@ -314,27 +314,16 @@ pub fn node_config(
 		state_pruning: Some(PruningMode::ArchiveAll),
 		blocks_pruning: BlocksPruning::KeepAll,
 		chain_spec: spec,
-		wasm_method: WasmExecutionMethod::Interpreted,
-		// NOTE: we enforce the use of the native runtime to make the errors more debuggable
-		execution_strategies: ExecutionStrategies {
-			syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
-			importing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
-			block_construction: sc_client_api::ExecutionStrategy::NativeWhenPossible,
-			offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible,
-			other: sc_client_api::ExecutionStrategy::NativeWhenPossible,
-		},
-		rpc_http: None,
-		rpc_ws: None,
-		rpc_ipc: None,
-		rpc_ws_max_connections: None,
+		wasm_method: Default::default(),
+		rpc_addr: None,
+		rpc_max_connections: Default::default(),
 		rpc_cors: None,
 		rpc_methods: Default::default(),
-		rpc_max_payload: None,
-		rpc_max_request_size: None,
-		rpc_max_response_size: None,
-		rpc_id_provider: None,
-		rpc_max_subs_per_conn: None,
-		ws_max_out_buffer_capacity: None,
+		rpc_max_request_size: Default::default(),
+		rpc_max_response_size: Default::default(),
+		rpc_id_provider: Default::default(),
+		rpc_max_subs_per_conn: Default::default(),
+		rpc_port: 9944,
 		prometheus_config: None,
 		telemetry_endpoints: None,
 		default_heap_pages: None,
@@ -349,9 +338,10 @@ pub fn node_config(
 		tracing_receiver: Default::default(),
 		max_runtime_instances: 8,
 		announce_block: true,
-		base_path: Some(base_path),
+		base_path,
 		informant_output_format: Default::default(),
 		wasm_runtime_overrides: None,
 		runtime_cache_size: 2,
+		data_path: root,
 	})
 }
diff --git a/node/e2e-tests/test-service/src/lib.rs b/node/e2e-tests/test-service/src/lib.rs
index bffbc3971e..90042b830f 100644
--- a/node/e2e-tests/test-service/src/lib.rs
+++ b/node/e2e-tests/test-service/src/lib.rs
@@ -37,7 +37,7 @@ use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, Slo
 use cumulus_client_consensus_common::{
 	ParachainBlockImport as TParachainBlockImport, ParachainCandidate, ParachainConsensus,
 };
-use cumulus_client_network::BlockAnnounceValidator;
+use cumulus_client_network::RequireSecondedInBlockAnnounce;
 use cumulus_client_service::{
 	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
 };
@@ -50,8 +50,8 @@ use crate::runtime::Weight;
 use frame_system_rpc_runtime_api::AccountNonceApi;
 use futures::{channel::mpsc::Sender, SinkExt};
 use jsonrpsee::RpcModule;
-use polkadot_primitives::v4::{CollatorPair, Hash as PHash, HeadData, PersistedValidationData};
-use sc_client_api::{execution_extensions::ExecutionStrategies, Backend, CallExecutor, ExecutorProvider};
+use polkadot_primitives::v5::{CollatorPair, Hash as PHash, HeadData, PersistedValidationData};
+use sc_client_api::{Backend, CallExecutor, ExecutorProvider};
 use sc_consensus::{ImportQueue, LongestChain};
 use sc_consensus_aura::{ImportQueueParams, StartAuraParams};
 use sc_consensus_manual_seal::{
@@ -64,7 +64,7 @@ pub use sc_rpc::SubscriptionTaskExecutor;
 use sc_service::{
 	config::{
 		BlocksPruning, DatabaseSource, KeystoreConfig, MultiaddrWithPeerId, NetworkConfiguration, OffchainWorkerConfig,
-		PruningMode, WasmExecutionMethod,
+		PruningMode,
 	},
 	BasePath, ChainSpec, Configuration, Error as ServiceError, PartialComponents, Role, RpcHandlers, SpawnTasksParams,
 	TFullBackend, TFullCallExecutor, TFullClient, TaskManager,
@@ -74,7 +74,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_api::{OverlayedChanges, StorageTransactionCache};
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
-use sp_core::{ExecutionContext, Pair, H256};
+use sp_core::{Pair, H256};
 use sp_keyring::Sr25519Keyring;
 use sp_runtime::{
 	codec::Encode,
@@ -240,7 +240,7 @@ pub fn run_relay_chain_validator_node(
 	let mut config = polkadot_test_service::node_config(storage_update_func, tokio_handle, key, boot_nodes, true);
 
 	if let Some(port) = websocket_port {
-		config.rpc_ws = Some(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), port));
+		config.rpc_addr = Some(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), port));
 	}
 
 	polkadot_test_service::run_validator_node(
diff --git a/node/e2e-tests/test-service/src/node.rs b/node/e2e-tests/test-service/src/node.rs
index bac688c5ea..25248cbdff 100644
--- a/node/e2e-tests/test-service/src/node.rs
+++ b/node/e2e-tests/test-service/src/node.rs
@@ -129,10 +129,7 @@ impl TestNode {
 		let number = self.client.info().best_number.saturated_into();
 		let mut overlay = OverlayedChanges::default();
 		let mut cache = StorageTransactionCache::<Block, <TFullBackend<Block> as Backend<Block>>::State>::default();
-		let mut extensions =
-			self.client
-				.execution_extensions()
-				.extensions(hash, number, ExecutionContext::BlockConstruction);
+		let mut extensions = self.client.execution_extensions().extensions(hash, number);
 		let state_backend = self
 			.backend
 			.state_at(hash)
diff --git a/node/e2e-tests/test-service/src/service.rs b/node/e2e-tests/test-service/src/service.rs
index 147cba1066..3eba417fb1 100644
--- a/node/e2e-tests/test-service/src/service.rs
+++ b/node/e2e-tests/test-service/src/service.rs
@@ -22,6 +22,7 @@
 use super::*;
 use cumulus_primitives_parachain_inherent::{MockValidationDataInherentDataProvider, MockXcmConfig};
 use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY};
+use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 
 /// Starts a `ServiceBuilder` for a full service.
 ///
@@ -206,9 +207,12 @@ pub async fn start_dev_node(
 		other: block_import,
 	} = new_partial(&config, SealMode::DevInstantSeal)?;
 
+	let net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
+
 	let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
+			net_config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
 			spawn_handle: task_manager.spawn_handle(),
@@ -219,7 +223,24 @@ pub async fn start_dev_node(
 
 	// offchain workers
 	if config.offchain_worker.enabled {
-		sc_service::build_offchain_workers(&config, task_manager.spawn_handle(), client.clone(), network.clone());
+		use futures::FutureExt;
+
+		task_manager.spawn_handle().spawn(
+			"offchain-workers-runner",
+			"offchain-work",
+			sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
+				runtime_api_provider: client.clone(),
+				keystore: None,
+				offchain_db: backend.offchain_storage(),
+				transaction_pool: Some(OffchainTransactionPoolFactory::new(transaction_pool.clone())),
+				network_provider: network.clone(),
+				is_validator: config.role.is_authority(),
+				enable_http_requests: false,
+				custom_extensions: move |_| vec![],
+			})
+			.run(client.clone(), task_manager.spawn_handle())
+			.boxed(),
+		);
 	}
 
 	let force_authoring = config.force_authoring;
@@ -454,6 +475,8 @@ where
 {
 	let parachain_config = prepare_node_config(parachain_config);
 
+	let net_config = sc_network::config::FullNetworkConfiguration::new(&parachain_config.network);
+
 	let params = new_partial(&parachain_config, seal_mode)?;
 	let keystore = params.keystore_container.keystore();
 	let force_authoring = parachain_config.force_authoring;
@@ -476,7 +499,7 @@ where
 	.await
 	.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;
 
-	let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), para_id);
+	let block_announce_validator = RequireSecondedInBlockAnnounce::new(relay_chain_interface.clone(), para_id);
 	let block_announce_validator_builder = move |_| Box::new(block_announce_validator) as Box<_>;
 
 	let prometheus_registry = parachain_config.prometheus_registry().cloned();
@@ -485,6 +508,7 @@ where
 	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: transaction_pool.clone(),
 			spawn_handle: task_manager.spawn_handle(),
@@ -494,11 +518,23 @@ where
 		})?;
 
 	if parachain_config.offchain_worker.enabled {
-		sc_service::build_offchain_workers(
-			&parachain_config,
-			task_manager.spawn_handle(),
-			client.clone(),
-			network.clone(),
+		use futures::FutureExt;
+
+		task_manager.spawn_handle().spawn(
+			"offchain-workers-runner",
+			"offchain-work",
+			sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
+				runtime_api_provider: client.clone(),
+				keystore: Some(params.keystore_container.keystore()),
+				offchain_db: backend.offchain_storage(),
+				transaction_pool: Some(OffchainTransactionPoolFactory::new(transaction_pool.clone())),
+				network_provider: network.clone(),
+				is_validator: parachain_config.role.is_authority(),
+				enable_http_requests: false,
+				custom_extensions: move |_| vec![],
+			})
+			.run(client.clone(), task_manager.spawn_handle())
+			.boxed(),
 		);
 	}
 
diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
index 54a5f68f06..b73b13e69d 100644
--- a/node/service/Cargo.toml
+++ b/node/service/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 
 [dependencies]
 log = "0.4.17"
-async-trait = { version = "0.1.59" }
-hex-literal = "0.3.4"
+async-trait = { version = "0.1.71" }
+hex-literal = "0.4.1"
 serde = { version = "1.0.143", features = ["derive"] }
 serde_json = "1.0.81"
 codec = { package = "parity-scale-codec", version = "3.4.0" }
@@ -20,65 +20,66 @@ coins-bip39 = "0.7.0"
 k256 = { version = "0.11.5", default-features = false, features = ["keccak256", "ecdsa", "std"] }
 tiny-keccak = { version = "2.0", features = ["keccak"] }
 
-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-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-consensus-grandpa = { 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-consensus-slots = { 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-common = { 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-offchain = { 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-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" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-consensus = { 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" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-transaction-payment-rpc-runtime-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-offchain = { 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-storage = { 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-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-trie = { 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-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
-cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-client-consensus-relay-chain = { 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-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
+cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
 
-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" }
+polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
 
 orml-oracle-rpc = { path = "../../orml/oracle/rpc" }
 orml-tokens-rpc = { path = "../../orml/tokens/rpc" }
diff --git a/node/service/src/chain_spec/acala.rs b/node/service/src/chain_spec/acala.rs
index 086c1c4f8e..36afaadcf7 100644
--- a/node/service/src/chain_spec/acala.rs
+++ b/node/service/src/chain_spec/acala.rs
@@ -34,7 +34,7 @@ use acala_runtime::{
 };
 use runtime_common::TokenInfo;
 
-pub type ChainSpec = sc_service::GenericChainSpec<acala_runtime::GenesisConfig, Extensions>;
+pub type ChainSpec = sc_service::GenericChainSpec<acala_runtime::RuntimeGenesisConfig, Extensions>;
 
 pub const PARA_ID: u32 = 2000;
 
@@ -142,9 +142,10 @@ fn acala_dev_genesis(
 	initial_allocation: Vec<(AccountId, Balance)>,
 	vesting_list: Vec<(AccountId, BlockNumber, BlockNumber, u32, Balance)>,
 	general_councils: Vec<AccountId>,
-) -> acala_runtime::GenesisConfig {
-	acala_runtime::GenesisConfig {
+) -> acala_runtime::RuntimeGenesisConfig {
+	acala_runtime::RuntimeGenesisConfig {
 		system: SystemConfig {
+			_config: Default::default(),
 			// Add Wasm runtime to storage.
 			code: wasm_binary.to_vec(),
 		},
@@ -181,9 +182,11 @@ fn acala_dev_genesis(
 		tokens: TokensConfig { balances: vec![] },
 		vesting: VestingConfig { vesting: vesting_list },
 		cdp_treasury: CdpTreasuryConfig {
+			_phantom: Default::default(),
 			expected_collateral_auction_size: vec![],
 		},
 		cdp_engine: CdpEngineConfig {
+			_phantom: Default::default(),
 			collaterals_params: vec![],
 		},
 		asset_registry: Default::default(),
@@ -197,6 +200,7 @@ fn acala_dev_genesis(
 			initial_added_liquidity_pools: vec![],
 		},
 		parachain_info: ParachainInfoConfig {
+			_config: Default::default(),
 			parachain_id: PARA_ID.into(),
 		},
 		orml_nft: OrmlNFTConfig { tokens: vec![] },
@@ -227,6 +231,7 @@ fn acala_dev_genesis(
 		aura_ext: Default::default(),
 		parachain_system: Default::default(),
 		polkadot_xcm: PolkadotXcmConfig {
+			_config: Default::default(),
 			safe_xcm_version: Some(2),
 		},
 	}
diff --git a/node/service/src/chain_spec/karura.rs b/node/service/src/chain_spec/karura.rs
index 8b16992d77..8322542664 100644
--- a/node/service/src/chain_spec/karura.rs
+++ b/node/service/src/chain_spec/karura.rs
@@ -34,7 +34,7 @@ use karura_runtime::{
 };
 use runtime_common::TokenInfo;
 
-pub type ChainSpec = sc_service::GenericChainSpec<karura_runtime::GenesisConfig, Extensions>;
+pub type ChainSpec = sc_service::GenericChainSpec<karura_runtime::RuntimeGenesisConfig, Extensions>;
 
 pub const PARA_ID: u32 = 2000;
 
@@ -142,9 +142,10 @@ fn karura_dev_genesis(
 	initial_allocation: Vec<(AccountId, Balance)>,
 	vesting_list: Vec<(AccountId, BlockNumber, BlockNumber, u32, Balance)>,
 	general_councils: Vec<AccountId>,
-) -> karura_runtime::GenesisConfig {
-	karura_runtime::GenesisConfig {
+) -> karura_runtime::RuntimeGenesisConfig {
+	karura_runtime::RuntimeGenesisConfig {
 		system: SystemConfig {
+			_config: Default::default(),
 			// Add Wasm runtime to storage.
 			code: wasm_binary.to_vec(),
 		},
@@ -181,9 +182,11 @@ fn karura_dev_genesis(
 		tokens: TokensConfig { balances: vec![] },
 		vesting: VestingConfig { vesting: vesting_list },
 		cdp_treasury: CdpTreasuryConfig {
+			_phantom: Default::default(),
 			expected_collateral_auction_size: vec![],
 		},
 		cdp_engine: CdpEngineConfig {
+			_phantom: Default::default(),
 			collaterals_params: vec![],
 		},
 		asset_registry: Default::default(),
@@ -197,6 +200,7 @@ fn karura_dev_genesis(
 			initial_added_liquidity_pools: vec![],
 		},
 		parachain_info: ParachainInfoConfig {
+			_config: Default::default(),
 			parachain_id: PARA_ID.into(),
 		},
 		orml_nft: OrmlNFTConfig { tokens: vec![] },
@@ -227,6 +231,7 @@ fn karura_dev_genesis(
 		aura_ext: Default::default(),
 		parachain_system: Default::default(),
 		polkadot_xcm: PolkadotXcmConfig {
+			_config: Default::default(),
 			safe_xcm_version: Some(2),
 		},
 	}
diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs
index 8f8d843795..65b2303602 100644
--- a/node/service/src/chain_spec/mandala.rs
+++ b/node/service/src/chain_spec/mandala.rs
@@ -45,7 +45,7 @@ use tiny_keccak::{Hasher, Keccak};
 
 use crate::chain_spec::{get_account_id_from_seed, get_authority_keys_from_seed, Extensions, TELEMETRY_URL};
 
-pub type ChainSpec = sc_service::GenericChainSpec<mandala_runtime::GenesisConfig, Extensions>;
+pub type ChainSpec = sc_service::GenericChainSpec<mandala_runtime::RuntimeGenesisConfig, Extensions>;
 
 pub const PARA_ID: u32 = 2000;
 
@@ -310,7 +310,7 @@ fn testnet_genesis(
 	root_key: AccountId,
 	endowed_accounts: Vec<AccountId>,
 	evm_accounts: Vec<H160>,
-) -> mandala_runtime::GenesisConfig {
+) -> mandala_runtime::RuntimeGenesisConfig {
 	let existential_deposit = NativeTokenExistentialDeposit::get();
 
 	let initial_balance: u128 = 10_000_000 * dollar(ACA);
@@ -344,8 +344,9 @@ fn testnet_genesis(
 
 	let member = vec![root_key.clone()];
 
-	mandala_runtime::GenesisConfig {
+	mandala_runtime::RuntimeGenesisConfig {
 		system: SystemConfig {
+			_config: Default::default(),
 			// Add Wasm runtime to storage.
 			code: wasm_binary.to_vec(),
 		},
@@ -391,11 +392,13 @@ fn testnet_genesis(
 		},
 		vesting: VestingConfig { vesting: vec![] },
 		cdp_treasury: CdpTreasuryConfig {
+			_phantom: Default::default(),
 			expected_collateral_auction_size: vec![
 				(DOT, dollar(DOT)), // (currency_id, max size of a collateral auction)
 			],
 		},
 		cdp_engine: CdpEngineConfig {
+			_phantom: Default::default(),
 			collaterals_params: vec![
 				(
 					DOT,
@@ -451,6 +454,7 @@ fn testnet_genesis(
 			)],
 		},
 		parachain_info: ParachainInfoConfig {
+			_config: Default::default(),
 			parachain_id: PARA_ID.into(),
 		},
 		orml_nft: OrmlNFTConfig { tokens: vec![] },
@@ -481,6 +485,7 @@ fn testnet_genesis(
 		aura_ext: Default::default(),
 		parachain_system: Default::default(),
 		polkadot_xcm: PolkadotXcmConfig {
+			_config: Default::default(),
 			safe_xcm_version: Some(2),
 		},
 		phragmen_election: Default::default(),
@@ -492,7 +497,7 @@ fn mandala_genesis(
 	initial_authorities: Vec<(AccountId, AccountId, GrandpaId, AuraId)>,
 	root_key: AccountId,
 	endowed_accounts: Vec<AccountId>,
-) -> mandala_runtime::GenesisConfig {
+) -> mandala_runtime::RuntimeGenesisConfig {
 	let existential_deposit = NativeTokenExistentialDeposit::get();
 
 	let initial_balance: u128 = 1_000_000 * dollar(ACA);
@@ -526,8 +531,9 @@ fn mandala_genesis(
 
 	let member = vec![root_key.clone()];
 
-	mandala_runtime::GenesisConfig {
+	mandala_runtime::RuntimeGenesisConfig {
 		system: SystemConfig {
+			_config: Default::default(),
 			// Add Wasm runtime to storage.
 			code: wasm_binary.to_vec(),
 		},
@@ -567,11 +573,13 @@ fn mandala_genesis(
 		},
 		vesting: VestingConfig { vesting: vec![] },
 		cdp_treasury: CdpTreasuryConfig {
+			_phantom: Default::default(),
 			expected_collateral_auction_size: vec![
 				(DOT, dollar(DOT)), // (currency_id, max size of a collateral auction)
 			],
 		},
 		cdp_engine: CdpEngineConfig {
+			_phantom: Default::default(),
 			collaterals_params: vec![
 				(
 					DOT,
@@ -609,6 +617,7 @@ fn mandala_genesis(
 			initial_added_liquidity_pools: vec![],
 		},
 		parachain_info: ParachainInfoConfig {
+			_config: Default::default(),
 			parachain_id: PARA_ID.into(),
 		},
 		orml_nft: OrmlNFTConfig { tokens: vec![] },
@@ -639,6 +648,7 @@ fn mandala_genesis(
 		aura_ext: Default::default(),
 		parachain_system: Default::default(),
 		polkadot_xcm: PolkadotXcmConfig {
+			_config: Default::default(),
 			safe_xcm_version: Some(2),
 		},
 		phragmen_election: Default::default(),
diff --git a/node/service/src/chain_spec/mod.rs b/node/service/src/chain_spec/mod.rs
index 75c8077d83..06e1614fd5 100644
--- a/node/service/src/chain_spec/mod.rs
+++ b/node/service/src/chain_spec/mod.rs
@@ -51,7 +51,7 @@ pub struct Extensions {
 	pub para_id: u32,
 	/// Known bad block hashes.
 	#[serde(default)]
-	pub bad_blocks: sc_client_api::BadBlocks<polkadot_primitives::v4::Block>,
+	pub bad_blocks: sc_client_api::BadBlocks<polkadot_primitives::v5::Block>,
 }
 
 impl Extensions {
diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs
index 54a0033576..8f1ddc69a5 100644
--- a/node/service/src/lib.rs
+++ b/node/service/src/lib.rs
@@ -21,11 +21,11 @@
 
 //! Acala service. Specialized wrapper over substrate service.
 
-use acala_primitives::{Block, Hash};
+pub use acala_primitives::{Block, Hash};
 use cumulus_client_cli::CollatorOptions;
 use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion};
 use cumulus_client_consensus_common::{ParachainBlockImport as TParachainBlockImport, ParachainConsensus};
-use cumulus_client_network::BlockAnnounceValidator;
+use cumulus_client_network::RequireSecondedInBlockAnnounce;
 use cumulus_client_service::{
 	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
 };
@@ -37,6 +37,7 @@ use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node;
 use futures::{channel::oneshot, FutureExt, StreamExt};
 use jsonrpsee::RpcModule;
 use polkadot_primitives::{CollatorPair, OccupiedCoreAssumption};
+use sc_client_api::Backend;
 use sc_consensus::{ImportQueue, LongestChain};
 use sc_consensus_aura::{ImportQueueParams, StartAuraParams};
 use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY};
@@ -50,6 +51,7 @@ use sc_service::{
 	error::Error as ServiceError, Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager,
 };
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
+use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 pub use sp_api::ConstructRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_consensus_aura::sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair};
@@ -417,6 +419,7 @@ where
 
 	let params = new_partial(&parachain_config, false, false)?;
 	let (block_import, mut telemetry, telemetry_worker_handle) = params.other;
+	let net_config = sc_network::config::FullNetworkConfiguration::new(&parachain_config.network);
 
 	let client = params.client.clone();
 	let backend = params.backend.clone();
@@ -434,7 +437,7 @@ where
 
 	let spawn_handle = task_manager.spawn_handle();
 
-	let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), para_id);
+	let block_announce_validator = RequireSecondedInBlockAnnounce::new(relay_chain_interface.clone(), para_id);
 
 	let warp_sync_params = match parachain_config.network.sync_mode {
 		SyncMode::Warp => {
@@ -452,6 +455,7 @@ where
 	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: transaction_pool.clone(),
 			spawn_handle,
@@ -477,11 +481,23 @@ where
 	};
 
 	if parachain_config.offchain_worker.enabled {
-		sc_service::build_offchain_workers(
-			&parachain_config,
-			task_manager.spawn_handle(),
-			client.clone(),
-			network.clone(),
+		use futures::FutureExt;
+
+		task_manager.spawn_handle().spawn(
+			"offchain-workers-runner",
+			"offchain-work",
+			sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
+				runtime_api_provider: client.clone(),
+				keystore: Some(params.keystore_container.keystore()),
+				offchain_db: backend.offchain_storage(),
+				transaction_pool: Some(OffchainTransactionPoolFactory::new(transaction_pool.clone())),
+				network_provider: network.clone(),
+				is_validator: parachain_config.role.is_authority(),
+				enable_http_requests: false,
+				custom_extensions: move |_| vec![],
+			})
+			.run(client.clone(), task_manager.spawn_handle())
+			.boxed(),
 		);
 	};
 
@@ -665,7 +681,7 @@ pub const ACALA_RUNTIME_NOT_AVAILABLE: &str =
 
 /// Builds a new object suitable for chain operations.
 pub fn new_chain_ops(
-	mut config: &mut Configuration,
+	config: &mut Configuration,
 ) -> Result<
 	(
 		Arc<Client>,
@@ -738,9 +754,12 @@ where
 		other: (_, _, _),
 	} = new_partial::<RuntimeApi>(&config, true, instant_sealing)?;
 
+	let net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
+
 	let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
+			net_config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
 			spawn_handle: task_manager.spawn_handle(),
@@ -750,24 +769,21 @@ where
 		})?;
 
 	if config.offchain_worker.enabled {
-		let offchain_workers = Arc::new(sc_offchain::OffchainWorkers::new_with_options(
-			client.clone(),
-			sc_offchain::OffchainWorkerOptions {
-				enable_http_requests: false,
-			},
-		));
-
-		// Start the offchain workers to have
 		task_manager.spawn_handle().spawn(
-			"offchain-notifications",
-			None,
-			sc_offchain::notification_future(
-				config.role.is_authority(),
-				client.clone(),
-				offchain_workers,
-				task_manager.spawn_handle(),
-				network.clone(),
-			),
+			"offchain-workers-runner",
+			"offchain-work",
+			sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
+				runtime_api_provider: client.clone(),
+				keystore: None,
+				offchain_db: backend.offchain_storage(),
+				transaction_pool: Some(OffchainTransactionPoolFactory::new(transaction_pool.clone())),
+				network_provider: network.clone(),
+				is_validator: config.role.is_authority(),
+				enable_http_requests: false,
+				custom_extensions: move |_| vec![],
+			})
+			.run(client.clone(), task_manager.spawn_handle())
+			.boxed(),
 		);
 	}
 
diff --git a/orml b/orml
index ca05423f4f..22ae492498 160000
--- a/orml
+++ b/orml
@@ -1 +1 @@
-Subproject commit ca05423f4f32be1d30765caacdc7d90130f5554a
+Subproject commit 22ae49249854b058043665f6642ac4ecad5b78da
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index e3af53b4fb..eaf7272177 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -5,22 +5,22 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-hex-literal = "0.3.4"
+hex-literal = "0.4.1"
 bstringify = "0.1.2"
-serde = { version = "1.0.145", optional = true }
+serde = { version = "1.0.145", default-features = false, features = ["alloc", "derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
 num_enum = { version = "0.5.1", default-features = false }
 scale-info = { version = "2.1", default-features = false, features = ["derive"] }
-enumflags2 = { version = "0.6.3" }
+enumflags2 = { version = "0.7.7", features = ["serde"] }
 paste = "1.0"
 
-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-io = { 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-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 orml-traits = { path = "../orml/traits", default-features = false }
 
@@ -35,7 +35,7 @@ serde_json = { version = "1.0.85" }
 [features]
 default = ["std"]
 std = [
-	"serde",
+	"serde/std",
 	"codec/std",
 	"num_enum/std",
 	"scale-info/std",
diff --git a/primitives/src/currency.rs b/primitives/src/currency.rs
index 6acfab2092..0a6cdaaabb 100644
--- a/primitives/src/currency.rs
+++ b/primitives/src/currency.rs
@@ -27,7 +27,6 @@ use scale_info::TypeInfo;
 use sp_runtime::RuntimeDebug;
 use sp_std::prelude::*;
 
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
 macro_rules! create_currency_id {
@@ -403,8 +402,7 @@ create_currency_id! {
 	// 128 - 147: Karura & Kusama native tokens
 	// 148 - 167: Reserved for future usage
 	// 168 - 255: Kusama parachain tokens
-	#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)]
-	#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+	#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, MaxEncodedLen, Serialize, Deserialize)]
 	#[repr(u8)]
 	pub enum TokenSymbol {
 		// 0 - 19: Acala & Polkadot native tokens
@@ -442,9 +440,22 @@ pub type ForeignAssetId = u16;
 pub type Erc20Id = u32;
 pub type Lease = BlockNumber;
 
-#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+#[derive(
+	Encode,
+	Decode,
+	Eq,
+	PartialEq,
+	Copy,
+	Clone,
+	RuntimeDebug,
+	PartialOrd,
+	Ord,
+	TypeInfo,
+	MaxEncodedLen,
+	Serialize,
+	Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 pub enum DexShare {
 	Token(TokenSymbol),
 	Erc20(EvmAddress),
@@ -453,9 +464,22 @@ pub enum DexShare {
 	StableAssetPoolToken(StableAssetPoolId),
 }
 
-#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+#[derive(
+	Encode,
+	Decode,
+	Eq,
+	PartialEq,
+	Copy,
+	Clone,
+	RuntimeDebug,
+	PartialOrd,
+	Ord,
+	TypeInfo,
+	MaxEncodedLen,
+	Serialize,
+	Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 pub enum CurrencyId {
 	Token(TokenSymbol),
 	DexShare(DexShare, DexShare),
diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
index 7dcbcfc711..125f574012 100644
--- a/primitives/src/lib.rs
+++ b/primitives/src/lib.rs
@@ -32,6 +32,7 @@ pub use testing::*;
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
 use sp_core::U256;
 use sp_runtime::{
 	generic,
@@ -43,9 +44,6 @@ use sp_std::prelude::*;
 pub use currency::{CurrencyId, DexShare, Lease, TokenSymbol};
 pub use evm::{convert_decimals_from_evm, convert_decimals_to_evm};
 
-#[cfg(feature = "std")]
-use serde::{Deserialize, Serialize};
-
 #[cfg(test)]
 mod tests;
 
@@ -111,8 +109,9 @@ pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;
 /// Fee multiplier.
 pub type Multiplier = FixedU128;
 
-#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(
+	Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, Serialize, Deserialize,
+)]
 pub enum AuthoritysOriginId {
 	Root,
 	Treasury,
@@ -121,15 +120,17 @@ pub enum AuthoritysOriginId {
 	TreasuryReserve,
 }
 
-#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(
+	Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, Serialize, Deserialize,
+)]
 pub enum DataProviderId {
 	Aggregated = 0,
 	Acala = 1,
 }
 
-#[derive(Encode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(
+	Encode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, MaxEncodedLen, Serialize, Deserialize,
+)]
 pub struct TradingPair(CurrencyId, CurrencyId);
 
 impl TradingPair {
diff --git a/primitives/src/nft.rs b/primitives/src/nft.rs
index bfb176fc2e..9ea37dfa8e 100644
--- a/primitives/src/nft.rs
+++ b/primitives/src/nft.rs
@@ -18,20 +18,20 @@
 
 use codec::{Decode, Encode};
 use scale_info::{build::Fields, meta_type, Path, Type, TypeInfo, TypeParameter};
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
 use frame_support::RuntimeDebug;
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 
-use enumflags2::BitFlags;
+use enumflags2::{bitflags, BitFlags};
 
 pub type NFTBalance = u128;
 pub type CID = Vec<u8>;
 pub type Attributes = BTreeMap<Vec<u8>, Vec<u8>>;
 
+#[bitflags]
 #[repr(u8)]
-#[derive(Encode, Decode, Clone, Copy, BitFlags, RuntimeDebug, PartialEq, Eq, TypeInfo)]
+#[derive(Encode, Decode, Clone, Copy, RuntimeDebug, PartialEq, Eq, TypeInfo)]
 pub enum ClassProperty {
 	/// Is token transferable
 	Transferable = 0b00000001,
@@ -43,8 +43,7 @@ pub enum ClassProperty {
 	ClassPropertiesMutable = 0b00001000,
 }
 
-#[derive(Clone, Copy, PartialEq, Default, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Clone, Copy, PartialEq, Default, RuntimeDebug, Serialize, Deserialize)]
 pub struct Properties(pub BitFlags<ClassProperty>);
 
 impl Eq for Properties {}
diff --git a/primitives/src/unchecked_extrinsic.rs b/primitives/src/unchecked_extrinsic.rs
index b56f78fbb4..bc89cb56a1 100644
--- a/primitives/src/unchecked_extrinsic.rs
+++ b/primitives/src/unchecked_extrinsic.rs
@@ -34,6 +34,8 @@ use sp_runtime::{
 	transaction_validity::{InvalidTransaction, TransactionValidityError},
 	AccountId32, RuntimeDebug,
 };
+#[cfg(not(feature = "std"))]
+use sp_std::alloc::format;
 use sp_std::{marker::PhantomData, prelude::*};
 
 #[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
@@ -50,7 +52,7 @@ pub struct AcalaUncheckedExtrinsic<
 	PhantomData<(ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx)>,
 );
 
-impl<Call, Extra: SignedExtension, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx> Extrinsic
+impl<Call: TypeInfo, Extra: SignedExtension, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx> Extrinsic
 	for AcalaUncheckedExtrinsic<Call, Extra, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx>
 {
 	type Call = Call;
@@ -80,8 +82,8 @@ impl<Call, Extra: SignedExtension, ConvertEthTx, StorageDepositPerByte, TxFeePer
 	type SignedExtensions = Extra;
 }
 
-impl<Call, Extra: SignedExtension, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx> ExtrinsicCall
-	for AcalaUncheckedExtrinsic<Call, Extra, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx>
+impl<Call: TypeInfo, Extra: SignedExtension, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx>
+	ExtrinsicCall for AcalaUncheckedExtrinsic<Call, Extra, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx>
 {
 	fn call(&self) -> &Self::Call {
 		self.0.call()
@@ -249,7 +251,6 @@ where
 	}
 }
 
-#[cfg(feature = "std")]
 impl<Call: Encode, Extra: SignedExtension, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx>
 	serde::Serialize
 	for AcalaUncheckedExtrinsic<Call, Extra, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx>
@@ -262,7 +263,6 @@ impl<Call: Encode, Extra: SignedExtension, ConvertEthTx, StorageDepositPerByte,
 	}
 }
 
-#[cfg(feature = "std")]
 impl<'a, Call: Decode, Extra: SignedExtension, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx>
 	serde::Deserialize<'a>
 	for AcalaUncheckedExtrinsic<Call, Extra, ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx>
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 731bdd7f5f..4657c3cc3f 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -9,16 +9,16 @@ futures = "0.3.28"
 jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
 codec = { package = "parity-scale-codec", version = "3.4.0" }
 primitives = { package = "acala-primitives", path = "../primitives" }
-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-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-runtime = { 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" }
-sc-client-api = { 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-rpc-api = { 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" }
-pallet-transaction-payment-rpc = { 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" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 runtime-common = { path = "../runtime/common" }
diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml
index c560635fc2..e58d91084c 100644
--- a/runtime/acala/Cargo.toml
+++ b/runtime/acala/Cargo.toml
@@ -8,68 +8,68 @@ build = "build.rs"
 [dependencies]
 smallvec = "1.4.0"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.85", default-features = false, features = ["alloc"] }
 hex = { version = "0.4", default-features = false }
-hex-literal = { version = "0.3.1" }
+hex-literal = { version = "0.4.1" }
 
 # substrate
-frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", 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 }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-pallet-aura = { 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-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features =false }
-pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-scheduler = { 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, features = ["historical"] }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-preimage = { 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-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-consensus-aura = { 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-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-offchain = { 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-session = { 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 }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false}
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false}
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features =false }
+pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["historical"] }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 # cumulus
-cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
 
 # polkadot
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
 
 # orml
 orml-auction = { path = "../../orml/auction", default-features = false }
@@ -128,16 +128,16 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path =
 
 # benchmarking deps
 libsecp256k1 = { version = "0.7", default-features = false, optional = true }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
 
 [build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true }
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
 
 [features]
 default = ["std"]
diff --git a/runtime/acala/src/constants.rs b/runtime/acala/src/constants.rs
index 8eea14bf0f..1a59f9c1c5 100644
--- a/runtime/acala/src/constants.rs
+++ b/runtime/acala/src/constants.rs
@@ -93,7 +93,7 @@ pub mod fee {
 }
 
 pub mod parachains {
-	pub mod statemint {
+	pub mod asset_hub_polkadot {
 		pub const ID: u32 = 1000;
 	}
 }
@@ -109,7 +109,7 @@ mod tests {
 		let q = Balance::from(ExtrinsicBaseWeight::get().ref_time());
 
 		assert_eq!(p, 1_000_000_000);
-		assert_eq!(q, 113_638_000);
+		assert_eq!(q, 124_414_000);
 		assert_eq!(p / q, 8)
 	}
 }
diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs
index ffd795d415..b3dc5bdb3b 100644
--- a/runtime/acala/src/lib.rs
+++ b/runtime/acala/src/lib.rs
@@ -72,7 +72,6 @@ pub use frame_support::{
 		ConstBool, ConstU128, ConstU16, ConstU32, Contains, ContainsLengthBound, Currency as PalletCurrency, Currency,
 		EnsureOrigin, EqualPrivilegeOnly, Everything, Get, Imbalance, InstanceFilter, IsSubType, IsType,
 		KeyOwnerProofSystem, LockIdentifier, Nothing, OnRuntimeUpgrade, OnUnbalanced, Randomness, SortedMembers,
-		U128CurrencyToVote,
 	},
 	weights::{constants::RocksDbWeight, ConstantMultiplier, IdentityFee, Weight},
 	PalletId, RuntimeDebug, StorageValue,
@@ -248,11 +247,10 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	type RuntimeCall = RuntimeCall;
 	type Lookup = (AccountIdLookup<AccountId, AccountIndex>, EvmAccounts);
-	type Index = Nonce;
-	type BlockNumber = BlockNumber;
+	type Nonce = Nonce;
 	type Hash = Hash;
 	type Hashing = BlakeTwo256;
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type BlockHashCount = BlockHashCount;
@@ -278,6 +276,7 @@ impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<32>;
+	type AllowMultipleBlocksPerSlot = ConstBool<false>;
 }
 
 impl pallet_authorship::Config for Runtime {
@@ -362,7 +361,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ReserveIdentifier;
+	type RuntimeHoldReason = ReserveIdentifier;
 	type FreezeIdentifier = ();
 	type MaxHolds = MaxReserves;
 	type MaxFreezes = ();
@@ -389,6 +388,7 @@ pub type SlowAdjustingFeeUpdate<R> =
 impl pallet_sudo::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -1715,11 +1715,7 @@ impl module_earning::Config for Runtime {
 }
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = primitives::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
+	pub enum Runtime {
 		// Core & Utility
 		System: frame_system = 0,
 		Timestamp: pallet_timestamp = 1,
@@ -1761,7 +1757,7 @@ construct_runtime!(
 		CumulusXcm: cumulus_pallet_xcm exclude_parts { Call } = 52,
 		DmpQueue: cumulus_pallet_dmp_queue = 53,
 		XTokens: orml_xtokens = 54,
-		UnknownTokens: orml_unknown_tokens exclude_parts { Call } = 55,
+		UnknownTokens: orml_unknown_tokens = 55,
 		OrmlXcm: orml_xcm = 56,
 
 		// Governance
@@ -2400,8 +2396,8 @@ mod tests {
 	where
 		F: FnMut(),
 	{
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap()
 			.into();
 		t.execute_with(|| {
diff --git a/runtime/acala/src/weights/module_aggregated_dex.rs b/runtime/acala/src/weights/module_aggregated_dex.rs
index 16ebf7a3fa..5133c7e097 100644
--- a/runtime/acala/src/weights/module_aggregated_dex.rs
+++ b/runtime/acala/src/weights/module_aggregated_dex.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_aggregated_dex
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,63 +47,63 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_aggregated_dex.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_aggregated_dex::WeightInfo for WeightInfo<T> {
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:3)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:3)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
 	/// The range of component `u` is `[2, 4]`.
 	fn swap_with_exact_supply(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1626 + u * (112 ±0)`
-		//  Estimated: `17078 + u * (1270 ±18)`
-		// Minimum execution time: 89_111 nanoseconds.
-		Weight::from_parts(67_642_630, 17078)
-			// Standard Error: 74_578
-			.saturating_add(Weight::from_parts(12_436_527, 0).saturating_mul(u.into()))
+		//  Measured:  `1809 + u * (112 ±0)`
+		//  Estimated: `6234 + u * (643 ±19)`
+		// Minimum execution time: 101_926 nanoseconds.
+		Weight::from_parts(81_165_018, 6234)
+			// Standard Error: 64_206
+			.saturating_add(Weight::from_parts(11_830_707, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 1270).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 643).saturating_mul(u.into()))
 	}
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:3)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:3)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
 	/// The range of component `u` is `[2, 4]`.
 	fn swap_with_exact_target(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1626 + u * (112 ±0)`
-		//  Estimated: `17078 + u * (1270 ±18)`
-		// Minimum execution time: 98_171 nanoseconds.
-		Weight::from_parts(65_487_325, 17078)
-			// Standard Error: 85_842
-			.saturating_add(Weight::from_parts(18_058_086, 0).saturating_mul(u.into()))
+		//  Measured:  `1809 + u * (112 ±0)`
+		//  Estimated: `6234 + u * (643 ±19)`
+		// Minimum execution time: 110_082 nanoseconds.
+		Weight::from_parts(78_416_425, 6234)
+			// Standard Error: 80_433
+			.saturating_add(Weight::from_parts(17_514_695, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 1270).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 643).saturating_mul(u.into()))
 	}
-	// Storage: AggregatedDex AggregatedSwapPaths (r:0 w:6)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `n` is `[0, 7]`.
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:0 w:5)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 6]`.
 	fn update_aggregated_swap_paths(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `666`
 		//  Estimated: `666`
-		// Minimum execution time: 5_970 nanoseconds.
-		Weight::from_parts(5_505_117, 666)
-			// Standard Error: 10_273
-			.saturating_add(Weight::from_parts(1_667_163, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_510 nanoseconds.
+		Weight::from_parts(5_182_130, 666)
+			// Standard Error: 11_575
+			.saturating_add(Weight::from_parts(1_474_268, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
 	}
 }
diff --git a/runtime/acala/src/weights/module_asset_registry.rs b/runtime/acala/src/weights/module_asset_registry.rs
index 8c6aaa2be6..85f5357ebf 100644
--- a/runtime/acala/src/weights/module_asset_registry.rs
+++ b/runtime/acala/src/weights/module_asset_registry.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_asset_registry
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,109 +47,109 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_asset_registry.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_asset_registry::WeightInfo for WeightInfo<T> {
-	// Storage: AssetRegistry NextForeignAssetId (r:1 w:1)
-	// Proof Skipped: AssetRegistry NextForeignAssetId (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry LocationToCurrencyIds (r:1 w:1)
-	// Proof Skipped: AssetRegistry LocationToCurrencyIds (max_values: None, max_size: None, mode: Measured)
-	// Storage: AssetRegistry ForeignAssetLocations (r:1 w:1)
-	// Proof Skipped: AssetRegistry ForeignAssetLocations (max_values: None, max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::NextForeignAssetId` (r:1 w:1)
+	// Proof: `AssetRegistry::NextForeignAssetId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::LocationToCurrencyIds` (r:1 w:1)
+	// Proof: `AssetRegistry::LocationToCurrencyIds` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::ForeignAssetLocations` (r:1 w:1)
+	// Proof: `AssetRegistry::ForeignAssetLocations` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_foreign_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1105`
-		//  Estimated: `16300`
-		// Minimum execution time: 29_388 nanoseconds.
-		Weight::from_parts(30_186_000, 16300)
+		//  Measured:  `1139`
+		//  Estimated: `4604`
+		// Minimum execution time: 27_089 nanoseconds.
+		Weight::from_parts(27_800_000, 4604)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: AssetRegistry ForeignAssetLocations (r:1 w:1)
-	// Proof Skipped: AssetRegistry ForeignAssetLocations (max_values: None, max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::ForeignAssetLocations` (r:1 w:1)
+	// Proof: `AssetRegistry::ForeignAssetLocations` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_foreign_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1261`
-		//  Estimated: `9452`
-		// Minimum execution time: 29_005 nanoseconds.
-		Weight::from_parts(29_448_000, 9452)
+		//  Measured:  `1295`
+		//  Estimated: `4760`
+		// Minimum execution time: 26_755 nanoseconds.
+		Weight::from_parts(27_447_000, 4760)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: AssetRegistry NextStableAssetId (r:1 w:1)
-	// Proof Skipped: AssetRegistry NextStableAssetId (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::NextStableAssetId` (r:1 w:1)
+	// Proof: `AssetRegistry::NextStableAssetId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_stable_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1105`
-		//  Estimated: `7160`
-		// Minimum execution time: 23_444 nanoseconds.
-		Weight::from_parts(23_824_000, 7160)
+		//  Measured:  `1139`
+		//  Estimated: `4604`
+		// Minimum execution time: 21_467 nanoseconds.
+		Weight::from_parts(21_941_000, 4604)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_stable_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1199`
-		//  Estimated: `4664`
-		// Minimum execution time: 24_135 nanoseconds.
-		Weight::from_parts(24_857_000, 4664)
+		//  Measured:  `1233`
+		//  Estimated: `4698`
+		// Minimum execution time: 22_109 nanoseconds.
+		Weight::from_parts(22_497_000, 4698)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EVM Accounts (r:2 w:0)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:1 w:0)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM AccountStorages (r:5 w:0)
-	// Proof Skipped: EVM AccountStorages (max_values: None, max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: AssetRegistry Erc20IdToAddress (r:1 w:1)
-	// Proof Skipped: AssetRegistry Erc20IdToAddress (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EVM::Accounts` (r:2 w:0)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:1 w:0)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::AccountStorages` (r:5 w:0)
+	// Proof: `EVM::AccountStorages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::Erc20IdToAddress` (r:1 w:1)
+	// Proof: `AssetRegistry::Erc20IdToAddress` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_erc20_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6811`
-		//  Estimated: `63755`
-		// Minimum execution time: 205_485 nanoseconds.
-		Weight::from_parts(208_875_000, 63755)
+		//  Measured:  `6845`
+		//  Estimated: `20210`
+		// Minimum execution time: 196_880 nanoseconds.
+		Weight::from_parts(200_662_000, 20210)
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_erc20_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1350`
-		//  Estimated: `4815`
-		// Minimum execution time: 32_005 nanoseconds.
-		Weight::from_parts(33_091_000, 4815)
+		//  Measured:  `1384`
+		//  Estimated: `4849`
+		// Minimum execution time: 30_306 nanoseconds.
+		Weight::from_parts(31_216_000, 4849)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_native_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1105`
-		//  Estimated: `4570`
-		// Minimum execution time: 21_842 nanoseconds.
-		Weight::from_parts(22_425_000, 4570)
+		//  Measured:  `1139`
+		//  Estimated: `4604`
+		// Minimum execution time: 19_835 nanoseconds.
+		Weight::from_parts(20_352_000, 4604)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_native_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1174`
-		//  Estimated: `4639`
-		// Minimum execution time: 23_080 nanoseconds.
-		Weight::from_parts(23_734_000, 4639)
+		//  Measured:  `1208`
+		//  Estimated: `4673`
+		// Minimum execution time: 21_673 nanoseconds.
+		Weight::from_parts(21_931_000, 4673)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/acala/src/weights/module_auction_manager.rs b/runtime/acala/src/weights/module_auction_manager.rs
index bc6931ac60..28887d4e5b 100644
--- a/runtime/acala/src/weights/module_auction_manager.rs
+++ b/runtime/acala/src/weights/module_auction_manager.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_auction_manager
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,34 +47,34 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_auction_manager.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_auction_manager::WeightInfo for WeightInfo<T> {
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: AuctionManager CollateralAuctions (r:1 w:1)
-	// Proof: AuctionManager CollateralAuctions (max_values: None, max_size: Some(139), added: 2614, mode: MaxEncodedLen)
-	// Storage: Auction Auctions (r:1 w:1)
-	// Proof: Auction Auctions (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalTargetInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalTargetInAuction (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Auction AuctionEndTime (r:0 w:1)
-	// Proof: Auction AuctionEndTime (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::CollateralAuctions` (r:1 w:1)
+	// Proof: `AuctionManager::CollateralAuctions` (`max_values`: None, `max_size`: Some(139), added: 2614, mode: `MaxEncodedLen`)
+	// Storage: `Auction::Auctions` (r:1 w:1)
+	// Proof: `Auction::Auctions` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalTargetInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalTargetInAuction` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionEndTime` (r:0 w:1)
+	// Proof: `Auction::AuctionEndTime` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
 	fn cancel_collateral_auction() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2795`
-		//  Estimated: `44437`
-		// Minimum execution time: 108_426 nanoseconds.
-		Weight::from_parts(111_866_000, 44437)
+		//  Measured:  `2829`
+		//  Estimated: `8769`
+		// Minimum execution time: 100_902 nanoseconds.
+		Weight::from_parts(103_304_000, 8769)
 			.saturating_add(T::DbWeight::get().reads(14))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
diff --git a/runtime/acala/src/weights/module_cdp_engine.rs b/runtime/acala/src/weights/module_cdp_engine.rs
index 986448149c..a35a482292 100644
--- a/runtime/acala/src/weights/module_cdp_engine.rs
+++ b/runtime/acala/src/weights/module_cdp_engine.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_cdp_engine
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,221 +47,223 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_cdp_engine.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_cdp_engine::WeightInfo for WeightInfo<T> {
-	// Storage: Aura CurrentSlot (r:1 w:1)
-	// Proof: Aura CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	// Storage: Aura Authorities (r:1 w:0)
-	// Proof: Aura Authorities (max_values: Some(1), max_size: Some(1025), added: 1520, mode: MaxEncodedLen)
-	// Storage: CdpEngine LastAccumulationSecs (r:1 w:1)
-	// Proof: CdpEngine LastAccumulationSecs (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:5 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: System ParentHash (r:0 w:1)
-	// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	// Storage: System Digest (r:0 w:1)
-	// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: System BlockHash (r:0 w:1)
-	// Proof: System BlockHash (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: unknown `0x3a65787472696e7369635f696e646578` (r:0 w:1)
-	// Proof Skipped: unknown `0x3a65787472696e7369635f696e646578` (r:0 w:1)
-	// 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: `Aura::CurrentSlot` (r:1 w:1)
+	// Proof: `Aura::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	// Storage: `Aura::Authorities` (r:1 w:0)
+	// Proof: `Aura::Authorities` (`max_values`: Some(1), `max_size`: Some(1025), added: 1520, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::LastAccumulationSecs` (r:1 w:1)
+	// Proof: `CdpEngine::LastAccumulationSecs` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:5 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `System::ParentHash` (r:0 w:1)
+	// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	// Storage: `System::Digest` (r:0 w:1)
+	// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::BlockHash` (r:0 w:1)
+	// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: UNKNOWN KEY `0x3a65787472696e7369635f696e646578` (r:0 w:1)
+	// Proof: UNKNOWN KEY `0x3a65787472696e7369635f696e646578` (r:0 w:1)
+	// Storage: UNKNOWN KEY `0x3a696e747261626c6f636b5f656e74726f7079` (r:0 w:1)
+	// Proof: UNKNOWN KEY `0x3a696e747261626c6f636b5f656e74726f7079` (r:0 w:1)
+	// 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`)
 	/// The range of component `c` is `[0, 4]`.
 	fn on_initialize(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1018 + c * (91 ±0)`
-		//  Estimated: `12614 + c * (2794 ±0)`
-		// Minimum execution time: 26_072 nanoseconds.
-		Weight::from_parts(27_682_752, 12614)
-			// Standard Error: 28_431
-			.saturating_add(Weight::from_parts(6_541_295, 0).saturating_mul(c.into()))
+		//  Estimated: `3600 + c * (2610 ±0)`
+		// Minimum execution time: 25_476 nanoseconds.
+		Weight::from_parts(27_171_812, 3600)
+			// Standard Error: 36_809
+			.saturating_add(Weight::from_parts(6_498_649, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(8))
-			.saturating_add(Weight::from_parts(0, 2794).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().writes(9))
+			.saturating_add(Weight::from_parts(0, 2610).saturating_mul(c.into()))
 	}
-	// Storage: CdpEngine CollateralParams (r:1 w:1)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:1)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
 	fn set_collateral_params() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1171`
+		//  Measured:  `1205`
 		//  Estimated: `3600`
-		// Minimum execution time: 37_008 nanoseconds.
-		Weight::from_parts(37_996_000, 3600)
+		// Minimum execution time: 34_080 nanoseconds.
+		Weight::from_parts(34_902_000, 3600)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:3 w:3)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: CdpTreasury DebitPool (r:1 w:1)
-	// Proof: CdpTreasury DebitPool (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:1 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine LiquidationContracts (r:1 w:0)
-	// Proof: CdpEngine LiquidationContracts (max_values: Some(1), max_size: Some(201), added: 696, mode: MaxEncodedLen)
-	// Storage: CdpTreasury ExpectedCollateralAuctionSize (r:1 w:0)
-	// Proof: CdpTreasury ExpectedCollateralAuctionSize (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalTargetInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalTargetInAuction (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Auction AuctionsIndex (r:1 w:1)
-	// Proof: Auction AuctionsIndex (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: AuctionManager CollateralAuctions (r:0 w:50)
-	// Proof: AuctionManager CollateralAuctions (max_values: None, max_size: Some(139), added: 2614, mode: MaxEncodedLen)
-	// Storage: Auction AuctionEndTime (r:0 w:50)
-	// Proof: Auction AuctionEndTime (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen)
-	// Storage: Auction Auctions (r:0 w:50)
-	// Proof: Auction Auctions (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:3 w:3)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::DebitPool` (r:1 w:1)
+	// Proof: `CdpTreasury::DebitPool` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:1 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::LiquidationContracts` (r:1 w:0)
+	// Proof: `CdpEngine::LiquidationContracts` (`max_values`: Some(1), `max_size`: Some(201), added: 696, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::ExpectedCollateralAuctionSize` (r:1 w:0)
+	// Proof: `CdpTreasury::ExpectedCollateralAuctionSize` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalTargetInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalTargetInAuction` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionsIndex` (r:1 w:1)
+	// Proof: `Auction::AuctionsIndex` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::CollateralAuctions` (r:0 w:50)
+	// Proof: `AuctionManager::CollateralAuctions` (`max_values`: None, `max_size`: Some(139), added: 2614, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionEndTime` (r:0 w:50)
+	// Proof: `Auction::AuctionEndTime` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
+	// Storage: `Auction::Auctions` (r:0 w:50)
+	// Proof: `Auction::Auctions` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
 	/// The range of component `b` is `[1, 50]`.
 	fn liquidate_by_auction(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3484`
-		//  Estimated: `103387`
-		// Minimum execution time: 214_076 nanoseconds.
-		Weight::from_parts(221_724_910, 103387)
-			// Standard Error: 27_043
-			.saturating_add(Weight::from_parts(13_597_596, 0).saturating_mul(b.into()))
+		//  Measured:  `3551`
+		//  Estimated: `9491`
+		// Minimum execution time: 202_478 nanoseconds.
+		Weight::from_parts(205_903_740, 9491)
+			// Standard Error: 23_891
+			.saturating_add(Weight::from_parts(12_920_319, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(29))
 			.saturating_add(T::DbWeight::get().writes(15))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:1 w:0)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:6 w:6)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:4 w:3)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: CdpTreasury DebitPool (r:1 w:1)
-	// Proof: CdpTreasury DebitPool (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:0)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:4 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:2 w:2)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:1 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:0)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:6 w:6)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:4 w:3)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::DebitPool` (r:1 w:1)
+	// Proof: `CdpTreasury::DebitPool` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:0)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:4 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:2 w:2)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:1 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn liquidate_by_dex() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4362`
-		//  Estimated: `142595`
-		// Minimum execution time: 328_121 nanoseconds.
-		Weight::from_parts(337_582_000, 142595)
+		//  Measured:  `4429`
+		//  Estimated: `16722`
+		// Minimum execution time: 312_391 nanoseconds.
+		Weight::from_parts(319_510_000, 16722)
 			.saturating_add(T::DbWeight::get().reads(37))
 			.saturating_add(T::DbWeight::get().writes(16))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: CdpTreasury DebitPool (r:1 w:1)
-	// Proof: CdpTreasury DebitPool (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::DebitPool` (r:1 w:1)
+	// Proof: `CdpTreasury::DebitPool` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
 	fn settle() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2704`
-		//  Estimated: `50666`
-		// Minimum execution time: 125_553 nanoseconds.
-		Weight::from_parts(128_951_000, 50666)
+		//  Measured:  `2771`
+		//  Estimated: `6236`
+		// Minimum execution time: 116_193 nanoseconds.
+		Weight::from_parts(121_364_000, 6236)
 			.saturating_add(T::DbWeight::get().reads(14))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
-	// Storage: CdpEngine LiquidationContracts (r:1 w:1)
-	// Proof: CdpEngine LiquidationContracts (max_values: Some(1), max_size: Some(201), added: 696, mode: MaxEncodedLen)
+	// Storage: `CdpEngine::LiquidationContracts` (r:1 w:1)
+	// Proof: `CdpEngine::LiquidationContracts` (`max_values`: Some(1), `max_size`: Some(201), added: 696, mode: `MaxEncodedLen`)
 	fn register_liquidation_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1171`
+		//  Measured:  `1205`
 		//  Estimated: `1686`
-		// Minimum execution time: 21_406 nanoseconds.
-		Weight::from_parts(22_024_000, 1686)
+		// Minimum execution time: 19_520 nanoseconds.
+		Weight::from_parts(20_134_000, 1686)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: CdpEngine LiquidationContracts (r:1 w:1)
-	// Proof: CdpEngine LiquidationContracts (max_values: Some(1), max_size: Some(201), added: 696, mode: MaxEncodedLen)
+	// Storage: `CdpEngine::LiquidationContracts` (r:1 w:1)
+	// Proof: `CdpEngine::LiquidationContracts` (`max_values`: Some(1), `max_size`: Some(201), added: 696, mode: `MaxEncodedLen`)
 	fn deregister_liquidation_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1216`
+		//  Measured:  `1250`
 		//  Estimated: `1686`
-		// Minimum execution time: 22_005 nanoseconds.
-		Weight::from_parts(22_947_000, 1686)
+		// Minimum execution time: 20_269 nanoseconds.
+		Weight::from_parts(20_969_000, 1686)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/acala/src/weights/module_cdp_treasury.rs b/runtime/acala/src/weights/module_cdp_treasury.rs
index 9241fb7570..62d3fb9e0b 100644
--- a/runtime/acala/src/weights/module_cdp_treasury.rs
+++ b/runtime/acala/src/weights/module_cdp_treasury.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_cdp_treasury
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,92 +47,92 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_cdp_treasury.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_cdp_treasury::WeightInfo for WeightInfo<T> {
-	// Storage: Tokens Accounts (r:1 w:0)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpTreasury ExpectedCollateralAuctionSize (r:1 w:0)
-	// Proof: CdpTreasury ExpectedCollateralAuctionSize (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalTargetInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalTargetInAuction (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Auction AuctionsIndex (r:1 w:1)
-	// Proof: Auction AuctionsIndex (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: AuctionManager CollateralAuctions (r:0 w:50)
-	// Proof: AuctionManager CollateralAuctions (max_values: None, max_size: Some(139), added: 2614, mode: MaxEncodedLen)
-	// Storage: Auction AuctionEndTime (r:0 w:50)
-	// Proof: Auction AuctionEndTime (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen)
-	// Storage: Auction Auctions (r:0 w:50)
-	// Proof: Auction Auctions (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
+	// Storage: `Tokens::Accounts` (r:1 w:0)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::ExpectedCollateralAuctionSize` (r:1 w:0)
+	// Proof: `CdpTreasury::ExpectedCollateralAuctionSize` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalTargetInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalTargetInAuction` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionsIndex` (r:1 w:1)
+	// Proof: `Auction::AuctionsIndex` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::CollateralAuctions` (r:0 w:50)
+	// Proof: `AuctionManager::CollateralAuctions` (`max_values`: None, `max_size`: Some(139), added: 2614, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionEndTime` (r:0 w:50)
+	// Proof: `Auction::AuctionEndTime` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
+	// Storage: `Auction::Auctions` (r:0 w:50)
+	// Proof: `Auction::Auctions` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
 	/// The range of component `b` is `[1, 50]`.
 	fn auction_collateral(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1976`
-		//  Estimated: `17259`
-		// Minimum execution time: 51_526 nanoseconds.
-		Weight::from_parts(51_669_531, 17259)
-			// Standard Error: 22_561
-			.saturating_add(Weight::from_parts(13_348_827, 0).saturating_mul(b.into()))
+		//  Measured:  `2043`
+		//  Estimated: `3612`
+		// Minimum execution time: 48_134 nanoseconds.
+		Weight::from_parts(45_583_861, 3612)
+			// Standard Error: 19_334
+			.saturating_add(Weight::from_parts(12_894_879, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(6))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
 	}
-	// Storage: Tokens Accounts (r:8 w:8)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:0)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:5 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:5 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:2 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: System Account (r:3 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Tokens::Accounts` (r:8 w:8)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:0)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:5 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:5 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:2 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:3 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn exchange_collateral_to_stable() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4581`
-		//  Estimated: `117042`
-		// Minimum execution time: 379_164 nanoseconds.
-		Weight::from_parts(388_011_000, 117042)
+		//  Measured:  `4615`
+		//  Estimated: `21966`
+		// Minimum execution time: 384_023 nanoseconds.
+		Weight::from_parts(394_898_000, 21966)
 			.saturating_add(T::DbWeight::get().reads(32))
 			.saturating_add(T::DbWeight::get().writes(12))
 	}
-	// Storage: CdpTreasury ExpectedCollateralAuctionSize (r:0 w:1)
-	// Proof: CdpTreasury ExpectedCollateralAuctionSize (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `CdpTreasury::ExpectedCollateralAuctionSize` (r:0 w:1)
+	// Proof: `CdpTreasury::ExpectedCollateralAuctionSize` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn set_expected_collateral_auction_size() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `963`
+		//  Measured:  `997`
 		//  Estimated: `0`
-		// Minimum execution time: 18_591 nanoseconds.
-		Weight::from_parts(19_129_000, 0)
+		// Minimum execution time: 17_112 nanoseconds.
+		Weight::from_parts(17_432_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn extract_surplus_to_treasury() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1434`
-		//  Estimated: `12430`
-		// Minimum execution time: 51_006 nanoseconds.
-		Weight::from_parts(51_657_000, 12430)
+		//  Measured:  `1468`
+		//  Estimated: `6234`
+		// Minimum execution time: 46_124 nanoseconds.
+		Weight::from_parts(46_833_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
diff --git a/runtime/acala/src/weights/module_collator_selection.rs b/runtime/acala/src/weights/module_collator_selection.rs
index 9d85350145..53dc277af8 100644
--- a/runtime/acala/src/weights/module_collator_selection.rs
+++ b/runtime/acala/src/weights/module_collator_selection.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_collator_selection
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,192 +47,192 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_collator_selection.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_collator_selection::WeightInfo for WeightInfo<T> {
-	// Storage: CollatorSelection Invulnerables (r:0 w:1)
-	// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::Invulnerables` (r:0 w:1)
+	// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(321), added: 816, mode: `MaxEncodedLen`)
 	/// The range of component `b` is `[1, 10]`.
 	fn set_invulnerables(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `963`
+		//  Measured:  `997`
 		//  Estimated: `0`
-		// Minimum execution time: 15_808 nanoseconds.
-		Weight::from_parts(16_399_028, 0)
-			// Standard Error: 2_881
-			.saturating_add(Weight::from_parts(95_549, 0).saturating_mul(b.into()))
+		// Minimum execution time: 13_982 nanoseconds.
+		Weight::from_parts(14_583_738, 0)
+			// Standard Error: 1_758
+			.saturating_add(Weight::from_parts(12_654, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: CollatorSelection DesiredCandidates (r:0 w:1)
-	// Proof: CollatorSelection DesiredCandidates (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::DesiredCandidates` (r:0 w:1)
+	// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_desired_candidates() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `963`
+		//  Measured:  `997`
 		//  Estimated: `0`
-		// Minimum execution time: 15_003 nanoseconds.
-		Weight::from_parts(15_575_000, 0)
+		// Minimum execution time: 13_687 nanoseconds.
+		Weight::from_parts(14_228_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: CollatorSelection CandidacyBond (r:0 w:1)
-	// Proof: CollatorSelection CandidacyBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
+	// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn set_candidacy_bond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `963`
+		//  Measured:  `997`
 		//  Estimated: `0`
-		// Minimum execution time: 15_454 nanoseconds.
-		Weight::from_parts(15_936_000, 0)
+		// Minimum execution time: 13_638 nanoseconds.
+		Weight::from_parts(14_102_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: CollatorSelection NonCandidates (r:1 w:1)
-	// Proof: CollatorSelection NonCandidates (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: CollatorSelection CandidacyBond (r:1 w:0)
-	// Proof: CollatorSelection CandidacyBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: CollatorSelection Candidates (r:1 w:1)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: CollatorSelection DesiredCandidates (r:1 w:0)
-	// Proof: CollatorSelection DesiredCandidates (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: CollatorSelection Invulnerables (r:1 w:0)
-	// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
-	// Storage: Session NextKeys (r:1 w:0)
-	// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::NonCandidates` (r:1 w:1)
+	// Proof: `CollatorSelection::NonCandidates` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0)
+	// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:1)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0)
+	// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
+	// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(321), added: 816, mode: `MaxEncodedLen`)
+	// Storage: `Session::NextKeys` (r:1 w:0)
+	// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[5, 50]`.
 	fn register_as_candidate(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2258 + c * (60 ±0)`
-		//  Estimated: `20693 + c * (61 ±0)`
-		// Minimum execution time: 59_721 nanoseconds.
-		Weight::from_parts(61_760_146, 20693)
-			// Standard Error: 3_982
-			.saturating_add(Weight::from_parts(483_747, 0).saturating_mul(c.into()))
+		//  Measured:  `2292 + c * (60 ±0)`
+		//  Estimated: `5703 + c * (61 ±0)`
+		// Minimum execution time: 59_966 nanoseconds.
+		Weight::from_parts(61_165_933, 5703)
+			// Standard Error: 4_097
+			.saturating_add(Weight::from_parts(495_725, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 61).saturating_mul(c.into()))
 	}
-	// Storage: CollatorSelection Candidates (r:1 w:1)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: CollatorSelection DesiredCandidates (r:1 w:0)
-	// Proof: CollatorSelection DesiredCandidates (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: CollatorSelection Invulnerables (r:1 w:0)
-	// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
-	// Storage: Session NextKeys (r:1 w:0)
-	// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:0)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:1)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0)
+	// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
+	// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(321), added: 816, mode: `MaxEncodedLen`)
+	// Storage: `Session::NextKeys` (r:1 w:0)
+	// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:0)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 50]`.
 	fn register_candidate(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1771 + c * (55 ±0)`
-		//  Estimated: `15242 + c * (55 ±0)`
-		// Minimum execution time: 36_526 nanoseconds.
-		Weight::from_parts(42_434_981, 15242)
-			// Standard Error: 4_502
-			.saturating_add(Weight::from_parts(436_647, 0).saturating_mul(c.into()))
+		//  Measured:  `1805 + c * (55 ±0)`
+		//  Estimated: `5262 + c * (55 ±0)`
+		// Minimum execution time: 33_967 nanoseconds.
+		Weight::from_parts(39_279_102, 5262)
+			// Standard Error: 3_799
+			.saturating_add(Weight::from_parts(446_572, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(Weight::from_parts(0, 55).saturating_mul(c.into()))
 	}
-	// Storage: CollatorSelection Candidates (r:1 w:1)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: Session CurrentIndex (r:1 w:0)
-	// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: CollatorSelection NonCandidates (r:0 w:1)
-	// Proof: CollatorSelection NonCandidates (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:1)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `Session::CurrentIndex` (r:1 w:0)
+	// Proof: `Session::CurrentIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `CollatorSelection::NonCandidates` (r:0 w:1)
+	// Proof: `CollatorSelection::NonCandidates` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[6, 50]`.
 	fn leave_intent(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1561 + c * (39 ±0)`
-		//  Estimated: `6128 + c * (39 ±0)`
-		// Minimum execution time: 29_479 nanoseconds.
-		Weight::from_parts(29_999_297, 6128)
-			// Standard Error: 2_683
-			.saturating_add(Weight::from_parts(322_674, 0).saturating_mul(c.into()))
+		//  Measured:  `1595 + c * (39 ±0)`
+		//  Estimated: `3086 + c * (39 ±0)`
+		// Minimum execution time: 27_127 nanoseconds.
+		Weight::from_parts(26_981_995, 3086)
+			// Standard Error: 2_399
+			.saturating_add(Weight::from_parts(352_378, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(Weight::from_parts(0, 39).saturating_mul(c.into()))
 	}
-	// Storage: CollatorSelection NonCandidates (r:1 w:1)
-	// Proof: CollatorSelection NonCandidates (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: Session CurrentIndex (r:1 w:0)
-	// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::NonCandidates` (r:1 w:1)
+	// Proof: `CollatorSelection::NonCandidates` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: `Session::CurrentIndex` (r:1 w:0)
+	// Proof: `Session::CurrentIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	fn withdraw_bond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3124`
-		//  Estimated: `11751`
-		// Minimum execution time: 58_104 nanoseconds.
-		Weight::from_parts(60_410_000, 11751)
+		//  Measured:  `3160`
+		//  Estimated: `4645`
+		// Minimum execution time: 61_313 nanoseconds.
+		Weight::from_parts(63_013_000, 4645)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: CollatorSelection SessionPoints (r:1 w:0)
-	// Proof: CollatorSelection SessionPoints (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::SessionPoints` (r:1 w:0)
+	// Proof: `CollatorSelection::SessionPoints` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	fn note_author() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1888`
-		//  Estimated: `9705`
-		// Minimum execution time: 44_113 nanoseconds.
-		Weight::from_parts(44_986_000, 9705)
+		//  Measured:  `2105`
+		//  Estimated: `6196`
+		// Minimum execution time: 64_302 nanoseconds.
+		Weight::from_parts(65_482_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: CollatorSelection Candidates (r:1 w:0)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: CollatorSelection Invulnerables (r:1 w:0)
-	// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:0)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
+	// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(321), added: 816, mode: `MaxEncodedLen`)
 	fn new_session() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2653`
-		//  Estimated: `4892`
-		// Minimum execution time: 25_566 nanoseconds.
-		Weight::from_parts(27_299_000, 4892)
+		//  Measured:  `2687`
+		//  Estimated: `3086`
+		// Minimum execution time: 25_149 nanoseconds.
+		Weight::from_parts(26_225_000, 3086)
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
-	// Storage: Session Validators (r:1 w:0)
-	// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: CollatorSelection Candidates (r:1 w:0)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: CollatorSelection SessionPoints (r:0 w:50)
-	// Proof: CollatorSelection SessionPoints (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
+	// Storage: `Session::Validators` (r:1 w:0)
+	// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:0)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::SessionPoints` (r:0 w:50)
+	// Proof: `CollatorSelection::SessionPoints` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[5, 50]`.
 	/// The range of component `c` is `[5, 50]`.
 	fn start_session(r: u32, c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1341 + c * (64 ±0)`
-		//  Estimated: `5912 + c * (64 ±0)`
-		// Minimum execution time: 22_124 nanoseconds.
-		Weight::from_parts(17_586_437, 5912)
-			// Standard Error: 1_720
-			.saturating_add(Weight::from_parts(1_385, 0).saturating_mul(r.into()))
-			// Standard Error: 1_720
-			.saturating_add(Weight::from_parts(1_247_946, 0).saturating_mul(c.into()))
+		//  Measured:  `1378 + c * (64 ±0)`
+		//  Estimated: `3086 + c * (64 ±0)`
+		// Minimum execution time: 21_474 nanoseconds.
+		Weight::from_parts(17_017_483, 3086)
+			// Standard Error: 1_548
+			.saturating_add(Weight::from_parts(7_585, 0).saturating_mul(r.into()))
+			// Standard Error: 1_548
+			.saturating_add(Weight::from_parts(1_222_322, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
 			.saturating_add(Weight::from_parts(0, 64).saturating_mul(c.into()))
 	}
-	// Storage: CollatorSelection SessionPoints (r:51 w:50)
-	// Proof: CollatorSelection SessionPoints (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: CollatorSelection Candidates (r:1 w:1)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: Session CurrentIndex (r:1 w:0)
-	// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: CollatorSelection NonCandidates (r:0 w:1)
-	// Proof: CollatorSelection NonCandidates (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::SessionPoints` (r:51 w:50)
+	// Proof: `CollatorSelection::SessionPoints` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:1)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `Session::CurrentIndex` (r:1 w:0)
+	// Proof: `Session::CurrentIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `CollatorSelection::NonCandidates` (r:0 w:1)
+	// Proof: `CollatorSelection::NonCandidates` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[5, 50]`.
 	/// The range of component `c` is `[5, 50]`.
 	fn end_session(_r: u32, c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3391 + c * (49 ±0)`
-		//  Estimated: `3513 + c * (2728 ±0)`
-		// Minimum execution time: 34_376 nanoseconds.
-		Weight::from_parts(516_268_739, 3513)
-			// Standard Error: 20_617
-			.saturating_add(Weight::from_parts(4_411_697, 0).saturating_mul(c.into()))
+		//  Measured:  `3425 + c * (49 ±0)`
+		//  Estimated: `3509 + c * (2519 ±0)`
+		// Minimum execution time: 32_824 nanoseconds.
+		Weight::from_parts(465_273_864, 3509)
+			// Standard Error: 17_675
+			.saturating_add(Weight::from_parts(4_186_403, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(50))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2728).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
 	}
 }
diff --git a/runtime/acala/src/weights/module_currencies.rs b/runtime/acala/src/weights/module_currencies.rs
index c60545e697..5f6875d7b7 100644
--- a/runtime/acala/src/weights/module_currencies.rs
+++ b/runtime/acala/src/weights/module_currencies.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_currencies
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,119 +47,119 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_currencies.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_currencies::WeightInfo for WeightInfo<T> {
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_non_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1543`
-		//  Estimated: `13352`
-		// Minimum execution time: 58_189 nanoseconds.
-		Weight::from_parts(59_470_000, 13352)
+		//  Measured:  `1577`
+		//  Estimated: `6234`
+		// Minimum execution time: 53_697 nanoseconds.
+		Weight::from_parts(54_816_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn transfer_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1333`
-		//  Estimated: `7118`
-		// Minimum execution time: 46_474 nanoseconds.
-		Weight::from_parts(47_406_000, 7118)
+		//  Measured:  `1411`
+		//  Estimated: `3593`
+		// Minimum execution time: 63_535 nanoseconds.
+		Weight::from_parts(64_399_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, 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::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_balance_non_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1126`
-		//  Estimated: `10737`
-		// Minimum execution time: 35_138 nanoseconds.
-		Weight::from_parts(35_727_000, 10737)
+		//  Measured:  `1160`
+		//  Estimated: `3612`
+		// Minimum execution time: 31_833 nanoseconds.
+		Weight::from_parts(32_226_000, 3612)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_balance_native_currency_creating() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1233`
+		//  Measured:  `1267`
 		//  Estimated: `3593`
-		// Minimum execution time: 35_172 nanoseconds.
-		Weight::from_parts(35_816_000, 3593)
+		// Minimum execution time: 34_700 nanoseconds.
+		Weight::from_parts(35_467_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn update_balance_native_currency_killing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1373`
-		//  Estimated: `7118`
-		// Minimum execution time: 35_497 nanoseconds.
-		Weight::from_parts(36_207_000, 7118)
+		//  Measured:  `1407`
+		//  Estimated: `3593`
+		// Minimum execution time: 36_675 nanoseconds.
+		Weight::from_parts(37_383_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Tokens Accounts (r:4 w:4)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:3 w:3)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Tokens::Accounts` (r:4 w:4)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:3 w:3)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 3]`.
 	fn sweep_dust(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1451 + c * (79 ±0)`
-		//  Estimated: `4602 + c * (5225 ±0)`
-		// Minimum execution time: 44_465 nanoseconds.
-		Weight::from_parts(23_484_568, 4602)
-			// Standard Error: 34_075
-			.saturating_add(Weight::from_parts(22_413_530, 0).saturating_mul(c.into()))
+		//  Measured:  `1485 + c * (79 ±0)`
+		//  Estimated: `3612 + c * (2622 ±0)`
+		// Minimum execution time: 41_454 nanoseconds.
+		Weight::from_parts(21_717_864, 3612)
+			// Standard Error: 24_913
+			.saturating_add(Weight::from_parts(21_061_452, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 5225).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(0, 2622).saturating_mul(c.into()))
 	}
-	// Storage: Tokens Locks (r:1 w:1)
-	// Proof: Tokens Locks (max_values: None, max_size: Some(1300), added: 3775, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, 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::Locks` (r:1 w:1)
+	// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1300), added: 3775, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn force_set_lock() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1430`
-		//  Estimated: `11970`
-		// Minimum execution time: 38_454 nanoseconds.
-		Weight::from_parts(39_281_000, 11970)
+		//  Measured:  `1464`
+		//  Estimated: `4765`
+		// Minimum execution time: 34_920 nanoseconds.
+		Weight::from_parts(35_332_000, 4765)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Tokens Locks (r:1 w:1)
-	// Proof: Tokens Locks (max_values: None, max_size: Some(1300), added: 3775, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, 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::Locks` (r:1 w:1)
+	// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1300), added: 3775, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn force_remove_lock() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1535`
-		//  Estimated: `11970`
-		// Minimum execution time: 39_219 nanoseconds.
-		Weight::from_parts(40_260_000, 11970)
+		//  Measured:  `1569`
+		//  Estimated: `4765`
+		// Minimum execution time: 36_256 nanoseconds.
+		Weight::from_parts(36_795_000, 4765)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
diff --git a/runtime/acala/src/weights/module_dex.rs b/runtime/acala/src/weights/module_dex.rs
index a31bbc8cf5..02a9a02ee1 100644
--- a/runtime/acala/src/weights/module_dex.rs
+++ b/runtime/acala/src/weights/module_dex.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_dex
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,272 +47,272 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_dex.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_dex::WeightInfo for WeightInfo<T> {
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
 	fn enable_trading_pair() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1072`
+		//  Measured:  `1106`
 		//  Estimated: `3660`
-		// Minimum execution time: 21_663 nanoseconds.
-		Weight::from_parts(22_378_000, 3660)
+		// Minimum execution time: 19_939 nanoseconds.
+		Weight::from_parts(20_451_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
 	fn disable_trading_pair() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1109`
+		//  Measured:  `1143`
 		//  Estimated: `3660`
-		// Minimum execution time: 22_573 nanoseconds.
-		Weight::from_parts(23_068_000, 3660)
+		// Minimum execution time: 21_154 nanoseconds.
+		Weight::from_parts(21_778_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:0)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex ProvisioningPool (r:1 w:0)
-	// Proof: Dex ProvisioningPool (max_values: None, max_size: Some(166), added: 2641, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:0)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::ProvisioningPool` (r:1 w:0)
+	// Proof: `Dex::ProvisioningPool` (`max_values`: None, `max_size`: Some(166), added: 2641, mode: `MaxEncodedLen`)
 	fn list_provisioning() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1114`
-		//  Estimated: `10823`
-		// Minimum execution time: 29_699 nanoseconds.
-		Weight::from_parts(30_679_000, 10823)
+		//  Measured:  `1148`
+		//  Estimated: `3660`
+		// Minimum execution time: 27_265 nanoseconds.
+		Weight::from_parts(27_859_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
 	fn update_provisioning_parameters() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `915`
 		//  Estimated: `3660`
-		// Minimum execution time: 14_085 nanoseconds.
-		Weight::from_parts(14_492_000, 3660)
+		// Minimum execution time: 12_535 nanoseconds.
+		Weight::from_parts(12_854_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:1 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Dex InitialShareExchangeRates (r:0 w:1)
-	// Proof: Dex InitialShareExchangeRates (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:1 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Dex::InitialShareExchangeRates` (r:0 w:1)
+	// Proof: `Dex::InitialShareExchangeRates` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
 	fn end_provisioning() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1706`
-		//  Estimated: `17988`
-		// Minimum execution time: 57_514 nanoseconds.
-		Weight::from_parts(58_533_000, 17988)
+		//  Measured:  `1740`
+		//  Estimated: `3660`
+		// Minimum execution time: 51_937 nanoseconds.
+		Weight::from_parts(53_294_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex ProvisioningPool (r:1 w:1)
-	// Proof: Dex ProvisioningPool (max_values: None, max_size: Some(166), added: 2641, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::ProvisioningPool` (r:1 w:1)
+	// Proof: `Dex::ProvisioningPool` (`max_values`: None, `max_size`: Some(166), added: 2641, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
 	fn add_provision() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1683`
-		//  Estimated: `17118`
-		// Minimum execution time: 90_657 nanoseconds.
-		Weight::from_parts(92_335_000, 17118)
+		//  Measured:  `1866`
+		//  Estimated: `6234`
+		// Minimum execution time: 103_062 nanoseconds.
+		Weight::from_parts(104_420_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex ProvisioningPool (r:2 w:1)
-	// Proof: Dex ProvisioningPool (max_values: None, max_size: Some(166), added: 2641, mode: MaxEncodedLen)
-	// Storage: Dex InitialShareExchangeRates (r:1 w:1)
-	// Proof: Dex InitialShareExchangeRates (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::ProvisioningPool` (r:2 w:1)
+	// Proof: `Dex::ProvisioningPool` (`max_values`: None, `max_size`: Some(166), added: 2641, mode: `MaxEncodedLen`)
+	// Storage: `Dex::InitialShareExchangeRates` (r:1 w:1)
+	// Proof: `Dex::InitialShareExchangeRates` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_dex_share() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2060`
-		//  Estimated: `23350`
-		// Minimum execution time: 79_355 nanoseconds.
-		Weight::from_parts(81_859_000, 23350)
+		//  Measured:  `2094`
+		//  Estimated: `6272`
+		// Minimum execution time: 71_064 nanoseconds.
+		Weight::from_parts(73_688_000, 6272)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:1 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, 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 Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:1 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, 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::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2121`
-		//  Estimated: `26757`
-		// Minimum execution time: 111_424 nanoseconds.
-		Weight::from_parts(114_259_000, 26757)
+		//  Measured:  `2199`
+		//  Estimated: `8856`
+		// Minimum execution time: 123_825 nanoseconds.
+		Weight::from_parts(126_626_000, 8856)
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:1 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, 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 Accounts (r:4 w:4)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:1 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, 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::Accounts` (r:4 w:4)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn add_liquidity_and_stake() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2528`
-		//  Estimated: `41365`
-		// Minimum execution time: 158_892 nanoseconds.
-		Weight::from_parts(163_324_000, 41365)
+		//  Measured:  `2606`
+		//  Estimated: `11478`
+		// Minimum execution time: 164_921 nanoseconds.
+		Weight::from_parts(167_754_000, 11478)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: Dex LiquidityPool (r:1 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Dex::LiquidityPool` (r:1 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn remove_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1950`
-		//  Estimated: `19572`
-		// Minimum execution time: 104_369 nanoseconds.
-		Weight::from_parts(107_247_000, 19572)
+		//  Measured:  `2133`
+		//  Estimated: `8856`
+		// Minimum execution time: 114_246 nanoseconds.
+		Weight::from_parts(116_419_000, 8856)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: Dex LiquidityPool (r:1 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:4 w:4)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Dex::LiquidityPool` (r:1 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:4 w:4)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn remove_liquidity_by_unstake() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2468`
-		//  Estimated: `40188`
-		// Minimum execution time: 174_245 nanoseconds.
-		Weight::from_parts(177_943_000, 40188)
+		//  Measured:  `2546`
+		//  Estimated: `11478`
+		// Minimum execution time: 176_691 nanoseconds.
+		Weight::from_parts(179_247_000, 11478)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:3)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:3)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
 	/// The range of component `u` is `[2, 4]`.
 	fn swap_with_exact_supply(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1626 + u * (112 ±0)`
-		//  Estimated: `17078 + u * (1270 ±19)`
-		// Minimum execution time: 86_437 nanoseconds.
-		Weight::from_parts(65_172_443, 17078)
-			// Standard Error: 72_350
-			.saturating_add(Weight::from_parts(12_364_670, 0).saturating_mul(u.into()))
+		//  Measured:  `1809 + u * (112 ±0)`
+		//  Estimated: `6234 + u * (643 ±19)`
+		// Minimum execution time: 98_835 nanoseconds.
+		Weight::from_parts(77_900_953, 6234)
+			// Standard Error: 65_078
+			.saturating_add(Weight::from_parts(11_945_793, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 1270).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 643).saturating_mul(u.into()))
 	}
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:3)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:3)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
 	/// The range of component `u` is `[2, 4]`.
 	fn swap_with_exact_target(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1626 + u * (112 ±0)`
-		//  Estimated: `17078 + u * (1270 ±18)`
-		// Minimum execution time: 85_960 nanoseconds.
-		Weight::from_parts(65_844_974, 17078)
-			// Standard Error: 78_321
-			.saturating_add(Weight::from_parts(12_115_363, 0).saturating_mul(u.into()))
+		//  Measured:  `1809 + u * (112 ±0)`
+		//  Estimated: `6234 + u * (643 ±18)`
+		// Minimum execution time: 99_017 nanoseconds.
+		Weight::from_parts(78_718_809, 6234)
+			// Standard Error: 61_019
+			.saturating_add(Weight::from_parts(11_615_740, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 1270).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 643).saturating_mul(u.into()))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex InitialShareExchangeRates (r:1 w:0)
-	// Proof: Dex InitialShareExchangeRates (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Dex ProvisioningPool (r:1 w:1)
-	// Proof: Dex ProvisioningPool (max_values: None, max_size: Some(166), added: 2641, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::InitialShareExchangeRates` (r:1 w:0)
+	// Proof: `Dex::InitialShareExchangeRates` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Dex::ProvisioningPool` (r:1 w:1)
+	// Proof: `Dex::ProvisioningPool` (`max_values`: None, `max_size`: Some(166), added: 2641, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn refund_provision() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2122`
-		//  Estimated: `24234`
-		// Minimum execution time: 93_450 nanoseconds.
-		Weight::from_parts(96_209_000, 24234)
+		//  Measured:  `2200`
+		//  Estimated: `6234`
+		// Minimum execution time: 108_811 nanoseconds.
+		Weight::from_parts(110_812_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
 	fn abort_provisioning() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1246`
+		//  Measured:  `1280`
 		//  Estimated: `3660`
-		// Minimum execution time: 27_463 nanoseconds.
-		Weight::from_parts(28_248_000, 3660)
+		// Minimum execution time: 25_483 nanoseconds.
+		Weight::from_parts(26_222_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/acala/src/weights/module_dex_oracle.rs b/runtime/acala/src/weights/module_dex_oracle.rs
index cf2a556aff..33a30bd5fb 100644
--- a/runtime/acala/src/weights/module_dex_oracle.rs
+++ b/runtime/acala/src/weights/module_dex_oracle.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_dex_oracle
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,87 +47,89 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_dex_oracle.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_dex_oracle::WeightInfo for WeightInfo<T> {
-	// Storage: Aura CurrentSlot (r:1 w:1)
-	// Proof: Aura CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	// Storage: Aura Authorities (r:1 w:0)
-	// Proof: Aura Authorities (max_values: Some(1), max_size: Some(1025), added: 1520, mode: MaxEncodedLen)
-	// Storage: DexOracle AveragePrices (r:4 w:3)
-	// Proof Skipped: DexOracle AveragePrices (max_values: None, max_size: None, mode: Measured)
-	// Storage: Dex LiquidityPool (r:3 w:0)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: DexOracle Cumulatives (r:3 w:3)
-	// Proof Skipped: DexOracle Cumulatives (max_values: None, max_size: None, mode: Measured)
-	// Storage: System ParentHash (r:0 w:1)
-	// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	// Storage: System Digest (r:0 w:1)
-	// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: System BlockHash (r:0 w:1)
-	// Proof: System BlockHash (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: unknown `0x3a65787472696e7369635f696e646578` (r:0 w:1)
-	// Proof Skipped: unknown `0x3a65787472696e7369635f696e646578` (r:0 w:1)
-	// 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: `Aura::CurrentSlot` (r:1 w:1)
+	// Proof: `Aura::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	// Storage: `Aura::Authorities` (r:1 w:0)
+	// Proof: `Aura::Authorities` (`max_values`: Some(1), `max_size`: Some(1025), added: 1520, mode: `MaxEncodedLen`)
+	// Storage: `DexOracle::AveragePrices` (r:4 w:3)
+	// Proof: `DexOracle::AveragePrices` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:0)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `DexOracle::Cumulatives` (r:3 w:3)
+	// Proof: `DexOracle::Cumulatives` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `System::ParentHash` (r:0 w:1)
+	// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	// Storage: `System::Digest` (r:0 w:1)
+	// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::BlockHash` (r:0 w:1)
+	// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: UNKNOWN KEY `0x3a65787472696e7369635f696e646578` (r:0 w:1)
+	// Proof: UNKNOWN KEY `0x3a65787472696e7369635f696e646578` (r:0 w:1)
+	// Storage: UNKNOWN KEY `0x3a696e747261626c6f636b5f656e74726f7079` (r:0 w:1)
+	// Proof: UNKNOWN KEY `0x3a696e747261626c6f636b5f656e74726f7079` (r:0 w:1)
+	// 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`)
 	/// The range of component `n` is `[0, 3]`.
 	/// The range of component `u` is `[0, 3]`.
 	fn on_initialize_with_update_average_prices(n: u32, u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `279 + n * (377 ±0) + u * (249 ±0)`
-		//  Estimated: `17190 + n * (4487 ±2) + u * (1301 ±2)`
-		// Minimum execution time: 19_170 nanoseconds.
-		Weight::from_parts(19_767_000, 17190)
-			// Standard Error: 158_977
-			.saturating_add(Weight::from_parts(11_058_384, 0).saturating_mul(n.into()))
-			// Standard Error: 158_977
-			.saturating_add(Weight::from_parts(5_003_505, 0).saturating_mul(u.into()))
+		//  Estimated: `4961 + n * (2864 ±2) + u * (346 ±2)`
+		// Minimum execution time: 18_650 nanoseconds.
+		Weight::from_parts(19_236_000, 4961)
+			// Standard Error: 150_791
+			.saturating_add(Weight::from_parts(10_691_498, 0).saturating_mul(n.into()))
+			// Standard Error: 150_791
+			.saturating_add(Weight::from_parts(4_779_519, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
+			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 4487).saturating_mul(n.into()))
-			.saturating_add(Weight::from_parts(0, 1301).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 2864).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(0, 346).saturating_mul(u.into()))
 	}
-	// Storage: DexOracle AveragePrices (r:1 w:1)
-	// Proof Skipped: DexOracle AveragePrices (max_values: None, max_size: None, mode: Measured)
-	// Storage: Dex LiquidityPool (r:1 w:0)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Timestamp Now (r:1 w:0)
-	// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	// Storage: DexOracle Cumulatives (r:0 w:1)
-	// Proof Skipped: DexOracle Cumulatives (max_values: None, max_size: None, mode: Measured)
+	// Storage: `DexOracle::AveragePrices` (r:1 w:1)
+	// Proof: `DexOracle::AveragePrices` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Dex::LiquidityPool` (r:1 w:0)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Timestamp::Now` (r:1 w:0)
+	// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	// Storage: `DexOracle::Cumulatives` (r:0 w:1)
+	// Proof: `DexOracle::Cumulatives` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn enable_average_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `922`
-		//  Estimated: `10393`
-		// Minimum execution time: 22_580 nanoseconds.
-		Weight::from_parts(23_224_000, 10393)
+		//  Estimated: `4387`
+		// Minimum execution time: 21_089 nanoseconds.
+		Weight::from_parts(21_822_000, 4387)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: DexOracle AveragePrices (r:1 w:1)
-	// Proof Skipped: DexOracle AveragePrices (max_values: None, max_size: None, mode: Measured)
-	// Storage: DexOracle Cumulatives (r:0 w:1)
-	// Proof Skipped: DexOracle Cumulatives (max_values: None, max_size: None, mode: Measured)
+	// Storage: `DexOracle::AveragePrices` (r:1 w:1)
+	// Proof: `DexOracle::AveragePrices` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `DexOracle::Cumulatives` (r:0 w:1)
+	// Proof: `DexOracle::Cumulatives` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn disable_average_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `893`
-		//  Estimated: `5251`
-		// Minimum execution time: 14_626 nanoseconds.
-		Weight::from_parts(14_940_000, 5251)
+		//  Estimated: `4358`
+		// Minimum execution time: 13_287 nanoseconds.
+		Weight::from_parts(13_809_000, 4358)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: DexOracle AveragePrices (r:1 w:1)
-	// Proof Skipped: DexOracle AveragePrices (max_values: None, max_size: None, mode: Measured)
+	// Storage: `DexOracle::AveragePrices` (r:1 w:1)
+	// Proof: `DexOracle::AveragePrices` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_average_price_interval() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `893`
 		//  Estimated: `4358`
-		// Minimum execution time: 13_889 nanoseconds.
-		Weight::from_parts(14_296_000, 4358)
+		// Minimum execution time: 12_938 nanoseconds.
+		Weight::from_parts(13_364_000, 4358)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/acala/src/weights/module_emergency_shutdown.rs b/runtime/acala/src/weights/module_emergency_shutdown.rs
index 25ece0f301..637776d326 100644
--- a/runtime/acala/src/weights/module_emergency_shutdown.rs
+++ b/runtime/acala/src/weights/module_emergency_shutdown.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_emergency_shutdown
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,56 +47,56 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_emergency_shutdown.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_emergency_shutdown::WeightInfo for WeightInfo<T> {
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:1)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:1)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 4]`.
 	fn emergency_shutdown(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1284`
-		//  Estimated: `5086`
-		// Minimum execution time: 24_808 nanoseconds.
-		Weight::from_parts(25_820_697, 5086)
-			// Standard Error: 14_248
-			.saturating_add(Weight::from_parts(613_576, 0).saturating_mul(c.into()))
+		//  Measured:  `1318`
+		//  Estimated: `3600`
+		// Minimum execution time: 22_959 nanoseconds.
+		Weight::from_parts(23_961_033, 3600)
+			// Standard Error: 12_418
+			.saturating_add(Weight::from_parts(499_756, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: EmergencyShutdown CanRefund (r:0 w:1)
-	// Proof: EmergencyShutdown CanRefund (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `EmergencyShutdown::CanRefund` (r:0 w:1)
+	// Proof: `EmergencyShutdown::CanRefund` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn open_collateral_refund() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1308`
-		//  Estimated: `5086`
-		// Minimum execution time: 24_565 nanoseconds.
-		Weight::from_parts(25_083_000, 5086)
+		//  Measured:  `1342`
+		//  Estimated: `3600`
+		// Minimum execution time: 22_647 nanoseconds.
+		Weight::from_parts(23_112_000, 3600)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EmergencyShutdown CanRefund (r:1 w:0)
-	// Proof: EmergencyShutdown CanRefund (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::CanRefund` (r:1 w:0)
+	// Proof: `EmergencyShutdown::CanRefund` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 4]`.
 	fn refund_collaterals(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1991 + c * (45 ±0)`
-		//  Estimated: `15755`
-		// Minimum execution time: 59_999 nanoseconds.
-		Weight::from_parts(62_534_150, 15755)
-			// Standard Error: 27_516
-			.saturating_add(Weight::from_parts(2_044_175, 0).saturating_mul(c.into()))
+		//  Measured:  `2025 + c * (45 ±0)`
+		//  Estimated: `3612`
+		// Minimum execution time: 55_893 nanoseconds.
+		Weight::from_parts(58_323_946, 3612)
+			// Standard Error: 26_362
+			.saturating_add(Weight::from_parts(2_081_803, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/runtime/acala/src/weights/module_evm.rs b/runtime/acala/src/weights/module_evm.rs
index 65cd68a869..303e45ffc4 100644
--- a/runtime/acala/src/weights/module_evm.rs
+++ b/runtime/acala/src/weights/module_evm.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_evm
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,242 +47,242 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_evm.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_evm::WeightInfo for WeightInfo<T> {
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:2 w:2)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM CodeInfos (r:2 w:1)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:1)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:2 w:2)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::CodeInfos` (r:2 w:1)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:1)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn create() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1591`
-		//  Estimated: `43766`
-		// Minimum execution time: 150_535 nanoseconds.
-		Weight::from_parts(153_962_000, 43766)
+		//  Measured:  `1625`
+		//  Estimated: `7565`
+		// Minimum execution time: 137_367 nanoseconds.
+		Weight::from_parts(139_320_000, 7565)
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:2 w:2)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM CodeInfos (r:2 w:1)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:1)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:2 w:2)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::CodeInfos` (r:2 w:1)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:1)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn create2() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1591`
-		//  Estimated: `43766`
-		// Minimum execution time: 147_644 nanoseconds.
-		Weight::from_parts(149_936_000, 43766)
+		//  Measured:  `1625`
+		//  Estimated: `7565`
+		// Minimum execution time: 131_621 nanoseconds.
+		Weight::from_parts(134_476_000, 7565)
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM NetworkContractIndex (r:1 w:1)
-	// Proof Skipped: EVM NetworkContractIndex (max_values: Some(1), 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: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:2 w:2)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM CodeInfos (r:2 w:1)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:1)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::NetworkContractIndex` (r:1 w:1)
+	// Proof: `EVM::NetworkContractIndex` (`max_values`: Some(1), `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: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:2 w:2)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::CodeInfos` (r:2 w:1)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:1)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn create_nft_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1558`
-		//  Estimated: `43152`
-		// Minimum execution time: 166_017 nanoseconds.
-		Weight::from_parts(169_711_000, 43152)
+		//  Measured:  `1594`
+		//  Estimated: `7534`
+		// Minimum execution time: 167_613 nanoseconds.
+		Weight::from_parts(170_981_000, 7534)
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(10))
 	}
-	// Storage: EVM Accounts (r:2 w:2)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: EVM CodeInfos (r:2 w:1)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:1)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EVM::Accounts` (r:2 w:2)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `EVM::CodeInfos` (r:2 w:1)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:1)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn create_predeploy_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1506`
-		//  Estimated: `39901`
-		// Minimum execution time: 167_114 nanoseconds.
-		Weight::from_parts(170_746_000, 39901)
+		//  Measured:  `1542`
+		//  Estimated: `7482`
+		// Minimum execution time: 170_234 nanoseconds.
+		Weight::from_parts(175_169_000, 7482)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:2 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: EVM Codes (r:1 w:0)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:2 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Codes` (r:1 w:0)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2365`
-		//  Estimated: `42022`
-		// Minimum execution time: 139_142 nanoseconds.
-		Weight::from_parts(141_433_000, 42022)
+		//  Measured:  `2399`
+		//  Estimated: `8339`
+		// Minimum execution time: 128_213 nanoseconds.
+		Weight::from_parts(130_658_000, 8339)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: EVM Accounts (r:1 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `EVM::Accounts` (r:1 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn transfer_maintainer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1930`
-		//  Estimated: `8920`
-		// Minimum execution time: 101_924 nanoseconds.
-		Weight::from_parts(103_398_000, 8920)
+		//  Measured:  `1809`
+		//  Estimated: `5274`
+		// Minimum execution time: 92_337 nanoseconds.
+		Weight::from_parts(93_392_000, 5274)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:1 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:1 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn publish_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2323`
-		//  Estimated: `9313`
-		// Minimum execution time: 123_554 nanoseconds.
-		Weight::from_parts(125_031_000, 9313)
+		//  Measured:  `2280`
+		//  Estimated: `5745`
+		// Minimum execution time: 131_388 nanoseconds.
+		Weight::from_parts(133_008_000, 5745)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EVM Accounts (r:1 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EVM::Accounts` (r:1 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn publish_free() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1821`
-		//  Estimated: `5286`
-		// Minimum execution time: 28_807 nanoseconds.
-		Weight::from_parts(30_384_000, 5286)
+		//  Measured:  `1700`
+		//  Estimated: `5165`
+		// Minimum execution time: 27_778 nanoseconds.
+		Weight::from_parts(28_468_000, 5165)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	fn enable_contract_development() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1367`
+		//  Measured:  `1401`
 		//  Estimated: `3633`
-		// Minimum execution time: 104_538 nanoseconds.
-		Weight::from_parts(105_790_000, 3633)
+		// Minimum execution time: 97_250 nanoseconds.
+		Weight::from_parts(98_344_000, 3633)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	fn disable_contract_development() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1455`
+		//  Measured:  `1489`
 		//  Estimated: `3633`
-		// Minimum execution time: 106_114 nanoseconds.
-		Weight::from_parts(106_859_000, 3633)
+		// Minimum execution time: 99_113 nanoseconds.
+		Weight::from_parts(99_908_000, 3633)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EVM Accounts (r:1 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM CodeInfos (r:2 w:2)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:2)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EVM::Accounts` (r:1 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::CodeInfos` (r:2 w:2)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:2)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 61440]`.
 	fn set_code(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2536`
-		//  Estimated: `42468`
-		// Minimum execution time: 178_431 nanoseconds.
-		Weight::from_parts(175_424_178, 42468)
+		//  Measured:  `2415`
+		//  Estimated: `8355`
+		// Minimum execution time: 157_330 nanoseconds.
+		Weight::from_parts(153_803_378, 8355)
 			// Standard Error: 13
-			.saturating_add(Weight::from_parts(5_591, 0).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(5_427, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: EvmAccounts EvmAddresses (r:2 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:1 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM CodeInfos (r:1 w:1)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: IdleScheduler NextTaskId (r:1 w:1)
-	// Proof Skipped: IdleScheduler NextTaskId (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, 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 Accounts (r:1 w:0)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: IdleScheduler Tasks (r:0 w:1)
-	// Proof Skipped: IdleScheduler Tasks (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:1)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::EvmAddresses` (r:2 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:1 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::CodeInfos` (r:1 w:1)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `IdleScheduler::NextTaskId` (r:1 w:1)
+	// Proof: `IdleScheduler::NextTaskId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, 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::Accounts` (r:1 w:0)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `IdleScheduler::Tasks` (r:0 w:1)
+	// Proof: `IdleScheduler::Tasks` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:1)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn selfdestruct() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2696`
-		//  Estimated: `51014`
-		// Minimum execution time: 191_395 nanoseconds.
-		Weight::from_parts(195_307_000, 51014)
+		//  Measured:  `2575`
+		//  Estimated: `6060`
+		// Minimum execution time: 182_376 nanoseconds.
+		Weight::from_parts(186_010_000, 6060)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
diff --git a/runtime/acala/src/weights/module_evm_accounts.rs b/runtime/acala/src/weights/module_evm_accounts.rs
index fd184bdb4a..1581e09fd5 100644
--- a/runtime/acala/src/weights/module_evm_accounts.rs
+++ b/runtime/acala/src/weights/module_evm_accounts.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_evm_accounts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,35 +47,35 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_evm_accounts.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_evm_accounts::WeightInfo for WeightInfo<T> {
-	// Storage: EvmAccounts EvmAddresses (r:1 w:1)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EvmAccounts Accounts (r:1 w:1)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM ChainId (r:1 w:0)
-	// Proof Skipped: EVM ChainId (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: System BlockHash (r:1 w:0)
-	// Proof: System BlockHash (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:0)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:1)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::Accounts` (r:1 w:1)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::ChainId` (r:1 w:0)
+	// Proof: `EVM::ChainId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::BlockHash` (r:1 w:0)
+	// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:0)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_account() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1448`
-		//  Estimated: `17085`
-		// Minimum execution time: 84_779 nanoseconds.
-		Weight::from_parts(86_230_000, 17085)
+		//  Measured:  `1482`
+		//  Estimated: `3593`
+		// Minimum execution time: 81_762 nanoseconds.
+		Weight::from_parts(83_069_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: EvmAccounts EvmAddresses (r:1 w:1)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EvmAccounts Accounts (r:0 w:1)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:1)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::Accounts` (r:0 w:1)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn claim_default_account() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1072`
+		//  Measured:  `1106`
 		//  Estimated: `3525`
-		// Minimum execution time: 23_283 nanoseconds.
-		Weight::from_parts(23_893_000, 3525)
+		// Minimum execution time: 20_822 nanoseconds.
+		Weight::from_parts(21_530_000, 3525)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/runtime/acala/src/weights/module_homa.rs b/runtime/acala/src/weights/module_homa.rs
index 14b0fffcdb..98422a622b 100644
--- a/runtime/acala/src/weights/module_homa.rs
+++ b/runtime/acala/src/weights/module_homa.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_homa
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,232 +47,232 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_homa.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_homa::WeightInfo for WeightInfo<T> {
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa LastEraBumpedBlock (r:1 w:0)
-	// Proof Skipped: Homa LastEraBumpedBlock (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa BumpEraFrequency (r:1 w:0)
-	// Proof Skipped: Homa BumpEraFrequency (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::LastEraBumpedBlock` (r:1 w:0)
+	// Proof: `Homa::LastEraBumpedBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::BumpEraFrequency` (r:1 w:0)
+	// Proof: `Homa::BumpEraFrequency` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn on_initialize() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `828`
-		//  Estimated: `6939`
-		// Minimum execution time: 7_654 nanoseconds.
-		Weight::from_parts(7_919_000, 6939)
+		//  Estimated: `2313`
+		// Minimum execution time: 7_109 nanoseconds.
+		Weight::from_parts(7_437_000, 2313)
 			.saturating_add(T::DbWeight::get().reads(3))
 	}
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa LastEraBumpedBlock (r:1 w:1)
-	// Proof Skipped: Homa LastEraBumpedBlock (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa BumpEraFrequency (r:1 w:0)
-	// Proof Skipped: Homa BumpEraFrequency (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa RelayChainCurrentEra (r:1 w:1)
-	// Proof Skipped: Homa RelayChainCurrentEra (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa EstimatedRewardRatePerEra (r:1 w:0)
-	// Proof Skipped: Homa EstimatedRewardRatePerEra (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa StakingLedgers (r:2 w:1)
-	// Proof Skipped: Homa StakingLedgers (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:1)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa CommissionRate (r:1 w:0)
-	// Proof Skipped: Homa CommissionRate (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:2)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: XcmInterface XcmDestWeightAndFee (r:4 w:0)
-	// Proof Skipped: XcmInterface XcmDestWeightAndFee (max_values: None, max_size: None, mode: Measured)
-	// Storage: ParachainInfo ParachainId (r:1 w:0)
-	// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: 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: Homa UnclaimedRedemption (r:1 w:1)
-	// Proof Skipped: Homa UnclaimedRedemption (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:1)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa SoftBondedCapPerSubAccount (r:1 w:0)
-	// Proof Skipped: Homa SoftBondedCapPerSubAccount (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: EVM XcmOrigin (r:1 w:1)
-	// Proof Skipped: EVM XcmOrigin (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: UnknownTokens ConcreteFungibleBalances (r:1 w:0)
-	// Proof Skipped: UnknownTokens ConcreteFungibleBalances (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa RedeemRequests (r:2 w:1)
-	// Proof Skipped: Homa RedeemRequests (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa Unbondings (r:1 w:1)
-	// Proof Skipped: Homa Unbondings (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalVoidLiquid (r:0 w:1)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::LastEraBumpedBlock` (r:1 w:1)
+	// Proof: `Homa::LastEraBumpedBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::BumpEraFrequency` (r:1 w:0)
+	// Proof: `Homa::BumpEraFrequency` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::RelayChainCurrentEra` (r:1 w:1)
+	// Proof: `Homa::RelayChainCurrentEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::EstimatedRewardRatePerEra` (r:1 w:0)
+	// Proof: `Homa::EstimatedRewardRatePerEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::StakingLedgers` (r:2 w:1)
+	// Proof: `Homa::StakingLedgers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:1)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::CommissionRate` (r:1 w:0)
+	// Proof: `Homa::CommissionRate` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:2)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `XcmInterface::XcmDestWeightAndFee` (r:4 w:0)
+	// Proof: `XcmInterface::XcmDestWeightAndFee` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `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: `Homa::UnclaimedRedemption` (r:1 w:1)
+	// Proof: `Homa::UnclaimedRedemption` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:1)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::SoftBondedCapPerSubAccount` (r:1 w:0)
+	// Proof: `Homa::SoftBondedCapPerSubAccount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::XcmOrigin` (r:1 w:1)
+	// Proof: `EVM::XcmOrigin` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `UnknownTokens::ConcreteFungibleBalances` (r:1 w:0)
+	// Proof: `UnknownTokens::ConcreteFungibleBalances` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::RedeemRequests` (r:2 w:1)
+	// Proof: `Homa::RedeemRequests` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::Unbondings` (r:1 w:1)
+	// Proof: `Homa::Unbondings` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalVoidLiquid` (r:0 w:1)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn on_initialize_with_bump_era() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2932`
-		//  Estimated: `142559`
-		// Minimum execution time: 371_858 nanoseconds.
-		Weight::from_parts(381_282_000, 142559)
+		//  Measured:  `2966`
+		//  Estimated: `13856`
+		// Minimum execution time: 343_951 nanoseconds.
+		Weight::from_parts(355_942_000, 13856)
 			.saturating_add(T::DbWeight::get().reads(34))
 			.saturating_add(T::DbWeight::get().writes(19))
 	}
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:1)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa SoftBondedCapPerSubAccount (r:1 w:0)
-	// Proof Skipped: Homa SoftBondedCapPerSubAccount (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, 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(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:1)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa EstimatedRewardRatePerEra (r:1 w:0)
-	// Proof Skipped: Homa EstimatedRewardRatePerEra (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:1)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::SoftBondedCapPerSubAccount` (r:1 w:0)
+	// Proof: `Homa::SoftBondedCapPerSubAccount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, 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(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:1)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::EstimatedRewardRatePerEra` (r:1 w:0)
+	// Proof: `Homa::EstimatedRewardRatePerEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn mint() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1672`
-		//  Estimated: `31766`
-		// Minimum execution time: 88_890 nanoseconds.
-		Weight::from_parts(91_599_000, 31766)
+		//  Measured:  `1706`
+		//  Estimated: `8856`
+		// Minimum execution time: 82_662 nanoseconds.
+		Weight::from_parts(85_326_000, 8856)
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	// Storage: Homa RedeemRequests (r:1 w:1)
-	// Proof Skipped: Homa RedeemRequests (max_values: None, max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Homa::RedeemRequests` (r:1 w:1)
+	// Proof: `Homa::RedeemRequests` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn request_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1581`
-		//  Estimated: `14873`
-		// Minimum execution time: 59_340 nanoseconds.
-		Weight::from_parts(60_400_000, 14873)
+		//  Measured:  `1615`
+		//  Estimated: `6234`
+		// Minimum execution time: 53_949 nanoseconds.
+		Weight::from_parts(55_033_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: Homa RedeemRequests (r:50 w:50)
-	// Proof Skipped: Homa RedeemRequests (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:1)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa FastMatchFeeRate (r:1 w:0)
-	// Proof Skipped: Homa FastMatchFeeRate (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:52 w:52)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:51 w:51)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Homa::RedeemRequests` (r:50 w:50)
+	// Proof: `Homa::RedeemRequests` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:1)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::FastMatchFeeRate` (r:1 w:0)
+	// Proof: `Homa::FastMatchFeeRate` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:52 w:52)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:51 w:51)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 50]`.
 	fn fast_match_redeems(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1921 + n * (295 ±0)`
-		//  Estimated: `29894 + n * (9175 ±0)`
-		// Minimum execution time: 102_002 nanoseconds.
-		Weight::from_parts(37_555_703, 29894)
-			// Standard Error: 25_740
-			.saturating_add(Weight::from_parts(58_940_161, 0).saturating_mul(n.into()))
+		//  Measured:  `1955 + n * (295 ±0)`
+		//  Estimated: `6234 + n * (2770 ±0)`
+		// Minimum execution time: 94_862 nanoseconds.
+		Weight::from_parts(33_414_349, 6234)
+			// Standard Error: 27_635
+			.saturating_add(Weight::from_parts(55_154_284, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(5))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 9175).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(0, 2770).saturating_mul(n.into()))
 	}
-	// Storage: Homa RelayChainCurrentEra (r:1 w:0)
-	// Proof Skipped: Homa RelayChainCurrentEra (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa Unbondings (r:2 w:1)
-	// Proof Skipped: Homa Unbondings (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa UnclaimedRedemption (r:1 w:1)
-	// Proof Skipped: Homa UnclaimedRedemption (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Homa::RelayChainCurrentEra` (r:1 w:0)
+	// Proof: `Homa::RelayChainCurrentEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::Unbondings` (r:2 w:1)
+	// Proof: `Homa::Unbondings` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::UnclaimedRedemption` (r:1 w:1)
+	// Proof: `Homa::UnclaimedRedemption` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn claim_redemption() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1791`
-		//  Estimated: `30238`
-		// Minimum execution time: 82_829 nanoseconds.
-		Weight::from_parts(84_423_000, 30238)
+		//  Measured:  `1825`
+		//  Estimated: `7765`
+		// Minimum execution time: 77_054 nanoseconds.
+		Weight::from_parts(78_713_000, 7765)
 			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: Homa EstimatedRewardRatePerEra (r:1 w:1)
-	// Proof Skipped: Homa EstimatedRewardRatePerEra (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa CommissionRate (r:1 w:1)
-	// Proof Skipped: Homa CommissionRate (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa FastMatchFeeRate (r:1 w:1)
-	// Proof Skipped: Homa FastMatchFeeRate (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa SoftBondedCapPerSubAccount (r:0 w:1)
-	// Proof Skipped: Homa SoftBondedCapPerSubAccount (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `Homa::EstimatedRewardRatePerEra` (r:1 w:1)
+	// Proof: `Homa::EstimatedRewardRatePerEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::CommissionRate` (r:1 w:1)
+	// Proof: `Homa::CommissionRate` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::FastMatchFeeRate` (r:1 w:1)
+	// Proof: `Homa::FastMatchFeeRate` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::SoftBondedCapPerSubAccount` (r:0 w:1)
+	// Proof: `Homa::SoftBondedCapPerSubAccount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn update_homa_params() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1110`
-		//  Estimated: `8895`
-		// Minimum execution time: 37_198 nanoseconds.
-		Weight::from_parts(38_091_000, 8895)
+		//  Measured:  `1144`
+		//  Estimated: `2629`
+		// Minimum execution time: 33_669 nanoseconds.
+		Weight::from_parts(34_293_000, 2629)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa LastEraBumpedBlock (r:0 w:1)
-	// Proof Skipped: Homa LastEraBumpedBlock (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa BumpEraFrequency (r:0 w:1)
-	// Proof Skipped: Homa BumpEraFrequency (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::LastEraBumpedBlock` (r:0 w:1)
+	// Proof: `Homa::LastEraBumpedBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::BumpEraFrequency` (r:0 w:1)
+	// Proof: `Homa::BumpEraFrequency` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn update_bump_era_params() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1177`
-		//  Estimated: `5016`
-		// Minimum execution time: 27_517 nanoseconds.
-		Weight::from_parts(28_614_000, 5016)
+		//  Measured:  `1211`
+		//  Estimated: `2696`
+		// Minimum execution time: 26_269 nanoseconds.
+		Weight::from_parts(27_067_000, 2696)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: Homa StakingLedgers (r:10 w:10)
-	// Proof Skipped: Homa StakingLedgers (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:1)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `Homa::StakingLedgers` (r:10 w:10)
+	// Proof: `Homa::StakingLedgers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:1)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// The range of component `n` is `[0, 10]`.
 	fn reset_ledgers(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1110`
-		//  Estimated: `4695 + n * (2475 ±0)`
-		// Minimum execution time: 6_252 nanoseconds.
-		Weight::from_parts(14_696_791, 4695)
-			// Standard Error: 49_045
-			.saturating_add(Weight::from_parts(10_534_327, 0).saturating_mul(n.into()))
+		//  Measured:  `1144`
+		//  Estimated: `2629 + n * (2475 ±0)`
+		// Minimum execution time: 5_839 nanoseconds.
+		Weight::from_parts(13_190_648, 2629)
+			// Standard Error: 43_123
+			.saturating_add(Weight::from_parts(9_777_272, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(n.into()))
 	}
-	// Storage: Homa RelayChainCurrentEra (r:1 w:1)
-	// Proof Skipped: Homa RelayChainCurrentEra (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `Homa::RelayChainCurrentEra` (r:1 w:1)
+	// Proof: `Homa::RelayChainCurrentEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn reset_current_era() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1110`
-		//  Estimated: `2595`
-		// Minimum execution time: 20_363 nanoseconds.
-		Weight::from_parts(21_058_000, 2595)
+		//  Measured:  `1144`
+		//  Estimated: `2629`
+		// Minimum execution time: 18_810 nanoseconds.
+		Weight::from_parts(19_427_000, 2629)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/acala/src/weights/module_honzon.rs b/runtime/acala/src/weights/module_honzon.rs
index 4b875368cb..242e5d17f9 100644
--- a/runtime/acala/src/weights/module_honzon.rs
+++ b/runtime/acala/src/weights/module_honzon.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_honzon
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,314 +47,314 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_honzon.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_honzon::WeightInfo for WeightInfo<T> {
-	// Storage: Honzon Authorization (r:1 w:1)
-	// Proof: Honzon Authorization (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `Honzon::Authorization` (r:1 w:1)
+	// Proof: `Honzon::Authorization` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	fn authorize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1413`
-		//  Estimated: `7245`
-		// Minimum execution time: 39_014 nanoseconds.
-		Weight::from_parts(39_835_000, 7245)
+		//  Measured:  `1447`
+		//  Estimated: `3633`
+		// Minimum execution time: 39_175 nanoseconds.
+		Weight::from_parts(40_463_000, 3633)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: Honzon Authorization (r:1 w:1)
-	// Proof: Honzon Authorization (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `Honzon::Authorization` (r:1 w:1)
+	// Proof: `Honzon::Authorization` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	fn unauthorize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1633`
-		//  Estimated: `7245`
-		// Minimum execution time: 42_977 nanoseconds.
-		Weight::from_parts(43_877_000, 7245)
+		//  Measured:  `1667`
+		//  Estimated: `3633`
+		// Minimum execution time: 43_488 nanoseconds.
+		Weight::from_parts(44_202_000, 3633)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: Honzon Authorization (r:4 w:4)
-	// Proof: Honzon Authorization (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `Honzon::Authorization` (r:4 w:4)
+	// Proof: `Honzon::Authorization` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 4]`.
 	fn unauthorize_all(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1257 + c * (177 ±0)`
-		//  Estimated: `4623 + c * (2622 ±0)`
-		// Minimum execution time: 23_554 nanoseconds.
-		Weight::from_parts(29_490_270, 4623)
-			// Standard Error: 186_686
-			.saturating_add(Weight::from_parts(6_785_256, 0).saturating_mul(c.into()))
+		//  Measured:  `1291 + c * (177 ±0)`
+		//  Estimated: `3633 + c * (2622 ±0)`
+		// Minimum execution time: 22_407 nanoseconds.
+		Weight::from_parts(28_862_485, 3633)
+			// Standard Error: 201_545
+			.saturating_add(Weight::from_parts(7_266_760, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
 			.saturating_add(Weight::from_parts(0, 2622).saturating_mul(c.into()))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn adjust_loan() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2215`
-		//  Estimated: `55620`
-		// Minimum execution time: 128_634 nanoseconds.
-		Weight::from_parts(131_146_000, 55620)
+		//  Measured:  `2398`
+		//  Estimated: `8338`
+		// Minimum execution time: 136_648 nanoseconds.
+		Weight::from_parts(139_266_000, 8338)
 			.saturating_add(T::DbWeight::get().reads(15))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Honzon Authorization (r:1 w:0)
-	// Proof: Honzon Authorization (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:2 w:2)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:2 w:2)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, 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: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Honzon::Authorization` (r:1 w:0)
+	// Proof: `Honzon::Authorization` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:2 w:2)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:2 w:2)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `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: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
 	fn transfer_loan_from() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2740`
-		//  Estimated: `58736`
-		// Minimum execution time: 111_424 nanoseconds.
-		Weight::from_parts(115_858_000, 58736)
+		//  Measured:  `2774`
+		//  Estimated: `8714`
+		// Minimum execution time: 104_201 nanoseconds.
+		Weight::from_parts(106_917_000, 8714)
 			.saturating_add(T::DbWeight::get().reads(16))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:3 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:10 w:10)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:4 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: CdpTreasury DebitPool (r:1 w:1)
-	// Proof: CdpTreasury DebitPool (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:0)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:4 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:4 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:2 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:3 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:10 w:10)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:4 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::DebitPool` (r:1 w:1)
+	// Proof: `CdpTreasury::DebitPool` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:0)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:4 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:4 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:2 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn close_loan_has_debit_by_dex() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `5678`
-		//  Estimated: `176305`
-		// Minimum execution time: 564_356 nanoseconds.
-		Weight::from_parts(567_969_000, 176305)
+		//  Measured:  `5745`
+		//  Estimated: `27210`
+		// Minimum execution time: 592_619 nanoseconds.
+		Weight::from_parts(597_525_000, 27210)
 			.saturating_add(T::DbWeight::get().reads(46))
 			.saturating_add(T::DbWeight::get().writes(20))
 	}
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:4 w:4)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:5 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:5 w:2)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:2 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:4 w:4)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:5 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:5 w:2)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:2 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn expand_position_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4712`
-		//  Estimated: `119258`
-		// Minimum execution time: 283_564 nanoseconds.
-		Weight::from_parts(287_716_000, 119258)
+		//  Measured:  `4746`
+		//  Estimated: `14340`
+		// Minimum execution time: 269_652 nanoseconds.
+		Weight::from_parts(274_147_000, 14340)
 			.saturating_add(T::DbWeight::get().reads(31))
 			.saturating_add(T::DbWeight::get().writes(12))
 	}
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:5 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:5 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:2 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:3 w:2)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:9 w:9)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:3 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:5 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:5 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:2 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:9 w:9)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:3 w:2)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:3 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
 	fn shrink_position_debit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `5217`
-		//  Estimated: `150597`
-		// Minimum execution time: 437_705 nanoseconds.
-		Weight::from_parts(442_937_000, 150597)
+		//  Measured:  `5251`
+		//  Estimated: `24588`
+		// Minimum execution time: 436_104 nanoseconds.
+		Weight::from_parts(442_053_000, 24588)
 			.saturating_add(T::DbWeight::get().reads(38))
 			.saturating_add(T::DbWeight::get().writes(18))
 	}
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:2 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:2 w:2)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Loans TotalPositions (r:2 w:2)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: CdpEngine DebitExchangeRate (r:2 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:3 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (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(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:2 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:2 w:2)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Loans::TotalPositions` (r:2 w:2)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:2 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:3 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn transfer_debit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2887`
-		//  Estimated: `68361`
-		// Minimum execution time: 169_264 nanoseconds.
-		Weight::from_parts(174_142_000, 68361)
+		//  Measured:  `2921`
+		//  Estimated: `8861`
+		// Minimum execution time: 158_492 nanoseconds.
+		Weight::from_parts(163_428_000, 8861)
 			.saturating_add(T::DbWeight::get().reads(20))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: Loans Positions (r:1 w:0)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:1 w:0)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `Loans::Positions` (r:1 w:0)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:0)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn precompile_get_current_collateral_ratio() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1988`
-		//  Estimated: `38613`
-		// Minimum execution time: 46_248 nanoseconds.
-		Weight::from_parts(47_777_000, 38613)
+		//  Estimated: `7928`
+		// Minimum execution time: 42_197 nanoseconds.
+		Weight::from_parts(43_826_000, 7928)
 			.saturating_add(T::DbWeight::get().reads(11))
 	}
 }
diff --git a/runtime/acala/src/weights/module_idle_scheduler.rs b/runtime/acala/src/weights/module_idle_scheduler.rs
index 3d9dce60ca..15f5d1e51d 100644
--- a/runtime/acala/src/weights/module_idle_scheduler.rs
+++ b/runtime/acala/src/weights/module_idle_scheduler.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_idle_scheduler
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,51 +47,51 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_idle_scheduler.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_idle_scheduler::WeightInfo for WeightInfo<T> {
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: IdleScheduler PreviousRelayBlockNumber (r:0 w:1)
-	// Proof Skipped: IdleScheduler PreviousRelayBlockNumber (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `IdleScheduler::PreviousRelayBlockNumber` (r:0 w:1)
+	// Proof: `IdleScheduler::PreviousRelayBlockNumber` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn on_initialize() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `681`
-		//  Estimated: `2847`
-		// Minimum execution time: 4_603 nanoseconds.
-		Weight::from_parts(4_760_000, 2847)
+		//  Estimated: `2166`
+		// Minimum execution time: 4_285 nanoseconds.
+		Weight::from_parts(4_434_000, 2166)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: IdleScheduler PreviousRelayBlockNumber (r:1 w:0)
-	// Proof Skipped: IdleScheduler PreviousRelayBlockNumber (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `IdleScheduler::PreviousRelayBlockNumber` (r:1 w:0)
+	// Proof: `IdleScheduler::PreviousRelayBlockNumber` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn on_idle_base() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `757`
-		//  Estimated: `4484`
-		// Minimum execution time: 6_521 nanoseconds.
-		Weight::from_parts(6_660_000, 4484)
+		//  Estimated: `2242`
+		// Minimum execution time: 5_908 nanoseconds.
+		Weight::from_parts(6_247_000, 2242)
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
-	// Storage: IdleScheduler Tasks (r:0 w:1)
-	// Proof Skipped: IdleScheduler Tasks (max_values: None, max_size: None, mode: Measured)
+	// Storage: `IdleScheduler::Tasks` (r:0 w:1)
+	// Proof: `IdleScheduler::Tasks` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn clear_tasks() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `831`
-		//  Estimated: `831`
-		// Minimum execution time: 11_890 nanoseconds.
-		Weight::from_parts(12_185_000, 831)
+		//  Measured:  `865`
+		//  Estimated: `865`
+		// Minimum execution time: 10_940 nanoseconds.
+		Weight::from_parts(11_222_000, 865)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: IdleScheduler NextTaskId (r:1 w:1)
-	// Proof Skipped: IdleScheduler NextTaskId (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: IdleScheduler Tasks (r:0 w:1)
-	// Proof Skipped: IdleScheduler Tasks (max_values: None, max_size: None, mode: Measured)
+	// Storage: `IdleScheduler::NextTaskId` (r:1 w:1)
+	// Proof: `IdleScheduler::NextTaskId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `IdleScheduler::Tasks` (r:0 w:1)
+	// Proof: `IdleScheduler::Tasks` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn schedule_task() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1039`
-		//  Estimated: `3563`
-		// Minimum execution time: 21_618 nanoseconds.
-		Weight::from_parts(22_103_000, 3563)
+		//  Measured:  `1073`
+		//  Estimated: `2558`
+		// Minimum execution time: 20_027 nanoseconds.
+		Weight::from_parts(20_374_000, 2558)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/runtime/acala/src/weights/module_incentives.rs b/runtime/acala/src/weights/module_incentives.rs
index ed8195e344..1492b0111a 100644
--- a/runtime/acala/src/weights/module_incentives.rs
+++ b/runtime/acala/src/weights/module_incentives.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_incentives
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,110 +47,110 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_incentives.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_incentives::WeightInfo for WeightInfo<T> {
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:5 w:0)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Incentives IncentiveRewardAmounts (r:8 w:0)
-	// Proof Skipped: Incentives IncentiveRewardAmounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: System Account (r:2 w:0)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:5 w:0)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Incentives::IncentiveRewardAmounts` (r:8 w:0)
+	// Proof: `Incentives::IncentiveRewardAmounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:1 w:0)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 4]`.
 	fn on_initialize(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1202 + c * (141 ±0)`
-		//  Estimated: `14734 + c * (7657 ±0)`
-		// Minimum execution time: 10_254 nanoseconds.
-		Weight::from_parts(12_920_739, 14734)
-			// Standard Error: 84_546
-			.saturating_add(Weight::from_parts(16_579_813, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 7657).saturating_mul(c.into()))
+		//  Measured:  `1293 + c * (198 ±0)`
+		//  Estimated: `4778 + c * (5029 ±0)`
+		// Minimum execution time: 9_611 nanoseconds.
+		Weight::from_parts(13_530_642, 4778)
+			// Standard Error: 127_076
+			.saturating_add(Weight::from_parts(17_031_478, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(c.into())))
+			.saturating_add(Weight::from_parts(0, 5029).saturating_mul(c.into()))
 	}
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn deposit_dex_share() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1806`
-		//  Estimated: `23894`
-		// Minimum execution time: 73_043 nanoseconds.
-		Weight::from_parts(75_246_000, 23894)
+		//  Measured:  `1840`
+		//  Estimated: `6234`
+		// Minimum execution time: 67_906 nanoseconds.
+		Weight::from_parts(69_674_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:0)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:0)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn withdraw_dex_share() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1846`
-		//  Estimated: `20449`
-		// Minimum execution time: 72_729 nanoseconds.
-		Weight::from_parts(74_114_000, 20449)
+		//  Measured:  `1880`
+		//  Estimated: `6234`
+		// Minimum execution time: 67_294 nanoseconds.
+		Weight::from_parts(68_783_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Incentives PendingMultiRewards (r:1 w:1)
-	// Proof Skipped: Incentives PendingMultiRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Incentives ClaimRewardDeductionRates (r:1 w:0)
-	// Proof Skipped: Incentives ClaimRewardDeductionRates (max_values: None, 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: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Incentives::PendingMultiRewards` (r:1 w:1)
+	// Proof: `Incentives::PendingMultiRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Incentives::ClaimRewardDeductionRates` (r:1 w:0)
+	// Proof: `Incentives::ClaimRewardDeductionRates` (`max_values`: None, `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: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn claim_rewards() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1814`
-		//  Estimated: `28234`
-		// Minimum execution time: 78_058 nanoseconds.
-		Weight::from_parts(79_435_000, 28234)
+		//  Measured:  `1892`
+		//  Estimated: `5357`
+		// Minimum execution time: 97_008 nanoseconds.
+		Weight::from_parts(98_587_000, 5357)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: Incentives IncentiveRewardAmounts (r:4 w:4)
-	// Proof Skipped: Incentives IncentiveRewardAmounts (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Incentives::IncentiveRewardAmounts` (r:4 w:4)
+	// Proof: `Incentives::IncentiveRewardAmounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 4]`.
 	fn update_incentive_rewards(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `750 + c * (84 ±0)`
-		//  Estimated: `1995 + c * (2475 ±0)`
-		// Minimum execution time: 6_230 nanoseconds.
-		Weight::from_parts(9_565_008, 1995)
-			// Standard Error: 104_707
-			.saturating_add(Weight::from_parts(9_132_537, 0).saturating_mul(c.into()))
+		//  Measured:  `759 + c * (93 ±0)`
+		//  Estimated: `2029 + c * (2475 ±0)`
+		// Minimum execution time: 5_863 nanoseconds.
+		Weight::from_parts(8_887_375, 2029)
+			// Standard Error: 97_035
+			.saturating_add(Weight::from_parts(8_449_541, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(c.into()))
 	}
-	// Storage: Incentives ClaimRewardDeductionRates (r:4 w:4)
-	// Proof Skipped: Incentives ClaimRewardDeductionRates (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Incentives::ClaimRewardDeductionRates` (r:4 w:4)
+	// Proof: `Incentives::ClaimRewardDeductionRates` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 4]`.
 	fn update_claim_reward_deduction_rates(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `676 + c * (10 ±0)`
 		//  Estimated: `1698 + c * (2475 ±0)`
-		// Minimum execution time: 6_029 nanoseconds.
-		Weight::from_parts(7_050_387, 1698)
-			// Standard Error: 22_302
-			.saturating_add(Weight::from_parts(2_190_805, 0).saturating_mul(c.into()))
+		// Minimum execution time: 5_792 nanoseconds.
+		Weight::from_parts(6_576_619, 1698)
+			// Standard Error: 17_974
+			.saturating_add(Weight::from_parts(2_056_951, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(c.into()))
diff --git a/runtime/acala/src/weights/module_liquid_crowdloan.rs b/runtime/acala/src/weights/module_liquid_crowdloan.rs
index 4f9cc877b6..0fa0b0221c 100644
--- a/runtime/acala/src/weights/module_liquid_crowdloan.rs
+++ b/runtime/acala/src/weights/module_liquid_crowdloan.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_liquid_crowdloan
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-34-64`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -30,9 +30,8 @@
 // --chain=acala-dev
 // --steps=50
 // --repeat=20
-// --pallet=module_liquid_crowdloan
+// --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,54 +47,56 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_liquid_crowdloan.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_liquid_crowdloan::WeightInfo for WeightInfo<T> {
-	// Storage: Tokens Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:2 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `LiquidCrowdloan::RedeemCurrencyId` (r:1 w:0)
+	// Proof: `LiquidCrowdloan::RedeemCurrencyId` (`max_values`: Some(1), `max_size`: Some(43), added: 538, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:2 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1883`
-		//  Estimated: `22041`
-		// Minimum execution time: 84_404 nanoseconds.
-		Weight::from_parts(86_781_000, 22041)
-			.saturating_add(T::DbWeight::get().reads(7))
+		//  Measured:  `1887`
+		//  Estimated: `8856`
+		// Minimum execution time: 80_310 nanoseconds.
+		Weight::from_parts(81_821_000, 8856)
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: XcmInterface XcmDestWeightAndFee (r:1 w:0)
-	// Proof Skipped: XcmInterface XcmDestWeightAndFee (max_values: None, max_size: None, mode: Measured)
-	// Storage: ParachainInfo ParachainId (r:1 w:0)
-	// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: 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: `XcmInterface::XcmDestWeightAndFee` (r:1 w:0)
+	// Proof: `XcmInterface::XcmDestWeightAndFee` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `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 transfer_from_crowdloan_vault() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1392`
-		//  Estimated: `22711`
-		// Minimum execution time: 56_316 nanoseconds.
-		Weight::from_parts(57_458_000, 22711)
+		//  Estimated: `4857`
+		// Minimum execution time: 52_593 nanoseconds.
+		Weight::from_parts(54_559_000, 4857)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-
+	// Storage: `LiquidCrowdloan::RedeemCurrencyId` (r:0 w:1)
+	// Proof: `LiquidCrowdloan::RedeemCurrencyId` (`max_values`: Some(1), `max_size`: Some(43), added: 538, mode: `MaxEncodedLen`)
 	fn set_redeem_currency_id() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1392`
-		//  Estimated: `22711`
-		// Minimum execution time: 56_316 nanoseconds.
-		Weight::from_parts(57_458_000, 22711)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `997`
+		//  Estimated: `0`
+		// Minimum execution time: 14_276 nanoseconds.
+		Weight::from_parts(14_585_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/runtime/acala/src/weights/module_nft.rs b/runtime/acala/src/weights/module_nft.rs
index ef0403a768..25a9a6bad8 100644
--- a/runtime/acala/src/weights/module_nft.rs
+++ b/runtime/acala/src/weights/module_nft.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_nft
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,141 +47,139 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_nft.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_nft::WeightInfo for WeightInfo<T> {
-	// Storage: OrmlNFT NextClassId (r:1 w:1)
-	// Proof Skipped: OrmlNFT NextClassId (max_values: Some(1), 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: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: Proxy Proxies (r:1 w:1)
-	// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	// Storage: OrmlNFT Classes (r:0 w:1)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::NextClassId` (r:1 w:1)
+	// Proof: `OrmlNFT::NextClassId` (`max_values`: Some(1), `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: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `Proxy::Proxies` (r:1 w:1)
+	// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::Classes` (r:0 w:1)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn create_class() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `385`
-		//  Estimated: `16790`
-		// Minimum execution time: 77_662 nanoseconds.
-		Weight::from_parts(79_557_000, 16790)
+		//  Estimated: `6196`
+		// Minimum execution time: 92_730 nanoseconds.
+		Weight::from_parts(94_361_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:1)
-	// Proof Skipped: OrmlNFT Classes (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: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: OrmlNFT NextTokenId (r:1 w:1)
-	// Proof Skipped: OrmlNFT NextTokenId (max_values: None, max_size: None, mode: Measured)
-	// Storage: OrmlNFT Tokens (r:0 w:999)
-	// Proof Skipped: OrmlNFT Tokens (max_values: None, max_size: None, mode: Measured)
-	// Storage: OrmlNFT TokensByOwner (r:0 w:999)
-	// Proof Skipped: OrmlNFT TokensByOwner (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:1)
+	// Proof: `OrmlNFT::Classes` (`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: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::NextTokenId` (r:1 w:1)
+	// Proof: `OrmlNFT::NextTokenId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `OrmlNFT::Tokens` (r:0 w:999)
+	// Proof: `OrmlNFT::Tokens` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `OrmlNFT::TokensByOwner` (r:0 w:999)
+	// Proof: `OrmlNFT::TokensByOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `i` is `[1, 1000]`.
 	fn mint(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2496`
-		//  Estimated: `26743`
-		// Minimum execution time: 96_040 nanoseconds.
-		Weight::from_parts(96_689_000, 26743)
-			// Standard Error: 12_592
-			.saturating_add(Weight::from_parts(24_127_761, 0).saturating_mul(i.into()))
+		//  Estimated: `6196`
+		// Minimum execution time: 112_156 nanoseconds.
+		Weight::from_parts(50_397_834, 6196)
+			// Standard Error: 11_646
+			.saturating_add(Weight::from_parts(22_699_212, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(5))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(i.into())))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:0)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
-	// Storage: OrmlNFT Tokens (r:1 w:1)
-	// Proof Skipped: OrmlNFT Tokens (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: OrmlNFT TokensByOwner (r:0 w:2)
-	// Proof Skipped: OrmlNFT TokensByOwner (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:0)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `OrmlNFT::Tokens` (r:1 w:1)
+	// Proof: `OrmlNFT::Tokens` (`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: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::TokensByOwner` (r:0 w:2)
+	// Proof: `OrmlNFT::TokensByOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4849`
-		//  Estimated: `37474`
-		// Minimum execution time: 101_997 nanoseconds.
-		Weight::from_parts(103_841_000, 37474)
-			.saturating_add(T::DbWeight::get().reads(7))
+		//  Measured:  `4845`
+		//  Estimated: `8310`
+		// Minimum execution time: 113_137 nanoseconds.
+		Weight::from_parts(114_618_000, 8310)
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:1)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
-	// Storage: OrmlNFT Tokens (r:1 w:1)
-	// Proof Skipped: OrmlNFT Tokens (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: OrmlNFT TokensByOwner (r:0 w:1)
-	// Proof Skipped: OrmlNFT TokensByOwner (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:1)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `OrmlNFT::Tokens` (r:1 w:1)
+	// Proof: `OrmlNFT::Tokens` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::TokensByOwner` (r:0 w:1)
+	// Proof: `OrmlNFT::TokensByOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn burn() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4744`
-		//  Estimated: `28388`
-		// Minimum execution time: 74_661 nanoseconds.
-		Weight::from_parts(76_073_000, 28388)
+		//  Estimated: `8209`
+		// Minimum execution time: 74_456 nanoseconds.
+		Weight::from_parts(76_072_000, 8209)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:1)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
-	// Storage: OrmlNFT Tokens (r:1 w:1)
-	// Proof Skipped: OrmlNFT Tokens (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: OrmlNFT TokensByOwner (r:0 w:1)
-	// Proof Skipped: OrmlNFT TokensByOwner (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:1)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `OrmlNFT::Tokens` (r:1 w:1)
+	// Proof: `OrmlNFT::Tokens` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::TokensByOwner` (r:0 w:1)
+	// Proof: `OrmlNFT::TokensByOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `b` is `[0, 3670016]`.
 	fn burn_with_remark(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4744`
-		//  Estimated: `28388`
-		// Minimum execution time: 75_268 nanoseconds.
-		Weight::from_parts(76_202_000, 28388)
+		//  Estimated: `8209`
+		// Minimum execution time: 75_269 nanoseconds.
+		Weight::from_parts(76_376_000, 8209)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_727, 0).saturating_mul(b.into()))
+			.saturating_add(Weight::from_parts(1_663, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:1)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Proxy Proxies (r:1 w:1)
-	// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: OrmlNFT NextTokenId (r:0 w:1)
-	// Proof Skipped: OrmlNFT NextTokenId (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:1)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Proxy::Proxies` (r:1 w:1)
+	// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::NextTokenId` (r:0 w:1)
+	// Proof: `OrmlNFT::NextTokenId` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn destroy_class() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2831`
-		//  Estimated: `27187`
-		// Minimum execution time: 89_405 nanoseconds.
-		Weight::from_parts(91_949_000, 27187)
+		//  Estimated: `6296`
+		// Minimum execution time: 109_392 nanoseconds.
+		Weight::from_parts(110_808_000, 6296)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:1)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:1)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_class_properties() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2339`
 		//  Estimated: `5804`
-		// Minimum execution time: 21_003 nanoseconds.
-		Weight::from_parts(21_535_000, 5804)
+		// Minimum execution time: 19_692 nanoseconds.
+		Weight::from_parts(20_224_000, 5804)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/acala/src/weights/module_prices.rs b/runtime/acala/src/weights/module_prices.rs
index 701f89f2a3..f8d2cfd9b6 100644
--- a/runtime/acala/src/weights/module_prices.rs
+++ b/runtime/acala/src/weights/module_prices.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_prices
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,29 +47,29 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_prices.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_prices::WeightInfo for WeightInfo<T> {
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: Prices LockedPrice (r:0 w:1)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Prices::LockedPrice` (r:0 w:1)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn lock_price() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1388`
-		//  Estimated: `8393`
-		// Minimum execution time: 29_722 nanoseconds.
-		Weight::from_parts(30_652_000, 8393)
+		//  Measured:  `1422`
+		//  Estimated: `4887`
+		// Minimum execution time: 27_691 nanoseconds.
+		Weight::from_parts(28_565_000, 4887)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Prices LockedPrice (r:1 w:1)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `Prices::LockedPrice` (r:1 w:1)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn unlock_price() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1055`
+		//  Measured:  `1089`
 		//  Estimated: `3532`
-		// Minimum execution time: 23_098 nanoseconds.
-		Weight::from_parts(23_751_000, 3532)
+		// Minimum execution time: 21_458 nanoseconds.
+		Weight::from_parts(21_998_000, 3532)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/acala/src/weights/module_session_manager.rs b/runtime/acala/src/weights/module_session_manager.rs
index 96dc3da1be..9ff7cc1e57 100644
--- a/runtime/acala/src/weights/module_session_manager.rs
+++ b/runtime/acala/src/weights/module_session_manager.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_session_manager
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,71 +47,71 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_session_manager.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_session_manager::WeightInfo for WeightInfo<T> {
-	// Storage: Session CurrentIndex (r:1 w:0)
-	// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: SessionManager SessionDuration (r:1 w:0)
-	// Proof: SessionManager SessionDuration (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: SessionManager DurationOffset (r:1 w:0)
-	// Proof: SessionManager DurationOffset (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: SessionManager SessionDurationChanges (r:0 w:1)
-	// Proof: SessionManager SessionDurationChanges (max_values: None, max_size: Some(20), added: 2495, mode: MaxEncodedLen)
+	// Storage: `Session::CurrentIndex` (r:1 w:0)
+	// Proof: `Session::CurrentIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `SessionManager::SessionDuration` (r:1 w:0)
+	// Proof: `SessionManager::SessionDuration` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::DurationOffset` (r:1 w:0)
+	// Proof: `SessionManager::DurationOffset` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::SessionDurationChanges` (r:0 w:1)
+	// Proof: `SessionManager::SessionDurationChanges` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	fn schedule_session_duration() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1489`
-		//  Estimated: `5952`
-		// Minimum execution time: 25_541 nanoseconds.
-		Weight::from_parts(26_039_000, 5952)
+		//  Measured:  `1523`
+		//  Estimated: `3008`
+		// Minimum execution time: 23_552 nanoseconds.
+		Weight::from_parts(24_240_000, 3008)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: SessionManager SessionDurationChanges (r:1 w:1)
-	// Proof: SessionManager SessionDurationChanges (max_values: None, max_size: Some(20), added: 2495, mode: MaxEncodedLen)
+	// Storage: `SessionManager::SessionDurationChanges` (r:1 w:1)
+	// Proof: `SessionManager::SessionDurationChanges` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	fn on_initialize_skip() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `809`
 		//  Estimated: `3485`
-		// Minimum execution time: 5_899 nanoseconds.
-		Weight::from_parts(6_122_000, 3485)
+		// Minimum execution time: 5_699 nanoseconds.
+		Weight::from_parts(5_861_000, 3485)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: SessionManager SessionDurationChanges (r:1 w:1)
-	// Proof: SessionManager SessionDurationChanges (max_values: None, max_size: Some(20), added: 2495, mode: MaxEncodedLen)
-	// Storage: SessionManager DurationOffset (r:0 w:1)
-	// Proof: SessionManager DurationOffset (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: SessionManager SessionDuration (r:0 w:1)
-	// Proof: SessionManager SessionDuration (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	// Storage: `SessionManager::SessionDurationChanges` (r:1 w:1)
+	// Proof: `SessionManager::SessionDurationChanges` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::DurationOffset` (r:0 w:1)
+	// Proof: `SessionManager::DurationOffset` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::SessionDuration` (r:0 w:1)
+	// Proof: `SessionManager::SessionDuration` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn on_initialize() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `809`
 		//  Estimated: `3485`
-		// Minimum execution time: 7_170 nanoseconds.
-		Weight::from_parts(7_345_000, 3485)
+		// Minimum execution time: 6_753 nanoseconds.
+		Weight::from_parts(7_018_000, 3485)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: SessionManager DurationOffset (r:1 w:0)
-	// Proof: SessionManager DurationOffset (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: SessionManager SessionDuration (r:1 w:0)
-	// Proof: SessionManager SessionDuration (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	// Storage: `SessionManager::DurationOffset` (r:1 w:0)
+	// Proof: `SessionManager::DurationOffset` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::SessionDuration` (r:1 w:0)
+	// Proof: `SessionManager::SessionDuration` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn estimate_current_session_progress() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `769`
-		//  Estimated: `2978`
-		// Minimum execution time: 5_043 nanoseconds.
-		Weight::from_parts(5_176_000, 2978)
+		//  Estimated: `1489`
+		// Minimum execution time: 4_784 nanoseconds.
+		Weight::from_parts(5_017_000, 1489)
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
-	// Storage: SessionManager DurationOffset (r:1 w:0)
-	// Proof: SessionManager DurationOffset (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: SessionManager SessionDuration (r:1 w:0)
-	// Proof: SessionManager SessionDuration (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	// Storage: `SessionManager::DurationOffset` (r:1 w:0)
+	// Proof: `SessionManager::DurationOffset` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::SessionDuration` (r:1 w:0)
+	// Proof: `SessionManager::SessionDuration` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn estimate_next_session_rotation() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `769`
-		//  Estimated: `2978`
-		// Minimum execution time: 5_131 nanoseconds.
-		Weight::from_parts(5_267_000, 2978)
+		//  Estimated: `1489`
+		// Minimum execution time: 4_734 nanoseconds.
+		Weight::from_parts(5_060_000, 1489)
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
 }
diff --git a/runtime/acala/src/weights/module_transaction_pause.rs b/runtime/acala/src/weights/module_transaction_pause.rs
index e7939d491b..26e789415b 100644
--- a/runtime/acala/src/weights/module_transaction_pause.rs
+++ b/runtime/acala/src/weights/module_transaction_pause.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_transaction_pause
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,47 +47,47 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_transaction_pause.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_transaction_pause::WeightInfo for WeightInfo<T> {
-	// Storage: TransactionPause PausedTransactions (r:1 w:1)
-	// Proof Skipped: TransactionPause PausedTransactions (max_values: None, max_size: None, mode: Measured)
+	// Storage: `TransactionPause::PausedTransactions` (r:1 w:1)
+	// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn pause_transaction() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1138`
-		//  Estimated: `4603`
-		// Minimum execution time: 21_630 nanoseconds.
-		Weight::from_parts(22_343_000, 4603)
+		//  Measured:  `1172`
+		//  Estimated: `4637`
+		// Minimum execution time: 19_801 nanoseconds.
+		Weight::from_parts(20_333_000, 4637)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: TransactionPause PausedTransactions (r:1 w:1)
-	// Proof Skipped: TransactionPause PausedTransactions (max_values: None, max_size: None, mode: Measured)
+	// Storage: `TransactionPause::PausedTransactions` (r:1 w:1)
+	// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn unpause_transaction() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1189`
-		//  Estimated: `4654`
-		// Minimum execution time: 22_694 nanoseconds.
-		Weight::from_parts(23_634_000, 4654)
+		//  Measured:  `1223`
+		//  Estimated: `4688`
+		// Minimum execution time: 21_019 nanoseconds.
+		Weight::from_parts(21_524_000, 4688)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: TransactionPause PausedEvmPrecompiles (r:1 w:1)
-	// Proof Skipped: TransactionPause PausedEvmPrecompiles (max_values: None, max_size: None, mode: Measured)
+	// Storage: `TransactionPause::PausedEvmPrecompiles` (r:1 w:1)
+	// Proof: `TransactionPause::PausedEvmPrecompiles` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn pause_evm_precompile() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1138`
-		//  Estimated: `4603`
-		// Minimum execution time: 20_821 nanoseconds.
-		Weight::from_parts(21_729_000, 4603)
+		//  Measured:  `1172`
+		//  Estimated: `4637`
+		// Minimum execution time: 19_428 nanoseconds.
+		Weight::from_parts(19_902_000, 4637)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: TransactionPause PausedEvmPrecompiles (r:1 w:1)
-	// Proof Skipped: TransactionPause PausedEvmPrecompiles (max_values: None, max_size: None, mode: Measured)
+	// Storage: `TransactionPause::PausedEvmPrecompiles` (r:1 w:1)
+	// Proof: `TransactionPause::PausedEvmPrecompiles` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn unpause_evm_precompile() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1199`
-		//  Estimated: `4664`
-		// Minimum execution time: 22_393 nanoseconds.
-		Weight::from_parts(23_054_000, 4664)
+		//  Measured:  `1233`
+		//  Estimated: `4698`
+		// Minimum execution time: 21_248 nanoseconds.
+		Weight::from_parts(21_640_000, 4698)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/acala/src/weights/module_transaction_payment.rs b/runtime/acala/src/weights/module_transaction_payment.rs
index be33b720ba..f742c4bbf7 100644
--- a/runtime/acala/src/weights/module_transaction_payment.rs
+++ b/runtime/acala/src/weights/module_transaction_payment.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_transaction_payment
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,66 +47,66 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_transaction_payment.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_transaction_payment::WeightInfo for WeightInfo<T> {
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: TransactionPayment AlternativeFeeSwapPath (r:0 w:1)
-	// Proof: TransactionPayment AlternativeFeeSwapPath (max_values: None, max_size: Some(213), added: 2688, mode: MaxEncodedLen)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::AlternativeFeeSwapPath` (r:0 w:1)
+	// Proof: `TransactionPayment::AlternativeFeeSwapPath` (`max_values`: None, `max_size`: Some(213), added: 2688, mode: `MaxEncodedLen`)
 	fn set_alternative_fee_swap_path() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1371`
+		//  Measured:  `1405`
 		//  Estimated: `3633`
-		// Minimum execution time: 33_537 nanoseconds.
-		Weight::from_parts(34_607_000, 3633)
+		// Minimum execution time: 34_517 nanoseconds.
+		Weight::from_parts(35_440_000, 3633)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: TransactionPayment PoolSize (r:1 w:1)
-	// Proof: TransactionPayment PoolSize (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:4 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:1 w:0)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:1 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: TransactionPayment TokenExchangeRate (r:0 w:1)
-	// Proof: TransactionPayment TokenExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: TransactionPayment SwapBalanceThreshold (r:0 w:1)
-	// Proof: TransactionPayment SwapBalanceThreshold (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `TransactionPayment::PoolSize` (r:1 w:1)
+	// Proof: `TransactionPayment::PoolSize` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:4 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:1 w:0)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:1 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::TokenExchangeRate` (r:0 w:1)
+	// Proof: `TransactionPayment::TokenExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::SwapBalanceThreshold` (r:0 w:1)
+	// Proof: `TransactionPayment::SwapBalanceThreshold` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn enable_charge_fee_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2089`
-		//  Estimated: `39728`
-		// Minimum execution time: 109_869 nanoseconds.
-		Weight::from_parts(112_331_000, 39728)
+		//  Measured:  `2272`
+		//  Estimated: `11670`
+		// Minimum execution time: 117_669 nanoseconds.
+		Weight::from_parts(120_001_000, 11670)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: TransactionPayment TokenExchangeRate (r:1 w:1)
-	// Proof: TransactionPayment TokenExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: TransactionPayment SwapBalanceThreshold (r:0 w:1)
-	// Proof: TransactionPayment SwapBalanceThreshold (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: TransactionPayment GlobalFeeSwapPath (r:0 w:1)
-	// Proof: TransactionPayment GlobalFeeSwapPath (max_values: None, max_size: Some(224), added: 2699, mode: MaxEncodedLen)
-	// Storage: TransactionPayment PoolSize (r:0 w:1)
-	// Proof: TransactionPayment PoolSize (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `TransactionPayment::TokenExchangeRate` (r:1 w:1)
+	// Proof: `TransactionPayment::TokenExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::SwapBalanceThreshold` (r:0 w:1)
+	// Proof: `TransactionPayment::SwapBalanceThreshold` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::GlobalFeeSwapPath` (r:0 w:1)
+	// Proof: `TransactionPayment::GlobalFeeSwapPath` (`max_values`: None, `max_size`: Some(224), added: 2699, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::PoolSize` (r:0 w:1)
+	// Proof: `TransactionPayment::PoolSize` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn disable_charge_fee_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1700`
-		//  Estimated: `16884`
-		// Minimum execution time: 87_345 nanoseconds.
-		Weight::from_parts(88_965_000, 16884)
+		//  Measured:  `1778`
+		//  Estimated: `6234`
+		// Minimum execution time: 100_559 nanoseconds.
+		Weight::from_parts(102_219_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
@@ -115,38 +114,38 @@ impl<T: frame_system::Config> module_transaction_payment::WeightInfo for WeightI
 		// Proof Size summary in bytes:
 		//  Measured:  `666`
 		//  Estimated: `0`
-		// Minimum execution time: 9_520 nanoseconds.
-		Weight::from_parts(9_877_000, 0)
+		// Minimum execution time: 8_529 nanoseconds.
+		Weight::from_parts(8_856_000, 0)
 	}
 	fn with_fee_currency() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `666`
 		//  Estimated: `0`
-		// Minimum execution time: 10_467 nanoseconds.
-		Weight::from_parts(11_029_000, 0)
+		// Minimum execution time: 9_244 nanoseconds.
+		Weight::from_parts(9_862_000, 0)
 	}
 	fn with_fee_aggregated_path() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `666`
 		//  Estimated: `0`
-		// Minimum execution time: 10_931 nanoseconds.
-		Weight::from_parts(11_433_000, 0)
+		// Minimum execution time: 9_563 nanoseconds.
+		Weight::from_parts(9_999_000, 0)
 	}
 	fn with_fee_paid_by() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `666`
 		//  Estimated: `0`
-		// Minimum execution time: 7_200 nanoseconds.
-		Weight::from_parts(7_560_000, 0)
+		// Minimum execution time: 6_405 nanoseconds.
+		Weight::from_parts(6_669_000, 0)
 	}
-	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:1)
-	// Proof: TransactionPayment NextFeeMultiplier (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	// Storage: `TransactionPayment::NextFeeMultiplier` (r:1 w:1)
+	// Proof: `TransactionPayment::NextFeeMultiplier` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn on_finalize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `921`
+		//  Measured:  `955`
 		//  Estimated: `1501`
-		// Minimum execution time: 10_879 nanoseconds.
-		Weight::from_parts(11_166_000, 1501)
+		// Minimum execution time: 10_040 nanoseconds.
+		Weight::from_parts(10_294_000, 1501)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/acala/src/weights/nutsfinance_stable_asset.rs b/runtime/acala/src/weights/nutsfinance_stable_asset.rs
index abc412448b..d7dc6f2284 100644
--- a/runtime/acala/src/weights/nutsfinance_stable_asset.rs
+++ b/runtime/acala/src/weights/nutsfinance_stable_asset.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for nutsfinance_stable_asset
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,202 +47,202 @@ use sp_std::marker::PhantomData;
 /// Weight functions for nutsfinance_stable_asset.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> nutsfinance_stable_asset::WeightInfo for WeightInfo<T> {
-	// Storage: StableAsset PoolCount (r:1 w:1)
-	// Proof Skipped: StableAsset PoolCount (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, 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: `StableAsset::PoolCount` (r:1 w:1)
+	// Proof: `StableAsset::PoolCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `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 create_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1311`
-		//  Estimated: `11165`
-		// Minimum execution time: 34_373 nanoseconds.
-		Weight::from_parts(35_312_000, 11165)
+		//  Measured:  `1345`
+		//  Estimated: `4810`
+		// Minimum execution time: 30_783 nanoseconds.
+		Weight::from_parts(31_362_000, 4810)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn modify_a() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1504`
-		//  Estimated: `4969`
-		// Minimum execution time: 27_107 nanoseconds.
-		Weight::from_parts(27_712_000, 4969)
+		//  Measured:  `1538`
+		//  Estimated: `5003`
+		// Minimum execution time: 24_167 nanoseconds.
+		Weight::from_parts(24_806_000, 5003)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn modify_fees() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1504`
-		//  Estimated: `4969`
-		// Minimum execution time: 25_607 nanoseconds.
-		Weight::from_parts(26_613_000, 4969)
+		//  Measured:  `1538`
+		//  Estimated: `5003`
+		// Minimum execution time: 23_267 nanoseconds.
+		Weight::from_parts(23_835_000, 5003)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn modify_recipients() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1504`
-		//  Estimated: `4969`
-		// Minimum execution time: 25_632 nanoseconds.
-		Weight::from_parts(26_713_000, 4969)
+		//  Measured:  `1538`
+		//  Estimated: `5003`
+		// Minimum execution time: 23_194 nanoseconds.
+		Weight::from_parts(23_987_000, 5003)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (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: Tokens Accounts (r:10 w:10)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`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: `Tokens::Accounts` (r:10 w:10)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `u` is `[2, 5]`.
 	fn mint(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1974 + u * (239 ±0)`
-		//  Estimated: `31158 + u * (7359 ±0)`
-		// Minimum execution time: 155_982 nanoseconds.
-		Weight::from_parts(68_534_711, 31158)
-			// Standard Error: 382_389
-			.saturating_add(Weight::from_parts(48_788_137, 0).saturating_mul(u.into()))
+		//  Measured:  `2262 + u * (186 ±0)`
+		//  Estimated: `6196 + u * (5244 ±32)`
+		// Minimum execution time: 172_922 nanoseconds.
+		Weight::from_parts(84_682_684, 6196)
+			// Standard Error: 428_229
+			.saturating_add(Weight::from_parts(49_442_897, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(4))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 7359).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 5244).saturating_mul(u.into()))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, 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: Tokens Accounts (r:6 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `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: `Tokens::Accounts` (r:6 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `u` is `[2, 5]`.
 	fn swap(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2201 + u * (236 ±0)`
-		//  Estimated: `32274 + u * (4731 ±0)`
-		// Minimum execution time: 1_489_109 nanoseconds.
-		Weight::from_parts(180_627_304, 32274)
-			// Standard Error: 4_104_304
-			.saturating_add(Weight::from_parts(708_222_124, 0).saturating_mul(u.into()))
+		//  Measured:  `2489 + u * (183 ±0)`
+		//  Estimated: `5972 + u * (2622 ±32)`
+		// Minimum execution time: 2_280_839 nanoseconds.
+		Weight::from_parts(445_030_959, 5972)
+			// Standard Error: 3_834_727
+			.saturating_add(Weight::from_parts(952_229_968, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(6))
-			.saturating_add(Weight::from_parts(0, 4731).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 2622).saturating_mul(u.into()))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, 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: Tokens Accounts (r:10 w:10)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `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: `Tokens::Accounts` (r:10 w:10)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `u` is `[2, 5]`.
 	fn redeem_proportion(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2143 + u * (300 ±0)`
-		//  Estimated: `29357 + u * (7678 ±2)`
-		// Minimum execution time: 174_932 nanoseconds.
-		Weight::from_parts(100_385_143, 29357)
-			// Standard Error: 279_161
-			.saturating_add(Weight::from_parts(42_049_308, 0).saturating_mul(u.into()))
+		//  Measured:  `2431 + u * (248 ±0)`
+		//  Estimated: `5914 + u * (5244 ±0)`
+		// Minimum execution time: 200_168 nanoseconds.
+		Weight::from_parts(118_567_850, 5914)
+			// Standard Error: 314_617
+			.saturating_add(Weight::from_parts(46_060_981, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 7678).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 5244).saturating_mul(u.into()))
 	}
-	// Storage: StableAsset Pools (r:1 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: System Account (r:1 w:0)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:4 w:0)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:1 w:0)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:1 w:0)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:4 w:0)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:0)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// The range of component `u` is `[2, 5]`.
 	fn redeem_single(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1591 + u * (227 ±0)`
-		//  Estimated: `26299 + u * (1611 ±0)`
-		// Minimum execution time: 988_911 nanoseconds.
-		Weight::from_parts(469_911_198, 26299)
-			// Standard Error: 905_144
-			.saturating_add(Weight::from_parts(261_403_902, 0).saturating_mul(u.into()))
+		//  Measured:  `1625 + u * (227 ±0)`
+		//  Estimated: `5141 + u * (1016 ±2)`
+		// Minimum execution time: 1_798_350 nanoseconds.
+		Weight::from_parts(807_843_547, 5141)
+			// Standard Error: 2_476_524
+			.saturating_add(Weight::from_parts(494_281_196, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 1611).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 1016).saturating_mul(u.into()))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, 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: Tokens Accounts (r:10 w:10)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `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: `Tokens::Accounts` (r:10 w:10)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `u` is `[2, 5]`.
 	fn redeem_multi(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2143 + u * (300 ±0)`
-		//  Estimated: `29357 + u * (7678 ±0)`
-		// Minimum execution time: 154_195 nanoseconds.
-		Weight::from_parts(64_378_076, 29357)
-			// Standard Error: 435_733
-			.saturating_add(Weight::from_parts(50_432_133, 0).saturating_mul(u.into()))
+		//  Measured:  `2431 + u * (248 ±0)`
+		//  Estimated: `5914 + u * (5244 ±0)`
+		// Minimum execution time: 172_352 nanoseconds.
+		Weight::from_parts(70_249_331, 5914)
+			// Standard Error: 553_946
+			.saturating_add(Weight::from_parts(57_162_296, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 7678).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 5244).saturating_mul(u.into()))
 	}
 }
diff --git a/runtime/acala/src/weights/orml_auction.rs b/runtime/acala/src/weights/orml_auction.rs
index 073d801640..574f79ca19 100644
--- a/runtime/acala/src/weights/orml_auction.rs
+++ b/runtime/acala/src/weights/orml_auction.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for orml_auction
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,64 +47,64 @@ use sp_std::marker::PhantomData;
 /// Weight functions for orml_auction.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_auction::WeightInfo for WeightInfo<T> {
-	// Storage: Auction Auctions (r:1 w:1)
-	// Proof: Auction Auctions (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	// Storage: AuctionManager CollateralAuctions (r:1 w:1)
-	// Proof: AuctionManager CollateralAuctions (max_values: None, max_size: Some(139), added: 2614, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: Auction AuctionEndTime (r:0 w:2)
-	// Proof: Auction AuctionEndTime (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen)
+	// Storage: `Auction::Auctions` (r:1 w:1)
+	// Proof: `Auction::Auctions` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::CollateralAuctions` (r:1 w:1)
+	// Proof: `AuctionManager::CollateralAuctions` (`max_values`: None, `max_size`: Some(139), added: 2614, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionEndTime` (r:0 w:2)
+	// Proof: `Auction::AuctionEndTime` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
 	fn bid_collateral_auction() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2433`
-		//  Estimated: `23113`
-		// Minimum execution time: 109_418 nanoseconds.
-		Weight::from_parts(112_138_000, 23113)
+		//  Measured:  `2467`
+		//  Estimated: `8856`
+		// Minimum execution time: 101_043 nanoseconds.
+		Weight::from_parts(103_403_000, 8856)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
-	// Storage: Auction AuctionEndTime (r:101 w:100)
-	// Proof: Auction AuctionEndTime (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen)
-	// Storage: Auction Auctions (r:100 w:100)
-	// Proof: Auction Auctions (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	// Storage: AuctionManager CollateralAuctions (r:100 w:100)
-	// Proof: AuctionManager CollateralAuctions (max_values: None, max_size: Some(139), added: 2614, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:1 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpTreasury DebitPool (r:1 w:1)
-	// Proof: CdpTreasury DebitPool (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalTargetInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalTargetInAuction (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	// Storage: `Auction::AuctionEndTime` (r:101 w:100)
+	// Proof: `Auction::AuctionEndTime` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
+	// Storage: `Auction::Auctions` (r:100 w:100)
+	// Proof: `Auction::Auctions` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::CollateralAuctions` (r:100 w:100)
+	// Proof: `AuctionManager::CollateralAuctions` (`max_values`: None, `max_size`: Some(139), added: 2614, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:1 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpTreasury::DebitPool` (r:1 w:1)
+	// Proof: `CdpTreasury::DebitPool` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalTargetInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalTargetInAuction` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 100]`.
 	fn on_finalize(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2565 + c * (979 ±0)`
-		//  Estimated: `49037 + c * (9624 ±0)`
-		// Minimum execution time: 109_986 nanoseconds.
-		Weight::from_parts(63_558_340, 49037)
-			// Standard Error: 19_816
-			.saturating_add(Weight::from_parts(48_805_316, 0).saturating_mul(c.into()))
+		//  Measured:  `2632 + c * (979 ±0)`
+		//  Estimated: `9000 + c * (2614 ±0)`
+		// Minimum execution time: 104_282 nanoseconds.
+		Weight::from_parts(59_081_808, 9000)
+			// Standard Error: 18_711
+			.saturating_add(Weight::from_parts(46_196_581, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(14))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(7))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 9624).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(0, 2614).saturating_mul(c.into()))
 	}
 }
diff --git a/runtime/acala/src/weights/orml_authority.rs b/runtime/acala/src/weights/orml_authority.rs
index da9ee03cf4..61ab5ca03a 100644
--- a/runtime/acala/src/weights/orml_authority.rs
+++ b/runtime/acala/src/weights/orml_authority.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for orml_authority
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -50,109 +49,109 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_authority::WeightInfo for WeightInfo<T> {
 	fn dispatch_as() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `963`
+		//  Measured:  `997`
 		//  Estimated: `0`
-		// Minimum execution time: 17_638 nanoseconds.
-		Weight::from_parts(18_443_000, 0)
+		// Minimum execution time: 16_154 nanoseconds.
+		Weight::from_parts(16_499_000, 0)
 	}
-	// Storage: Authority NextTaskIndex (r:1 w:1)
-	// Proof Skipped: Authority NextTaskIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Scheduler Lookup (r:1 w:1)
-	// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	// Storage: Scheduler Agenda (r:1 w:1)
-	// Proof: Scheduler Agenda (max_values: None, max_size: Some(7853), added: 10328, mode: MaxEncodedLen)
+	// Storage: `Authority::NextTaskIndex` (r:1 w:1)
+	// Proof: `Authority::NextTaskIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Scheduler::Lookup` (r:1 w:1)
+	// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	// Storage: `Scheduler::Agenda` (r:1 w:1)
+	// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(7853), added: 10328, mode: `MaxEncodedLen`)
 	fn schedule_dispatch_without_delay() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1109`
-		//  Estimated: `17425`
-		// Minimum execution time: 33_566 nanoseconds.
-		Weight::from_parts(34_224_000, 17425)
+		//  Measured:  `1143`
+		//  Estimated: `11318`
+		// Minimum execution time: 30_729 nanoseconds.
+		Weight::from_parts(32_006_000, 11318)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Authority NextTaskIndex (r:1 w:1)
-	// Proof Skipped: Authority NextTaskIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Scheduler Lookup (r:1 w:1)
-	// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	// Storage: Scheduler Agenda (r:1 w:1)
-	// Proof: Scheduler Agenda (max_values: None, max_size: Some(7853), added: 10328, mode: MaxEncodedLen)
+	// Storage: `Authority::NextTaskIndex` (r:1 w:1)
+	// Proof: `Authority::NextTaskIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Scheduler::Lookup` (r:1 w:1)
+	// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	// Storage: `Scheduler::Agenda` (r:1 w:1)
+	// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(7853), added: 10328, mode: `MaxEncodedLen`)
 	fn schedule_dispatch_with_delay() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1109`
-		//  Estimated: `17425`
-		// Minimum execution time: 34_635 nanoseconds.
-		Weight::from_parts(35_245_000, 17425)
+		//  Measured:  `1143`
+		//  Estimated: `11318`
+		// Minimum execution time: 31_583 nanoseconds.
+		Weight::from_parts(32_573_000, 11318)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Scheduler Lookup (r:1 w:1)
-	// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	// Storage: Scheduler Agenda (r:2 w:2)
-	// Proof: Scheduler Agenda (max_values: None, max_size: Some(7853), added: 10328, mode: MaxEncodedLen)
+	// Storage: `Scheduler::Lookup` (r:1 w:1)
+	// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	// Storage: `Scheduler::Agenda` (r:2 w:2)
+	// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(7853), added: 10328, mode: `MaxEncodedLen`)
 	fn fast_track_scheduled_dispatch() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1186`
-		//  Estimated: `25159`
-		// Minimum execution time: 44_416 nanoseconds.
-		Weight::from_parts(45_391_000, 25159)
+		//  Measured:  `1220`
+		//  Estimated: `21646`
+		// Minimum execution time: 40_400 nanoseconds.
+		Weight::from_parts(41_449_000, 21646)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Scheduler Lookup (r:1 w:1)
-	// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	// Storage: Scheduler Agenda (r:2 w:2)
-	// Proof: Scheduler Agenda (max_values: None, max_size: Some(7853), added: 10328, mode: MaxEncodedLen)
+	// Storage: `Scheduler::Lookup` (r:1 w:1)
+	// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	// Storage: `Scheduler::Agenda` (r:2 w:2)
+	// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(7853), added: 10328, mode: `MaxEncodedLen`)
 	fn delay_scheduled_dispatch() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1186`
-		//  Estimated: `25159`
-		// Minimum execution time: 44_678 nanoseconds.
-		Weight::from_parts(45_331_000, 25159)
+		//  Measured:  `1220`
+		//  Estimated: `21646`
+		// Minimum execution time: 40_584 nanoseconds.
+		Weight::from_parts(41_457_000, 21646)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Scheduler Lookup (r:1 w:1)
-	// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	// Storage: Scheduler Agenda (r:1 w:1)
-	// Proof: Scheduler Agenda (max_values: None, max_size: Some(7853), added: 10328, mode: MaxEncodedLen)
+	// Storage: `Scheduler::Lookup` (r:1 w:1)
+	// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	// Storage: `Scheduler::Agenda` (r:1 w:1)
+	// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(7853), added: 10328, mode: `MaxEncodedLen`)
 	fn cancel_scheduled_dispatch() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1186`
-		//  Estimated: `14831`
-		// Minimum execution time: 34_477 nanoseconds.
-		Weight::from_parts(35_308_000, 14831)
+		//  Measured:  `1220`
+		//  Estimated: `11318`
+		// Minimum execution time: 31_988 nanoseconds.
+		Weight::from_parts(32_572_000, 11318)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: Authority SavedCalls (r:0 w:1)
-	// Proof Skipped: Authority SavedCalls (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Authority::SavedCalls` (r:0 w:1)
+	// Proof: `Authority::SavedCalls` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn authorize_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `963`
-		//  Estimated: `963`
-		// Minimum execution time: 17_793 nanoseconds.
-		Weight::from_parts(18_506_000, 963)
+		//  Measured:  `997`
+		//  Estimated: `997`
+		// Minimum execution time: 16_242 nanoseconds.
+		Weight::from_parts(16_611_000, 997)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Authority SavedCalls (r:1 w:1)
-	// Proof Skipped: Authority SavedCalls (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Authority::SavedCalls` (r:1 w:1)
+	// Proof: `Authority::SavedCalls` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn remove_authorized_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1304`
-		//  Estimated: `4769`
-		// Minimum execution time: 23_302 nanoseconds.
-		Weight::from_parts(23_833_000, 4769)
+		//  Measured:  `1338`
+		//  Estimated: `4803`
+		// Minimum execution time: 21_893 nanoseconds.
+		Weight::from_parts(22_434_000, 4803)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Authority SavedCalls (r:1 w:1)
-	// Proof Skipped: Authority SavedCalls (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Authority::SavedCalls` (r:1 w:1)
+	// Proof: `Authority::SavedCalls` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn trigger_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1304`
-		//  Estimated: `4769`
-		// Minimum execution time: 29_132 nanoseconds.
-		Weight::from_parts(29_845_000, 4769)
+		//  Measured:  `1338`
+		//  Estimated: `4803`
+		// Minimum execution time: 27_179 nanoseconds.
+		Weight::from_parts(27_811_000, 4803)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/acala/src/weights/orml_oracle.rs b/runtime/acala/src/weights/orml_oracle.rs
index 79df93112a..88112053f9 100644
--- a/runtime/acala/src/weights/orml_oracle.rs
+++ b/runtime/acala/src/weights/orml_oracle.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for orml_oracle
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,39 +47,39 @@ use sp_std::marker::PhantomData;
 /// Weight functions for orml_oracle.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_oracle::WeightInfo for WeightInfo<T> {
-	// Storage: AcalaOracle HasDispatched (r:1 w:1)
-	// Proof: AcalaOracle HasDispatched (max_values: Some(1), max_size: Some(641), added: 1136, mode: MaxEncodedLen)
-	// Storage: Timestamp Now (r:1 w:0)
-	// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	// Storage: OperatorMembershipAcala Members (r:1 w:0)
-	// Proof: OperatorMembershipAcala Members (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:4 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AcalaOracle RawValues (r:0 w:4)
-	// Proof: AcalaOracle RawValues (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen)
+	// Storage: `AcalaOracle::HasDispatched` (r:1 w:1)
+	// Proof: `AcalaOracle::HasDispatched` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
+	// Storage: `Timestamp::Now` (r:1 w:0)
+	// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	// Storage: `OperatorMembershipAcala::Members` (r:1 w:0)
+	// Proof: `OperatorMembershipAcala::Members` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:4 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::RawValues` (r:0 w:4)
+	// Proof: `AcalaOracle::RawValues` (`max_values`: None, `max_size`: Some(115), added: 2590, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 4]`.
 	fn feed_values(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1202 + c * (16 ±0)`
-		//  Estimated: `7695 + c * (2550 ±0)`
-		// Minimum execution time: 22_249 nanoseconds.
-		Weight::from_parts(24_330_185, 7695)
-			// Standard Error: 48_076
-			.saturating_add(Weight::from_parts(6_675_395, 0).saturating_mul(c.into()))
+		//  Measured:  `1236 + c * (16 ±0)`
+		//  Estimated: `3086 + c * (2550 ±0)`
+		// Minimum execution time: 19_982 nanoseconds.
+		Weight::from_parts(22_031_444, 3086)
+			// Standard Error: 46_977
+			.saturating_add(Weight::from_parts(6_477_999, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
 			.saturating_add(Weight::from_parts(0, 2550).saturating_mul(c.into()))
 	}
-	// Storage: AcalaOracle HasDispatched (r:0 w:1)
-	// Proof: AcalaOracle HasDispatched (max_values: Some(1), max_size: Some(641), added: 1136, mode: MaxEncodedLen)
+	// Storage: `AcalaOracle::HasDispatched` (r:0 w:1)
+	// Proof: `AcalaOracle::HasDispatched` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn on_finalize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `838`
+		//  Measured:  `872`
 		//  Estimated: `0`
-		// Minimum execution time: 7_307 nanoseconds.
-		Weight::from_parts(7_468_000, 0)
+		// Minimum execution time: 6_908 nanoseconds.
+		Weight::from_parts(7_069_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/runtime/acala/src/weights/orml_tokens.rs b/runtime/acala/src/weights/orml_tokens.rs
index c3a1bb40a9..6592b3f48a 100644
--- a/runtime/acala/src/weights/orml_tokens.rs
+++ b/runtime/acala/src/weights/orml_tokens.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for orml_tokens
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,74 +47,74 @@ use sp_std::marker::PhantomData;
 /// Weight functions for orml_tokens.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_tokens::WeightInfo for WeightInfo<T> {
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1543`
-		//  Estimated: `13352`
-		// Minimum execution time: 54_895 nanoseconds.
-		Weight::from_parts(55_790_000, 13352)
+		//  Measured:  `1577`
+		//  Estimated: `6234`
+		// Minimum execution time: 50_289 nanoseconds.
+		Weight::from_parts(51_684_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_all() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1543`
-		//  Estimated: `13352`
-		// Minimum execution time: 57_580 nanoseconds.
-		Weight::from_parts(58_727_000, 13352)
+		//  Measured:  `1577`
+		//  Estimated: `6234`
+		// Minimum execution time: 52_855 nanoseconds.
+		Weight::from_parts(53_982_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_keep_alive() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1294`
-		//  Estimated: `9827`
-		// Minimum execution time: 41_497 nanoseconds.
-		Weight::from_parts(42_847_000, 9827)
+		//  Measured:  `1328`
+		//  Estimated: `6234`
+		// Minimum execution time: 36_930 nanoseconds.
+		Weight::from_parts(38_138_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn force_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1430`
-		//  Estimated: `12430`
-		// Minimum execution time: 44_673 nanoseconds.
-		Weight::from_parts(45_660_000, 12430)
+		//  Measured:  `1464`
+		//  Estimated: `6234`
+		// Minimum execution time: 39_968 nanoseconds.
+		Weight::from_parts(40_697_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, 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::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn set_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1126`
-		//  Estimated: `10737`
-		// Minimum execution time: 34_500 nanoseconds.
-		Weight::from_parts(35_153_000, 10737)
+		//  Measured:  `1160`
+		//  Estimated: `3612`
+		// Minimum execution time: 30_755 nanoseconds.
+		Weight::from_parts(31_525_000, 3612)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
diff --git a/runtime/acala/src/weights/orml_vesting.rs b/runtime/acala/src/weights/orml_vesting.rs
index 3f54e739b6..19daca5260 100644
--- a/runtime/acala/src/weights/orml_vesting.rs
+++ b/runtime/acala/src/weights/orml_vesting.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for orml_vesting
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-46-101`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-47-187`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("acala-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,51 +47,63 @@ use sp_std::marker::PhantomData;
 /// Weight functions for orml_vesting.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_vesting::WeightInfo for WeightInfo<T> {
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Vesting VestingSchedules (r:1 w:1)
-	// Proof: Vesting VestingSchedules (max_values: None, max_size: Some(2850), added: 5325, mode: MaxEncodedLen)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Vesting::VestingSchedules` (r:1 w:1)
+	// Proof: `Vesting::VestingSchedules` (`max_values`: None, `max_size`: Some(2850), added: 5325, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Locks` (r:1 w:1)
+	// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Freezes` (r:1 w:0)
+	// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn vested_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1318`
-		//  Estimated: `9118`
-		// Minimum execution time: 26_730 nanoseconds.
-		Weight::from_parts(27_803_000, 9118)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		//  Measured:  `1653`
+		//  Estimated: `6315`
+		// Minimum execution time: 42_847 nanoseconds.
+		Weight::from_parts(43_776_000, 6315)
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Vesting VestingSchedules (r:1 w:1)
-	// Proof: Vesting VestingSchedules (max_values: None, max_size: Some(2850), added: 5325, mode: MaxEncodedLen)
-	// Storage: Balances Locks (r:1 w:1)
-	// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Vesting::VestingSchedules` (r:1 w:1)
+	// Proof: `Vesting::VestingSchedules` (`max_values`: None, `max_size`: Some(2850), added: 5325, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Locks` (r:1 w:1)
+	// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Freezes` (r:1 w:0)
+	// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	/// The range of component `i` is `[1, 100]`.
 	fn claim(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1759`
-		//  Estimated: `14323`
-		// Minimum execution time: 40_172 nanoseconds.
-		Weight::from_parts(41_519_079, 14323)
-			// Standard Error: 717
-			.saturating_add(Weight::from_parts(2_986, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+		//  Measured:  `1793`
+		//  Estimated: `6315`
+		// Minimum execution time: 43_977 nanoseconds.
+		Weight::from_parts(45_325_572, 6315)
+			// Standard Error: 491
+			.saturating_add(Weight::from_parts(3_691, 0).saturating_mul(i.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: System Account (r:1 w:0)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Vesting VestingSchedules (r:0 w:1)
-	// Proof: Vesting VestingSchedules (max_values: None, max_size: Some(2850), added: 5325, mode: MaxEncodedLen)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Locks` (r:1 w:1)
+	// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Freezes` (r:1 w:0)
+	// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	// Storage: `Vesting::VestingSchedules` (r:0 w:1)
+	// Proof: `Vesting::VestingSchedules` (`max_values`: None, `max_size`: Some(2850), added: 5325, mode: `MaxEncodedLen`)
 	/// The range of component `i` is `[1, 100]`.
 	fn update_vesting_schedules(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1084`
-		//  Estimated: `3593`
-		// Minimum execution time: 19_564 nanoseconds.
-		Weight::from_parts(20_985_477, 3593)
-			// Standard Error: 447
-			.saturating_add(Weight::from_parts(52_092, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		//  Measured:  `1265`
+		//  Estimated: `4764`
+		// Minimum execution time: 36_144 nanoseconds.
+		Weight::from_parts(36_876_636, 4764)
+			// Standard Error: 380
+			.saturating_add(Weight::from_parts(44_121, 0).saturating_mul(i.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 }
diff --git a/runtime/acala/src/weights/pallet_xcm.rs b/runtime/acala/src/weights/pallet_xcm.rs
index a176883b58..5c9af9ea07 100644
--- a/runtime/acala/src/weights/pallet_xcm.rs
+++ b/runtime/acala/src/weights/pallet_xcm.rs
@@ -22,13 +22,13 @@
 //! DATE: 2023-02-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset_hub_polkadot-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./artifacts/polkadot-parachain
 // benchmark
 // pallet
-// --chain=statemint-dev
+// --chain=asset_hub_polkadot-dev
 // --execution=wasm
 // --wasm-execution=compiled
 // --pallet=pallet_xcm
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs
+// --output=./parachains/runtimes/assets/asset_hub_polkadot/src/weights/pallet_xcm.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
diff --git a/runtime/acala/src/xcm_config.rs b/runtime/acala/src/xcm_config.rs
index 32a1a2c357..e7a2cbe61b 100644
--- a/runtime/acala/src/xcm_config.rs
+++ b/runtime/acala/src/xcm_config.rs
@@ -194,6 +194,7 @@ impl xcm_executor::Config for XcmConfig {
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
 	type SafeCallFilter = Everything;
+	type Aliasers = Nothing;
 }
 
 pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
@@ -244,6 +245,8 @@ impl pallet_xcm::Config for Runtime {
 	#[cfg(feature = "runtime-benchmarks")]
 	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRootOrThreeFourthsGeneralCouncil;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 }
 
 impl cumulus_pallet_xcm::Config for Runtime {
@@ -394,7 +397,7 @@ parameter_type_with_key! {
 	pub ParachainMinFee: |location: MultiLocation| -> Option<u128> {
 		#[allow(clippy::match_ref_pats)] // false positive
 		match (location.parents, location.first_interior()) {
-			(1, Some(Parachain(parachains::statemint::ID))) => Some(XcmInterface::get_parachain_fee(*location)),
+			(1, Some(Parachain(parachains::asset_hub_polkadot::ID))) => Some(XcmInterface::get_parachain_fee(*location)),
 			_ => None,
 		}
 	};
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index 6d010f864f..73533dc907 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -10,40 +10,40 @@ harness = false
 required-features = ["bench"]
 
 [dependencies]
-hex-literal = "0.3.4"
+hex-literal = "0.4.1"
 static_assertions = "1.1.0"
 log = { version = "0.4.17", default-features = false }
 num_enum = { version = "0.5.1", default-features = false }
 serde_json = { version = "1.0.85", default-features = false, features = ["alloc"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
 ethabi = { version = "18.0.0", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 
 # substrate
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, features = ["tuples-96"] }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-scheduler  = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-membership = { 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, optional = true }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-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-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["tuples-96"] }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-scheduler  = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 # cumulus
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
 
 # polkadot
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false, optional = true }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false, optional = true }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
 
 # modules
 module-currencies = { path = "../../modules/currencies", default-features = false }
@@ -80,7 +80,7 @@ orml-currencies = { path = "../../orml/currencies", default-features = false, op
 orml-rewards = { path = "../../orml/rewards", default-features = false, optional = true }
 
 [dev-dependencies]
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
+polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
 orml-utilities = { path = "../../orml/utilities" }
 
 [features]
diff --git a/runtime/common/src/check_nonce.rs b/runtime/common/src/check_nonce.rs
index acaaa537bb..90dadabdaf 100644
--- a/runtime/common/src/check_nonce.rs
+++ b/runtime/common/src/check_nonce.rs
@@ -18,6 +18,7 @@
 
 use codec::{Decode, Encode};
 use frame_support::dispatch::DispatchInfo;
+use frame_system::pallet_prelude::*;
 use module_support::AddressMapping;
 use scale_info::TypeInfo;
 use sp_runtime::{
@@ -40,11 +41,11 @@ use sp_std::vec;
 #[scale_info(skip_type_params(T))]
 pub struct CheckNonce<T: frame_system::Config + module_evm::Config> {
 	#[codec(compact)]
-	pub nonce: T::Index,
+	pub nonce: T::Nonce,
 	#[codec(skip)]
 	pub is_eth_tx: bool,
 	#[codec(skip)]
-	pub eth_tx_valid_until: T::BlockNumber,
+	pub eth_tx_valid_until: BlockNumberFor<T>,
 }
 
 impl<T: frame_system::Config + module_evm::Config> Default for CheckNonce<T> {
@@ -59,7 +60,7 @@ impl<T: frame_system::Config + module_evm::Config> Default for CheckNonce<T> {
 
 impl<T: frame_system::Config + module_evm::Config> CheckNonce<T> {
 	/// utility constructor. Used only in client/factory code.
-	pub fn from(nonce: T::Index) -> Self {
+	pub fn from(nonce: T::Nonce) -> Self {
 		Self {
 			nonce,
 			is_eth_tx: false,
@@ -67,7 +68,7 @@ impl<T: frame_system::Config + module_evm::Config> CheckNonce<T> {
 		}
 	}
 
-	pub fn mark_as_ethereum_tx(&mut self, valid_until: T::BlockNumber) {
+	pub fn mark_as_ethereum_tx(&mut self, valid_until: BlockNumberFor<T>) {
 		self.is_eth_tx = true;
 		self.eth_tx_valid_until = valid_until;
 	}
@@ -135,7 +136,7 @@ where
 			}
 			.into());
 		}
-		account.nonce += T::Index::one();
+		account.nonce += T::Nonce::one();
 		frame_system::Account::<T>::insert(who, account);
 		Ok(())
 	}
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index fb9dd3c1f1..af9a321397 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -164,7 +164,7 @@ pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
 	WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),
 	// TODO: drop `* 10` after https://github.com/paritytech/substrate/issues/13501
 	// and the benchmarked size is not 10x of the measured size
-	polkadot_primitives::v4::MAX_POV_SIZE as u64 * 10,
+	polkadot_primitives::v5::MAX_POV_SIZE as u64 * 10,
 );
 
 const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct());
diff --git a/runtime/common/src/mock.rs b/runtime/common/src/mock.rs
index f7bbd51de4..fbc2f20d2d 100644
--- a/runtime/common/src/mock.rs
+++ b/runtime/common/src/mock.rs
@@ -34,14 +34,10 @@ use primitives::{
 use scale_info::TypeInfo;
 use sp_core::{H160, H256};
 use sp_runtime::traits::Convert;
+use sp_runtime::traits::{BlakeTwo256, BlockNumberProvider, IdentityLookup, Zero};
 pub use sp_runtime::AccountId32;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, BlockNumberProvider, IdentityLookup, Zero},
-};
 use std::str::FromStr;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<TestRuntime>;
 type Block = frame_system::mocking::MockBlock<TestRuntime>;
 
 type Balance = u128;
@@ -52,13 +48,12 @@ impl frame_system::Config for TestRuntime {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = primitives::Nonce;
-	type BlockNumber = u64;
+	type Nonce = primitives::Nonce;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId32;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<10>;
 	type DbWeight = ();
@@ -86,7 +81,7 @@ impl pallet_balances::Config for TestRuntime {
 	type MaxLocks = ();
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
-	type HoldIdentifier = ReserveIdentifier;
+	type RuntimeHoldReason = ReserveIdentifier;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<50>;
 	type MaxFreezes = ();
@@ -228,11 +223,7 @@ impl module_evm::Config for TestRuntime {
 }
 
 frame_support::construct_runtime!(
-	pub enum TestRuntime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
+	pub enum TestRuntime {
 		System: frame_system,
 		EVM: module_evm,
 		EvmAccounts: module_evm_accounts,
diff --git a/runtime/common/src/precompile/mock.rs b/runtime/common/src/precompile/mock.rs
index 34a5c1e7e7..122520be1d 100644
--- a/runtime/common/src/precompile/mock.rs
+++ b/runtime/common/src/precompile/mock.rs
@@ -67,13 +67,12 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = Nonce;
-	type BlockNumber = BlockNumber;
+	type Nonce = Nonce;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU32<250>;
 	type DbWeight = frame_support::weights::constants::RocksDbWeight;
@@ -155,7 +154,7 @@ impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = ReserveIdentifier;
-	type HoldIdentifier = ReserveIdentifier;
+	type RuntimeHoldReason = ReserveIdentifier;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<50>;
 	type MaxFreezes = ();
@@ -840,7 +839,12 @@ impl ExecuteXcm<RuntimeCall> for MockExec {
 		unreachable!()
 	}
 
-	fn execute(_origin: impl Into<MultiLocation>, _pre: Weightless, _hash: XcmHash, _weight_credit: Weight) -> Outcome {
+	fn execute(
+		_origin: impl Into<MultiLocation>,
+		_pre: Weightless,
+		_hash: &mut XcmHash,
+		_weight_credit: Weight,
+	) -> Outcome {
 		unreachable!()
 	}
 
@@ -977,11 +981,7 @@ pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<Address, R
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
+	pub enum Test {
 		System: frame_system,
 		Oracle: orml_oracle,
 		Timestamp: pallet_timestamp,
@@ -1026,10 +1026,11 @@ where
 // This function basically just builds a genesis storage key/value store
 // according to our desired mockup.
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	use frame_support::{assert_ok, traits::GenesisBuild};
+	use frame_support::assert_ok;
+	use sp_runtime::BuildStorage;
 	use sp_std::collections::btree_map::BTreeMap;
 
-	let mut storage = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	let mut storage = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 
 	let mut accounts = BTreeMap::new();
 	let mut evm_genesis_accounts = crate::evm_genesis(vec![]);
diff --git a/runtime/common/src/precompile/stable_asset.rs b/runtime/common/src/precompile/stable_asset.rs
index 5f1e0dda64..70fcb1400e 100644
--- a/runtime/common/src/precompile/stable_asset.rs
+++ b/runtime/common/src/precompile/stable_asset.rs
@@ -22,6 +22,7 @@ use super::{
 };
 use crate::{precompile::input::InputPricer, WeightToGas};
 use frame_support::traits::Get;
+use frame_system::pallet_prelude::*;
 use module_evm::{
 	precompiles::Precompile,
 	runner::state::{PrecompileFailure, PrecompileOutput, PrecompileResult},
@@ -63,7 +64,7 @@ where
 		AtLeast64BitUnsigned = Balance,
 		Balance = Balance,
 		AccountId = Runtime::AccountId,
-		BlockNumber = Runtime::BlockNumber,
+		BlockNumber = BlockNumberFor<Runtime>,
 	>,
 {
 	fn execute(input: &[u8], target_gas: Option<u64>, _context: &Context, _is_static: bool) -> PrecompileResult {
diff --git a/runtime/common/src/xcm_impl.rs b/runtime/common/src/xcm_impl.rs
index a25328fe76..fe7127331f 100644
--- a/runtime/common/src/xcm_impl.rs
+++ b/runtime/common/src/xcm_impl.rs
@@ -237,7 +237,7 @@ impl<
 		Config: xcm_executor::Config,
 		AccountId: Clone,
 		Balance,
-		AccountIdConvert: xcm_executor::traits::Convert<MultiLocation, AccountId>,
+		AccountIdConvert: xcm_executor::traits::ConvertLocation<AccountId>,
 		EVMBridge: module_support::EVMBridge<AccountId, Balance>,
 	> ExecuteXcm<Config::RuntimeCall> for XcmExecutor<Config, AccountId, Balance, AccountIdConvert, EVMBridge>
 {
@@ -250,12 +250,12 @@ impl<
 	fn execute(
 		origin: impl Into<MultiLocation>,
 		weighed_message: Self::Prepared,
-		message_hash: XcmHash,
+		message_hash: &mut XcmHash,
 		weight_credit: XcmWeight,
 	) -> Outcome {
 		let origin = origin.into();
-		let account = AccountIdConvert::convert(origin);
-		let clear = if let Ok(account) = account {
+		let account = AccountIdConvert::convert_location(&origin);
+		let clear = if let Some(account) = account {
 			EVMBridge::push_xcm_origin(account);
 			true
 		} else {
@@ -277,14 +277,14 @@ impl<
 
 /// Convert `AccountKey20` to `AccountId`
 pub struct AccountKey20Aliases<Network, AccountId, AddressMapping>(PhantomData<(Network, AccountId, AddressMapping)>);
-impl<Network, AccountId, AddressMapping> xcm_executor::traits::Convert<MultiLocation, AccountId>
+impl<Network, AccountId, AddressMapping> xcm_executor::traits::ConvertLocation<AccountId>
 	for AccountKey20Aliases<Network, AccountId, AddressMapping>
 where
 	Network: Get<Option<NetworkId>>,
 	AccountId: From<[u8; 32]> + Into<[u8; 32]> + Clone,
 	AddressMapping: module_support::AddressMapping<AccountId>,
 {
-	fn convert(location: MultiLocation) -> Result<AccountId, MultiLocation> {
+	fn convert_location(location: &MultiLocation) -> Option<AccountId> {
 		let key = match location {
 			MultiLocation {
 				parents: 0,
@@ -293,19 +293,11 @@ where
 			MultiLocation {
 				parents: 0,
 				interior: X1(AccountKey20 { key, network }),
-			} if network == Network::get() => key,
-			_ => return Err(location),
+			} if *network == Network::get() => key,
+			_ => return None,
 		};
 
-		Ok(AddressMapping::get_account_id(&EvmAddress::from(key)))
-	}
-
-	fn reverse(who: AccountId) -> Result<MultiLocation, AccountId> {
-		// NOTE: Not sure whether to use AccountId32 or AccountKey20, not implemented for now
-		// Ok(AccountKey20 { key: AddressMapping::get_or_create_evm_address(who), network: Network::get()
-		// }.into())
-		// Ok(AccountId32 { id: who.into(), network: Network::get() }.into())
-		Err(who)
+		Some(AddressMapping::get_account_id(&EvmAddress::from(key)))
 	}
 }
 
diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml
index 9369c5f872..61a591246c 100644
--- a/runtime/integration-tests/Cargo.toml
+++ b/runtime/integration-tests/Cargo.toml
@@ -9,65 +9,65 @@ smallvec = "1.4.0"
 codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive", "max-encoded-len"] }
 serde_json = { version = "1.0.85" }
 hex = { version = "0.4" }
-hex-literal = { version = "0.3.1" }
+hex-literal = { version = "0.4.1" }
 libsecp256k1 = { version = "0.7" }
 
 # substrate
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-authorship = { 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-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", features = ["historical"] }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-utility = { 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-application-crypto = { 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-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-inherents = { 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-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-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-std = { 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-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", features = ["historical"] }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
 # cumulus
-cumulus-pallet-aura-ext = { 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", branch = "polkadot-v0.9.42" }
-cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-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" }
-parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
 
 # polkadot
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-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" }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
 
 # orml
 orml-auction = { path = "../../orml/auction" }
@@ -119,24 +119,14 @@ acala-runtime = { path = "../acala", optional = true }
 [dev-dependencies]
 env_logger = "0.9.0"
 log = "0.4.17"
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
-cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-statemint-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
 
-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-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
-
-xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "d011e5ca62b93e8f688c2042c1f92cdbafc5d1d0" }
+polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
 
 acala-service = { path = "../../node/service", features = ["with-all-runtime"] }
 module-aggregated-dex = { path = "../../modules/aggregated-dex" }
@@ -167,8 +157,5 @@ with-ethereum-compatibility = [
 ]
 std = []
 runtime-benchmarks = [
-	"polkadot-test-runtime/runtime-benchmarks",
-	"statemine-runtime/runtime-benchmarks",
-	"statemint-runtime/runtime-benchmarks",
-	"kusama-runtime/runtime-benchmarks",
-]
+ 	"polkadot-test-runtime/runtime-benchmarks",
+ ]
diff --git a/runtime/integration-tests/src/evm.rs b/runtime/integration-tests/src/evm.rs
index c34b702e53..b76b95326c 100644
--- a/runtime/integration-tests/src/evm.rs
+++ b/runtime/integration-tests/src/evm.rs
@@ -970,12 +970,12 @@ fn transaction_payment_module_works_with_evm_contract() {
 				pays_fee: Pays::Yes,
 			};
 			let fee = module_transaction_payment::Pallet::<Runtime>::compute_fee(len, &info, 0);
-			assert_eq!(fee, 2_500_000_880);
+			assert_eq!(fee, 2500000804);
 
 			let surplus_perc = Percent::from_percent(50); // CustomFeeSurplus
 			let fee_surplus = surplus_perc.mul_ceil(fee);
 			let fee = fee + fee_surplus;
-			assert_eq!(fee, 3_750_001_320);
+			assert_eq!(fee, 3750001206);
 
 			// empty_account use payment non wrapped call to charge fee by erc20 fee pool.
 			assert_eq!(Currencies::free_balance(erc20_token, &sub_account), 0);
@@ -989,11 +989,11 @@ fn transaction_payment_module_works_with_evm_contract() {
 			);
 			let erc20_fee = Currencies::free_balance(erc20_token, &sub_account);
 			#[cfg(feature = "with-mandala-runtime")]
-			assert_eq!(erc20_fee, 10_386_329_729);
+			assert_eq!(erc20_fee, 10386329718);
 			#[cfg(feature = "with-karura-runtime")]
-			assert_eq!(erc20_fee, 10_407_164_895);
+			assert_eq!(erc20_fee, 10407164883);
 			#[cfg(feature = "with-acala-runtime")]
-			assert_eq!(erc20_fee, 10_407_164_895);
+			assert_eq!(erc20_fee, 10407164883);
 
 			assert_eq!(
 				Currencies::free_balance(NATIVE_CURRENCY, &sub_account),
@@ -1040,11 +1040,11 @@ fn transaction_payment_module_works_with_evm_contract() {
 				)
 			);
 			#[cfg(feature = "with-karura-runtime")]
-			let (erc20_with_fee, native_with_fee) = (376162714, 3750001320);
+			let (erc20_with_fee, native_with_fee) = (376162702, 3750001206);
 			#[cfg(feature = "with-acala-runtime")]
-			let (erc20_with_fee, native_with_fee) = (376162714, 3750001320);
+			let (erc20_with_fee, native_with_fee) = (376162702, 3750001206);
 			#[cfg(feature = "with-mandala-runtime")]
-			let (erc20_with_fee, native_with_fee) = (375409635, 3750001320);
+			let (erc20_with_fee, native_with_fee) = (375409624, 3750001206);
 			assert_eq!(
 				Currencies::free_balance(erc20_token, &sub_account),
 				erc20_fee * 2 + erc20_with_fee
@@ -1146,7 +1146,7 @@ fn create_contract_use_none_native_token_to_charge_storage() {
 #[test]
 fn evm_limits() {
 	ExtBuilder::default().build().execute_with(|| {
-		assert_eq!(runtime_common::EvmLimits::<Runtime>::max_gas_limit(), 33_320_706);
+		assert_eq!(runtime_common::EvmLimits::<Runtime>::max_gas_limit(), 33319509);
 		assert_eq!(runtime_common::EvmLimits::<Runtime>::max_storage_limit(), 3_670_016);
 	});
 }
diff --git a/runtime/integration-tests/src/lib.rs b/runtime/integration-tests/src/lib.rs
index bd4c177a77..b6da8fa325 100644
--- a/runtime/integration-tests/src/lib.rs
+++ b/runtime/integration-tests/src/lib.rs
@@ -122,13 +122,3 @@ mod weights;
 	feature = "with-acala-runtime"
 ))]
 mod payment;
-
-#[cfg(any(
-	feature = "with-mandala-runtime",
-	feature = "with-karura-runtime",
-	feature = "with-acala-runtime"
-))]
-mod relaychain;
-
-#[cfg(feature = "with-karura-runtime")]
-mod xcm_interface;
diff --git a/runtime/integration-tests/src/payment.rs b/runtime/integration-tests/src/payment.rs
index 8ab8cd1803..fefeaeee60 100644
--- a/runtime/integration-tests/src/payment.rs
+++ b/runtime/integration-tests/src/payment.rs
@@ -25,7 +25,6 @@ use sp_runtime::{
 	transaction_validity::{InvalidTransaction, TransactionValidityError},
 	MultiAddress, Percent,
 };
-use xcm_executor::{traits::*, Assets, Config};
 
 fn fee_pool_size() -> Balance {
 	5 * dollar(NATIVE_CURRENCY)
@@ -219,64 +218,6 @@ fn initial_charge_fee_pool_works() {
 	});
 }
 
-#[test]
-fn trader_works() {
-	// 4 instructions, each instruction cost 200_000_000
-	let mut message = Xcm(vec![
-		ReserveAssetDeposited((Parent, 100).into()),
-		ClearOrigin,
-		BuyExecution {
-			fees: (Parent, 100).into(),
-			weight_limit: Limited(Weight::from_parts(100, 0)),
-		},
-		DepositAsset {
-			assets: AllCounted(1).into(),
-			beneficiary: Here.into(),
-		},
-	]);
-
-	let total_balance: Balance = 1_000_000_000;
-	let asset: MultiAsset = (Parent, total_balance).into();
-	let assets: Assets = asset.into();
-
-	let expect_unspent: MultiAsset = (Parent, total_balance - crate::relaychain::relay_per_second_as_fee(4)).into();
-	let xcm_weight: XcmWeight = <XcmConfig as Config>::Weigher::weight(&mut message).unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let mut trader = Trader::new();
-		let result_assets = trader.buy_weight(xcm_weight, assets.clone()).unwrap();
-		let unspent: Vec<MultiAsset> = result_assets.into();
-		assert_eq!(vec![expect_unspent.clone()], unspent);
-
-		let mut period_trader = TransactionFeePoolTrader::new();
-		let result_assets = period_trader.buy_weight(xcm_weight, assets.clone());
-		assert!(result_assets.is_err());
-	});
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_ok!(add_liquidity(
-			RELAY_CHAIN_CURRENCY,
-			NATIVE_CURRENCY,
-			100 * dollar(RELAY_CHAIN_CURRENCY),
-			10000 * dollar(NATIVE_CURRENCY)
-		));
-
-		assert_ok!(init_charge_fee_pool(RELAY_CHAIN_CURRENCY));
-
-		let relay_exchange_rate: Ratio =
-			module_transaction_payment::Pallet::<Runtime>::token_exchange_rate(RELAY_CHAIN_CURRENCY).unwrap();
-
-		let spent = crate::relaychain::token_per_second_as_fee(4, relay_exchange_rate);
-		let expect_unspent: MultiAsset = (Parent, total_balance - spent as u128).into();
-
-		// the newly `TransactionFeePoolTrader` works fine as first priority
-		let mut period_trader = TransactionFeePoolTrader::new();
-		let result_assets = period_trader.buy_weight(xcm_weight, assets);
-		let unspent: Vec<MultiAsset> = result_assets.unwrap().into();
-		assert_eq!(vec![expect_unspent.clone()], unspent);
-	});
-}
-
 #[test]
 fn charge_transaction_payment_and_threshold_works() {
 	let native_ed = NativeTokenExistentialDeposit::get();
@@ -551,11 +492,11 @@ fn with_fee_call_works(
 				)
 			);
 			#[cfg(feature = "with-karura-runtime")]
-			let amount = 12_726_949_837u128;
+			let amount = 12726949827u128;
 			#[cfg(feature = "with-acala-runtime")]
-			let amount = 12_726_949_837u128;
+			let amount = 12726949827u128;
 			#[cfg(feature = "with-mandala-runtime")]
-			let amount = 12_701_470_458u128;
+			let amount = 12701470448u128;
 
 			System::assert_has_event(RuntimeEvent::Tokens(orml_tokens::Event::Transfer {
 				currency_id: USD_CURRENCY,
diff --git a/runtime/integration-tests/src/relaychain/erc20.rs b/runtime/integration-tests/src/relaychain/erc20.rs
deleted file mode 100644
index 301f6f9723..0000000000
--- a/runtime/integration-tests/src/relaychain/erc20.rs
+++ /dev/null
@@ -1,672 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Erc20 xcm transfer
-
-use crate::relaychain::kusama_test_net::*;
-use crate::setup::*;
-
-use frame_support::assert_ok;
-use hex_literal::hex;
-use karura_runtime::{AssetRegistry, Erc20HoldingAccount, KaruraTreasuryAccount};
-use module_evm::{precompiles::Precompile, Context};
-use module_evm_accounts::EvmAddressMapping;
-use module_support::EVM as EVMTrait;
-use orml_traits::MultiCurrency;
-use primitives::evm::EvmAddress;
-use runtime_common::precompile::XtokensPrecompile;
-use sp_core::{bounded::BoundedVec, defer, H256, U256};
-use std::str::FromStr;
-use xcm::VersionedMultiLocation;
-use xcm_emulator::TestExt;
-
-pub const SIBLING_ID: u32 = 2002;
-pub const KARURA_ID: u32 = 2000;
-
-pub fn erc20_address_0() -> EvmAddress {
-	EvmAddress::from_str("0x5e0b4bfa0b55932a3587e648c3552a6515ba56b1").unwrap()
-}
-
-pub fn alice_evm_addr() -> EvmAddress {
-	EvmAddress::from_str("1000000000000000000000000000000000000001").unwrap()
-}
-
-fn sibling_reserve_account() -> AccountId {
-	polkadot_parachain::primitives::Sibling::from(SIBLING_ID).into_account_truncating()
-}
-fn karura_reserve_account() -> AccountId {
-	polkadot_parachain::primitives::Sibling::from(KARURA_ID).into_account_truncating()
-}
-fn new_evm_address() -> EvmAddress {
-	EvmAddress::from_str("1000000000000000000000000000000000009999").unwrap()
-}
-
-pub fn deploy_erc20_contracts() {
-	let json: serde_json::Value =
-		serde_json::from_str(include_str!("../../../../ts-tests/build/Erc20DemoContract2.json")).unwrap();
-	let code = hex::decode(json.get("bytecode").unwrap().as_str().unwrap()).unwrap();
-
-	assert_ok!(EVM::create(
-		RuntimeOrigin::signed(alice()),
-		code,
-		0,
-		2100_000,
-		100000,
-		vec![]
-	));
-
-	System::assert_last_event(RuntimeEvent::EVM(module_evm::Event::Created {
-		from: EvmAddress::from_str("0xbf0b5a4099f0bf6c8bc4252ebec548bae95602ea").unwrap(),
-		contract: erc20_address_0(),
-		logs: vec![module_evm::Log {
-			address: erc20_address_0(),
-			topics: vec![
-				H256::from_str("0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef").unwrap(),
-				H256::from_str("0x0000000000000000000000000000000000000000000000000000000000000000").unwrap(),
-				H256::from_str("0x0000000000000000000000001000000000000000000000000000000000000001").unwrap(),
-			],
-			data: {
-				let mut buf = [0u8; 32];
-				U256::from(100_000_000_000_000_000_000_000u128).to_big_endian(&mut buf);
-				H256::from_slice(&buf).as_bytes().to_vec()
-			},
-		}],
-		used_gas: 1235081,
-		used_storage: 15130,
-	}));
-
-	assert_ok!(EVM::publish_free(RuntimeOrigin::root(), erc20_address_0()));
-	assert_ok!(AssetRegistry::register_erc20_asset(
-		RuntimeOrigin::root(),
-		erc20_address_0(),
-		100_000_000_000
-	));
-}
-
-#[test]
-fn erc20_transfer_between_sibling() {
-	TestNet::reset();
-
-	Sibling::execute_with(|| {
-		let erc20_as_foreign_asset = CurrencyId::Erc20(erc20_address_0());
-		// register Karura's erc20 as foreign asset
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(2000),
-						Junction::from(BoundedVec::try_from(erc20_as_foreign_asset.encode()).unwrap())
-					)
-				)
-				.into()
-			),
-			Box::new(AssetMetadata {
-				name: b"Karura USDC".to_vec(),
-				symbol: b"kUSDC".to_vec(),
-				decimals: 12,
-				minimal_balance: Balances::minimum_balance() / 10, // 10%
-			})
-		));
-	});
-
-	let initial_native_amount = 1_000_000_000_000u128;
-	let storage_fee = 6_400_000_000u128;
-
-	Karura::execute_with(|| {
-		let alith = MockAddressMapping::get_account_id(&alice_evm_addr());
-		let total_erc20 = 100_000_000_000_000_000_000_000u128;
-		let transfer_amount = 10 * dollar(NATIVE_CURRENCY);
-
-		// used to deploy contracts
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&alice(),
-			1_000_000 * dollar(NATIVE_CURRENCY)
-		));
-		// when transfer erc20 cross chain, the origin `alith` is used to charge storage
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&alith.clone(),
-			initial_native_amount
-		));
-		// when withdraw sibling parachain account, the origin `sibling_reserve_account` is used to charge
-		// storage
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&sibling_reserve_account(),
-			initial_native_amount
-		));
-		// when deposit to recipient, the origin is recipient `BOB`, and is used to charge storage.
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&AccountId::from(BOB),
-			initial_native_amount
-		));
-		// when xcm finished, deposit to treasury account, the origin is `treasury account`, and is used to
-		// charge storage.
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&KaruraTreasuryAccount::get(),
-			initial_native_amount
-		));
-
-		deploy_erc20_contracts();
-
-		// `transfer` invoked by `TransferReserveAsset` xcm instruction need to passing origin check.
-		// In frontend/js, when issue xtokens extrinsic, it have `EvmSetOrigin` SignedExtra to
-		// `set_origin`. In testcase, we're manual invoke `set_origin` here. because in erc20 xtokens
-		// transfer, the `from` or `to` is not erc20 holding account. so we need make sure origin exists.
-		<EVM as EVMTrait<AccountId>>::set_origin(alith.clone());
-		defer!(<EVM as EVMTrait<AccountId>>::kill_origin());
-
-		assert_eq!(
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &alith),
-			total_erc20
-		);
-
-		// transfer erc20 token to Sibling
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(alith.clone()),
-			CurrencyId::Erc20(erc20_address_0()),
-			transfer_amount,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(SIBLING_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: BOB.into(),
-						},
-					),
-				)
-				.into(),
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		// using native token to charge storage fee
-		assert_eq!(
-			initial_native_amount - storage_fee,
-			Currencies::free_balance(NATIVE_CURRENCY, &alith)
-		);
-		assert_eq!(
-			total_erc20 - transfer_amount,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &alith)
-		);
-		assert_eq!(
-			transfer_amount,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &sibling_reserve_account())
-		);
-		// initial_native_amount + ed
-		assert_eq!(
-			1_100_000_000_000,
-			Currencies::free_balance(NATIVE_CURRENCY, &KaruraTreasuryAccount::get())
-		);
-
-		System::reset_events();
-	});
-
-	Sibling::execute_with(|| {
-		// Sibling will take (1, 2000, GeneralKey{ data:Erc20(address), ..} as foreign asset
-		assert_eq!(
-			9_999_296_080_000,
-			Currencies::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB))
-		);
-
-		// transfer erc20 token back to Karura
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(BOB.into()),
-			CurrencyId::ForeignAsset(0),
-			5_000_000_000_000,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(2000),
-						Junction::AccountId32 {
-							network: None,
-							id: BOB.into(),
-						},
-					),
-				)
-				.into(),
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		// transfer erc20 token to new account on Karura
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(BOB.into()),
-			CurrencyId::ForeignAsset(0),
-			1_000_000_000_000,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(2000),
-						Junction::AccountId32 {
-							network: None,
-							id: CHARLIE.into(),
-						},
-					),
-				)
-				.into(),
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		// transfer erc20 token to evm address on Karura
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(BOB.into()),
-			CurrencyId::ForeignAsset(0),
-			1_000_000_000_000,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(2000),
-						Junction::AccountKey20 {
-							network: None,
-							key: new_evm_address().into(),
-						},
-					),
-				)
-				.into(),
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		assert_eq!(
-			2_999_296_080_000,
-			Currencies::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB))
-		);
-	});
-
-	Karura::execute_with(|| {
-		use karura_runtime::{RuntimeEvent, System};
-		let erc20_holding_account = EvmAddressMapping::<Runtime>::get_account_id(&Erc20HoldingAccount::get());
-		let new_account = EvmAddressMapping::<Runtime>::get_account_id(&new_evm_address());
-
-		assert_eq!(
-			3_000_000_000_000,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &sibling_reserve_account())
-		);
-		assert_eq!(
-			4_992_960_800_000,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &AccountId::from(BOB))
-		);
-		assert_eq!(
-			5_279_400_000 * 4,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &KaruraTreasuryAccount::get())
-		);
-		assert_eq!(
-			992_960_800_000,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &AccountId::from(CHARLIE))
-		);
-		assert_eq!(
-			992_960_800_000,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &new_account)
-		);
-		assert_eq!(
-			0,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &erc20_holding_account)
-		);
-		// withdraw erc20 need charge storage fee for both sibling, BOB, CHARLIE and new_account
-		assert_eq!(
-			initial_native_amount - storage_fee * 4,
-			Currencies::free_balance(NATIVE_CURRENCY, &sibling_reserve_account())
-		);
-		// no storage fee for BOB
-		assert_eq!(
-			initial_native_amount,
-			Currencies::free_balance(NATIVE_CURRENCY, &AccountId::from(BOB))
-		);
-		// CHARLIE doesn't need native token
-		assert_eq!(0, Currencies::free_balance(NATIVE_CURRENCY, &AccountId::from(CHARLIE)));
-		// deposit reserve and unreserve storage fee, so the native token not changed.
-		assert_eq!(
-			1_100_000_000_000,
-			Currencies::free_balance(NATIVE_CURRENCY, &KaruraTreasuryAccount::get())
-		);
-
-		// withdraw operation transfer from sibling parachain account to erc20 holding account
-		System::assert_has_event(RuntimeEvent::Currencies(module_currencies::Event::Withdrawn {
-			currency_id: CurrencyId::Erc20(erc20_address_0()),
-			who: sibling_reserve_account(),
-			amount: 5_000_000_000_000,
-		}));
-		// deposit operation transfer from erc20 holding account to recipient
-		System::assert_has_event(RuntimeEvent::Currencies(module_currencies::Event::Deposited {
-			currency_id: CurrencyId::Erc20(erc20_address_0()),
-			who: AccountId::from(BOB),
-			amount: 4_992_960_800_000,
-		}));
-		// TakeRevenue deposit from erc20 holding account to treasury account
-		System::assert_has_event(RuntimeEvent::Currencies(module_currencies::Event::Deposited {
-			currency_id: CurrencyId::Erc20(erc20_address_0()),
-			who: KaruraTreasuryAccount::get(),
-			amount: 7_039_200_000,
-		}));
-	});
-}
-
-#[test]
-fn sibling_erc20_to_self_as_foreign_asset() {
-	TestNet::reset();
-
-	Karura::execute_with(|| {
-		let erc20_as_foreign_asset = CurrencyId::Erc20(erc20_address_0());
-		// register Karura's erc20 as foreign asset
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(2002),
-						Junction::from(BoundedVec::try_from(erc20_as_foreign_asset.encode()).unwrap())
-					)
-				)
-				.into()
-			),
-			Box::new(AssetMetadata {
-				name: b"Sibling USDC".to_vec(),
-				symbol: b"sUSDC".to_vec(),
-				decimals: 12,
-				minimal_balance: Balances::minimum_balance() / 10, // 10%
-			})
-		));
-	});
-
-	Sibling::execute_with(|| {
-		let alith = MockAddressMapping::get_account_id(&alice_evm_addr());
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&alice(),
-			1_000_000 * dollar(NATIVE_CURRENCY)
-		));
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&alith,
-			1_000_000 * dollar(NATIVE_CURRENCY)
-		));
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&CHARLIE.into(),
-			10 * dollar(NATIVE_CURRENCY)
-		));
-
-		deploy_erc20_contracts();
-
-		// Erc20 claim account
-		assert_ok!(EvmAccounts::claim_account(
-			RuntimeOrigin::signed(AccountId::from(ALICE)),
-			EvmAccounts::eth_address(&alice_key()),
-			EvmAccounts::eth_sign(&alice_key(), &AccountId::from(ALICE))
-		));
-
-		<EVM as EVMTrait<AccountId>>::set_origin(alith.clone());
-		// use Currencies `transfer` dispatch call to transfer erc20 token to bob.
-		assert_ok!(Currencies::transfer(
-			RuntimeOrigin::signed(alith),
-			MultiAddress::Id(AccountId::from(CHARLIE)),
-			CurrencyId::Erc20(erc20_address_0()),
-			1_000_000_000_000_000
-		));
-		assert_eq!(
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &AccountId::from(CHARLIE)),
-			1_000_000_000_000_000
-		);
-		<EVM as EVMTrait<AccountId>>::kill_origin();
-
-		// transfer erc20 token to Karura
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(CHARLIE.into()),
-			CurrencyId::Erc20(erc20_address_0()),
-			10_000_000_000_000,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(2000),
-						Junction::AccountId32 {
-							network: None,
-							id: BOB.into(),
-						},
-					),
-				)
-				.into(),
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		assert_eq!(
-			990_000_000_000_000,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &AccountId::from(CHARLIE))
-		);
-		// charge storage fee from CHARLIE
-		assert_eq!(
-			10 * dollar(NATIVE_CURRENCY) - 6_400_000_000u128,
-			Currencies::free_balance(NATIVE_CURRENCY, &AccountId::from(CHARLIE))
-		);
-		assert_eq!(
-			10_000_000_000_000,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &karura_reserve_account())
-		);
-	});
-
-	Karura::execute_with(|| {
-		assert_eq!(
-			9_999_296_080_000,
-			Currencies::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB))
-		);
-	});
-}
-
-#[test]
-fn xtokens_precompile_works() {
-	TestNet::reset();
-
-	Sibling::execute_with(|| {
-		let erc20_as_foreign_asset = CurrencyId::Erc20(erc20_address_0());
-		// register Karura's erc20 as foreign asset
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(2000),
-						Junction::from(BoundedVec::try_from(erc20_as_foreign_asset.encode()).unwrap())
-					)
-				)
-				.into()
-			),
-			Box::new(AssetMetadata {
-				name: b"Karura USDC".to_vec(),
-				symbol: b"kUSDC".to_vec(),
-				decimals: 12,
-				minimal_balance: Balances::minimum_balance() / 10, // 10%
-			})
-		));
-	});
-
-	let initial_native_amount = 1_000_000_000_000u128;
-	let storage_fee = 6_400_000_000u128;
-
-	Karura::execute_with(|| {
-		let alith = MockAddressMapping::get_account_id(&alice_evm_addr());
-		let total_erc20 = 100_000_000_000_000_000_000_000u128;
-		let transfer_amount = 10 * dollar(NATIVE_CURRENCY);
-
-		// used to deploy contracts
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&alice(),
-			1_000_000 * dollar(NATIVE_CURRENCY)
-		));
-		// when transfer erc20 cross chain, the origin `alith` is used to charge storage
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&alith.clone(),
-			initial_native_amount
-		));
-		// when withdraw sibling parachain account, the origin `sibling_reserve_account` is used to charge
-		// storage
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&sibling_reserve_account(),
-			initial_native_amount
-		));
-		// when deposit to recipient, the origin is recipient `BOB`, and is used to charge storage.
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&AccountId::from(BOB),
-			initial_native_amount
-		));
-		// when xcm finished, deposit to treasury account, the origin is `treasury account`, and is used to
-		// charge storage.
-		assert_ok!(Currencies::deposit(
-			NATIVE_CURRENCY,
-			&KaruraTreasuryAccount::get(),
-			initial_native_amount
-		));
-
-		deploy_erc20_contracts();
-
-		// `transfer` invoked by `TransferReserveAsset` xcm instruction need to passing origin check.
-		// In frontend/js, when issue xtokens extrinsic, it have `EvmSetOrigin` SignedExtra to
-		// `set_origin`. In testcase, we're manual invoke `set_origin` here. because in erc20 xtokens
-		// transfer, the `from` or `to` is not erc20 holding account. so we need make sure origin exists.
-		<EVM as EVMTrait<AccountId>>::set_origin(alith.clone());
-		defer!(<EVM as EVMTrait<AccountId>>::kill_origin());
-
-		assert_eq!(
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &alith),
-			total_erc20
-		);
-
-		// transfer erc20 token to Sibling
-		let context = Context {
-			address: Default::default(),
-			caller: alice_evm_addr(),
-			apparent_value: Default::default(),
-		};
-		// assert_ok!(XTokens::transfer(
-		// 	RuntimeOrigin::signed(alith.clone()),
-		// 	CurrencyId::Erc20(erc20_address_0()),
-		// 	transfer_amount,
-		// 	Box::new(
-		// 		MultiLocation::new(
-		// 			1,
-		// 			X2(
-		// 				Parachain(SIBLING_ID),
-		// 				Junction::AccountId32 {
-		// 					network: NetworkId::Any,
-		// 					id: BOB.into(),
-		// 				},
-		// 			),
-		// 		)
-		// 		.into(),
-		// 	),
-		// 	WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		// ));
-
-		let dest: VersionedMultiLocation = MultiLocation::new(
-			1,
-			X2(
-				Parachain(SIBLING_ID),
-				Junction::AccountId32 {
-					network: None,
-					id: BOB.into(),
-				},
-			),
-		)
-		.into();
-		assert_eq!(
-			dest.encode(),
-			hex!("03010200491f01000505050505050505050505050505050505050505050505050505050505050505")
-		);
-
-		let weight = WeightLimit::Limited(Weight::from_parts(1_000_000_000, 0));
-		assert_eq!(weight.encode(), hex!("0102286bee00"));
-
-		// transfer(address,address,uint256,bytes,bytes) -> 0xc78fed04
-		// from
-		// currency
-		// amount
-		// dest offset
-		// weight offset
-		// dest length
-		// dest
-		// weight length
-		// weight
-		let input = hex! {"
-			c78fed04
-			000000000000000000000000 1000000000000000000000000000000000000001
-			000000000000000000000000 5e0b4bfa0b55932a3587e648c3552a6515ba56b1
-			00000000000000000000000000000000 0000000000000000000009184e72a000
-			00000000000000000000000000000000 000000000000000000000000000000a0
-			00000000000000000000000000000000 00000000000000000000000000000100
-			00000000000000000000000000000000 00000000000000000000000000000028
-			03010200491f0100050505050505050505050505050505050505050505050505
-			0505050505050505000000000000000000000000000000000000000000000000
-			00000000000000000000000000000000 00000000000000000000000000000006
-			0102286bee000000000000000000000000000000000000000000000000000000
-		"};
-
-		assert_ok!(frame_support::storage::with_transaction(|| {
-			frame_support::storage::TransactionOutcome::Commit({
-				XtokensPrecompile::<Runtime>::execute(&input, None, &context, false)
-					.map_err(|_| DispatchError::Other("failed"))
-			})
-		}));
-
-		// using native token to charge storage fee
-		assert_eq!(
-			initial_native_amount - storage_fee,
-			Currencies::free_balance(NATIVE_CURRENCY, &alith)
-		);
-		assert_eq!(
-			total_erc20 - transfer_amount,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &alith)
-		);
-		assert_eq!(
-			transfer_amount,
-			Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &sibling_reserve_account())
-		);
-		// initial_native_amount + ed
-		assert_eq!(
-			1_100_000_000_000,
-			Currencies::free_balance(NATIVE_CURRENCY, &KaruraTreasuryAccount::get())
-		);
-
-		System::reset_events();
-	});
-
-	Sibling::execute_with(|| {
-		// Sibling will take (1, 2000, GeneralKey(Erc20(address))) as foreign asset
-		assert_eq!(
-			9_999_296_080_000,
-			Currencies::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB))
-		);
-	});
-}
diff --git a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs
deleted file mode 100644
index 195146ee25..0000000000
--- a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs
+++ /dev/null
@@ -1,1258 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Cross-chain transfer tests within Kusama network.
-
-use crate::relaychain::fee_test::*;
-use crate::relaychain::kusama_test_net::*;
-use crate::setup::*;
-
-use frame_support::assert_ok;
-use sp_runtime::traits::{AccountIdConversion, BlakeTwo256};
-use xcm::VersionedXcm;
-use xcm_builder::ParentIsPreset;
-
-use karura_runtime::parachains::bifrost::{BNC_KEY, ID as BIFROST_ID};
-use karura_runtime::{AssetRegistry, KaruraTreasuryAccount};
-use module_relaychain::RelayChainCallBuilder;
-use module_support::CallBuilder;
-use primitives::currency::{AssetMetadata, BNC};
-use sp_core::bounded::BoundedVec;
-use xcm_emulator::TestExt;
-use xcm_executor::traits::Convert;
-
-pub const KARURA_ID: u32 = 2000;
-pub const MOCK_BIFROST_ID: u32 = 2001;
-pub const SIBLING_ID: u32 = 2002;
-
-fn karura_reserve_account() -> AccountId {
-	polkadot_parachain::primitives::Sibling::from(KARURA_ID).into_account_truncating()
-}
-fn sibling_reserve_account() -> AccountId {
-	polkadot_parachain::primitives::Sibling::from(SIBLING_ID).into_account_truncating()
-}
-fn bifrost_reserve_account() -> AccountId {
-	polkadot_parachain::primitives::Sibling::from(MOCK_BIFROST_ID).into_account_truncating()
-}
-
-#[test]
-fn transfer_from_relay_chain() {
-	KusamaNet::execute_with(|| {
-		assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			Box::new(Parachain(KARURA_ID).into_versioned()),
-			Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
-			Box::new((Here, dollar(KSM)).into()),
-			0
-		));
-	});
-
-	Karura::execute_with(|| {
-		assert_eq!(
-			Tokens::free_balance(KSM, &AccountId::from(BOB)),
-			dollar(KSM) - relay_per_second_as_fee(4)
-		);
-	});
-}
-
-#[test]
-fn transfer_to_relay_chain() {
-	use frame_support::weights::WeightToFee as WeightToFeeT;
-	use kusama_runtime_constants::fee::WeightToFee;
-
-	let weight: XcmWeight = XcmWeight::from_parts(299_506_000, 0);
-	let fee = WeightToFee::weight_to_fee(&weight);
-	assert_eq!(90_005_800, fee);
-
-	Karura::execute_with(|| {
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(ALICE.into()),
-			KSM,
-			dollar(KSM),
-			Box::new(MultiLocation::new(1, X1(Junction::AccountId32 { id: BOB, network: None })).into()),
-			WeightLimit::Limited(weight)
-		));
-	});
-
-	KusamaNet::execute_with(|| {
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&AccountId::from(BOB)),
-			dollar(KSM) - fee
-		);
-	});
-}
-
-#[test]
-fn transfer_native_chain_asset() {
-	TestNet::reset();
-	let dollar = dollar(BNC);
-	let minimal_balance = Balances::minimum_balance() / 10; // 10%
-	let foreign_fee = foreign_per_second_as_fee(4, minimal_balance);
-	let bnc_fee = bnc_per_second_as_fee(4);
-
-	MockBifrost::execute_with(|| {
-		// Register native BNC's incoming address as a foreign asset so it can receive BNC
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(MultiLocation::new(0, X1(Junction::from(BoundedVec::try_from(BNC_KEY.to_vec()).unwrap()))).into()),
-			Box::new(AssetMetadata {
-				name: b"Native BNC".to_vec(),
-				symbol: b"BNC".to_vec(),
-				decimals: 12,
-				minimal_balance
-			})
-		));
-		assert_ok!(Tokens::deposit(
-			CurrencyId::ForeignAsset(0),
-			&karura_reserve_account(),
-			100 * dollar
-		));
-
-		assert_ok!(Tokens::deposit(BNC, &AccountId::from(ALICE), 100 * dollar));
-
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(ALICE.into()),
-			BNC,
-			10 * dollar,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(KARURA_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: BOB.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90 * dollar);
-		assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 10 * dollar);
-	});
-
-	Karura::execute_with(|| {
-		assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 10 * dollar - bnc_fee);
-
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(BOB.into()),
-			BNC,
-			5 * dollar,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(MOCK_BIFROST_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: ALICE.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 5 * dollar - bnc_fee);
-	});
-
-	MockBifrost::execute_with(|| {
-		// Due to the re-anchoring, BNC came back as registered ForeignAsset(0)
-		assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90 * dollar);
-		assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 10 * dollar);
-
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)),
-			5 * dollar - foreign_fee
-		);
-		assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90 * dollar);
-	});
-}
-
-#[test]
-fn transfer_sibling_chain_asset() {
-	TestNet::reset();
-	let dollar = dollar(BNC);
-	let minimal_balance = Balances::minimum_balance() / 10; // 10%
-	let foreign_fee = foreign_per_second_as_fee(4, minimal_balance);
-	let bnc_fee = bnc_per_second_as_fee(4);
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::deposit(BNC, &AccountId::from(ALICE), 100 * dollar));
-	});
-
-	MockBifrost::execute_with(|| {
-		// Register native BNC's incoming address as a foreign asset so it can handle reserve transfers
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(MultiLocation::new(0, X1(Junction::from(BoundedVec::try_from(BNC_KEY.to_vec()).unwrap()))).into()),
-			Box::new(AssetMetadata {
-				name: b"Native BNC".to_vec(),
-				symbol: b"BNC".to_vec(),
-				decimals: 12,
-				minimal_balance,
-			})
-		));
-		assert_ok!(Tokens::deposit(
-			CurrencyId::ForeignAsset(0),
-			&karura_reserve_account(),
-			100 * dollar
-		));
-	});
-
-	Karura::execute_with(|| {
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(ALICE.into()),
-			BNC,
-			10 * dollar,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(SIBLING_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: BOB.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90 * dollar);
-	});
-
-	MockBifrost::execute_with(|| {
-		// Due to reanchoring BNC is not treated as native BNC due to the change of Multilocation
-		assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 0);
-		assert_eq!(Tokens::free_balance(BNC, &sibling_reserve_account()), 0);
-
-		// Registered Foreign asset 0 is used to handle reservation for BNC token.
-		// Karura -->(transfer 10_000_000_000_000)--> Sibling
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &karura_reserve_account()),
-			90 * dollar
-		);
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()),
-			10 * dollar - foreign_fee
-		);
-	});
-
-	Sibling::execute_with(|| {
-		assert_eq!(
-			Tokens::free_balance(BNC, &AccountId::from(BOB)),
-			10 * dollar - foreign_fee - bnc_fee
-		);
-
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(BOB.into()),
-			BNC,
-			5_000_000_000_000,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(KARURA_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: ALICE.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		assert_eq!(
-			Tokens::free_balance(BNC, &AccountId::from(BOB)),
-			5 * dollar - foreign_fee - bnc_fee
-		);
-	});
-
-	MockBifrost::execute_with(|| {
-		// Sibling -->(transfer 5_000_000_000_000)--> Karura
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &karura_reserve_account()),
-			95 * dollar - foreign_fee
-		);
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()),
-			5 * dollar - foreign_fee
-		);
-	});
-
-	Karura::execute_with(|| {
-		assert_eq!(
-			Tokens::free_balance(BNC, &AccountId::from(ALICE)),
-			95 * dollar - foreign_fee - bnc_fee
-		);
-	});
-}
-
-#[test]
-fn asset_registry_module_works() {
-	TestNet::reset();
-	let dollar = dollar(BNC);
-	let minimal_balance = Balances::minimum_balance() / 10; // 10%
-	let foreign_fee = foreign_per_second_as_fee(4, minimal_balance);
-	let bnc_fee = foreign_fee; // BuyWeightRateOfForeignAsset in prior to BncPerSecond
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::deposit(BNC, &AccountId::from(ALICE), 100 * dollar));
-	});
-
-	MockBifrost::execute_with(|| {
-		// Register native BNC's incoming address as a foreign asset so it can handle reserve transfers
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(MultiLocation::new(0, X1(Junction::from(BoundedVec::try_from(BNC_KEY.to_vec()).unwrap()))).into()),
-			Box::new(AssetMetadata {
-				name: b"Native BNC".to_vec(),
-				symbol: b"BNC".to_vec(),
-				decimals: 12,
-				minimal_balance
-			})
-		));
-		assert_ok!(Tokens::deposit(
-			CurrencyId::ForeignAsset(0),
-			&karura_reserve_account(),
-			100 * dollar
-		));
-	});
-
-	Sibling::execute_with(|| {
-		// Register BNC as foreign asset(0)
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(BIFROST_ID),
-						Junction::from(BoundedVec::try_from(BNC_KEY.to_vec()).unwrap())
-					)
-				)
-				.into()
-			),
-			Box::new(AssetMetadata {
-				name: b"Bifrost BNC".to_vec(),
-				symbol: b"BNC".to_vec(),
-				decimals: 12,
-				minimal_balance
-			})
-		));
-	});
-
-	Karura::execute_with(|| {
-		// Register BNC as foreign asset(0)
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(BIFROST_ID),
-						Junction::from(BoundedVec::try_from(BNC_KEY.to_vec()).unwrap())
-					)
-				)
-				.into()
-			),
-			Box::new(AssetMetadata {
-				name: b"Bifrost BNC".to_vec(),
-				symbol: b"BNC".to_vec(),
-				decimals: 12,
-				minimal_balance
-			})
-		));
-
-		assert_ok!(Tokens::deposit(
-			CurrencyId::ForeignAsset(0),
-			&AccountId::from(ALICE),
-			100 * dollar
-		));
-
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(ALICE.into()),
-			CurrencyId::ForeignAsset(0),
-			10 * dollar,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(SIBLING_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: BOB.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)),
-			90 * dollar
-		);
-	});
-
-	MockBifrost::execute_with(|| {
-		// Registered Foreign asset 0 is used to handle reservation for BNC token.
-		// Karura -->(transfer 10_000_000_000_000)--> Sibling
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &karura_reserve_account()),
-			90 * dollar
-		);
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()),
-			10 * dollar - foreign_fee
-		);
-	});
-
-	Sibling::execute_with(|| {
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)),
-			10 * dollar - foreign_fee - bnc_fee
-		);
-
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(BOB.into()),
-			CurrencyId::ForeignAsset(0),
-			5_000_000_000_000,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(KARURA_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: ALICE.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(1_000_000_000, 0)),
-		));
-
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)),
-			5 * dollar - foreign_fee - bnc_fee
-		);
-	});
-
-	MockBifrost::execute_with(|| {
-		// Sibling -->(transfer 5_000_000_000_000)--> Karura
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &karura_reserve_account()),
-			95 * dollar - foreign_fee
-		);
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()),
-			5 * dollar - foreign_fee
-		);
-	});
-
-	Karura::execute_with(|| {
-		assert_eq!(
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)),
-			95 * dollar - foreign_fee - bnc_fee
-		);
-	});
-}
-
-#[test]
-fn stable_asset_xtokens_works() {
-	TestNet::reset();
-	let stable_asset = CurrencyId::StableAssetPoolToken(0);
-	let foreign_asset = CurrencyId::ForeignAsset(0);
-	let dollar = dollar(KAR);
-	let minimal_balance = Balances::minimum_balance() / 10; // 10%
-	let foreign_fee = foreign_per_second_as_fee(4, minimal_balance);
-
-	MockBifrost::execute_with(|| {
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(KARURA_ID),
-						Junction::from(BoundedVec::try_from(stable_asset.encode()).unwrap())
-					)
-				)
-				.into()
-			),
-			Box::new(AssetMetadata {
-				name: b"Foreign Stable Asset".to_vec(),
-				symbol: b"SA".to_vec(),
-				decimals: 12,
-				minimal_balance
-			})
-		));
-	});
-
-	Karura::execute_with(|| {
-		assert_ok!(AssetRegistry::register_stable_asset(
-			RuntimeOrigin::root(),
-			Box::new(AssetMetadata {
-				name: b"Stable Asset".to_vec(),
-				symbol: b"SA".to_vec(),
-				decimals: 12,
-				minimal_balance
-			})
-		));
-		assert_ok!(Tokens::deposit(stable_asset, &AccountId::from(BOB), 10 * dollar));
-
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(BOB.into()),
-			stable_asset,
-			5 * dollar,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(MOCK_BIFROST_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: ALICE.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(8_000_000_000, 0)),
-		));
-
-		assert_eq!(Tokens::free_balance(stable_asset, &AccountId::from(BOB)), 5 * dollar);
-		assert_eq!(
-			Tokens::free_balance(stable_asset, &bifrost_reserve_account()),
-			5 * dollar
-		);
-	});
-
-	MockBifrost::execute_with(|| {
-		assert_eq!(
-			Tokens::free_balance(foreign_asset, &AccountId::from(ALICE)),
-			5 * dollar - foreign_fee
-		);
-
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(ALICE.into()),
-			foreign_asset,
-			dollar,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(KARURA_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: BOB.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(8_000_000_000, 0)),
-		));
-	});
-
-	Karura::execute_with(|| {
-		assert_eq!(
-			Tokens::free_balance(stable_asset, &AccountId::from(BOB)),
-			6 * dollar - foreign_fee
-		);
-		assert_eq!(
-			Tokens::free_balance(stable_asset, &bifrost_reserve_account()),
-			4 * dollar
-		);
-	});
-}
-
-#[test]
-fn transfer_from_relay_chain_deposit_to_treasury_if_below_ed() {
-	let minimum = relay_per_second_as_fee(4);
-	let ksm_minimum = Tokens::minimum_balance(KSM);
-	assert_eq!(ksm_minimum, 100_000_000);
-
-	fn below_ed_case(amount: Balance) {
-		TestNet::reset();
-		KusamaNet::execute_with(|| {
-			assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets(
-				kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-				Box::new(Parachain(KARURA_ID).into_versioned()),
-				Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
-				Box::new((Here, amount).into()),
-				0
-			));
-		});
-		Karura::execute_with(|| {
-			assert_eq!(Tokens::free_balance(KSM, &AccountId::from(BOB)), 0);
-			assert_eq!(
-				Tokens::free_balance(KSM, &karura_runtime::KaruraTreasuryAccount::get()),
-				dollar(KSM) + amount
-			);
-		});
-	}
-
-	fn upper_ed_case(amount: Balance) {
-		let minimum = relay_per_second_as_fee(4);
-
-		TestNet::reset();
-		KusamaNet::execute_with(|| {
-			assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets(
-				kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-				Box::new(Parachain(KARURA_ID).into_versioned()),
-				Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
-				Box::new((Here, amount).into()),
-				0
-			));
-		});
-		Karura::execute_with(|| {
-			assert_eq!(Tokens::free_balance(KSM, &AccountId::from(BOB)), amount - minimum);
-			assert_eq!(
-				Tokens::free_balance(KSM, &karura_runtime::KaruraTreasuryAccount::get()),
-				dollar(KSM) + minimum
-			);
-		});
-	}
-
-	below_ed_case(minimum);
-	below_ed_case(minimum + ksm_minimum - 1);
-	upper_ed_case(minimum + ksm_minimum);
-	upper_ed_case(minimum + ksm_minimum + 1);
-}
-
-#[test]
-fn xcm_transfer_execution_barrier_trader_works() {
-	let unit_instruction_weight: XcmWeight = karura_runtime::xcm_config::UnitWeightCost::get();
-	let expect_weight_limit = unit_instruction_weight.saturating_mul(3);
-	let weight_limit_too_low = expect_weight_limit.saturating_sub(XcmWeight::from_parts(1, 0));
-	let trap_asset_limit: Balance = relay_per_second_as_fee(3);
-
-	// relay-chain use normal account to send xcm, destination para-chain can't pass Barrier check
-	let message = Xcm(vec![
-		ReserveAssetDeposited((Parent, 100).into()),
-		BuyExecution {
-			fees: (Parent, 100).into(),
-			weight_limit: Unlimited,
-		},
-		DepositAsset {
-			assets: AllCounted(1).into(),
-			beneficiary: Here.into(),
-		},
-	]);
-	KusamaNet::execute_with(|| {
-		assert_ok!(pallet_xcm::Pallet::<kusama_runtime::Runtime>::send_xcm(
-			X1(Junction::AccountId32 {
-				network: None,
-				id: ALICE.into(),
-			}),
-			Parachain(KARURA_ID).into_location(),
-			message
-		));
-	});
-	Karura::execute_with(|| {
-		assert!(System::events().iter().any(|r| matches!(
-			r.event,
-			RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-				outcome: Outcome::Error(XcmError::Barrier),
-				..
-			})
-		)));
-	});
-
-	// AllowTopLevelPaidExecutionFrom barrier test case:
-	// para-chain use XcmExecutor `execute_xcm()` method to execute xcm.
-	// if `weight_limit` in BuyExecution is less than `xcm_weight(max_weight)`, then Barrier can't pass.
-	// other situation when `weight_limit` is `Unlimited` or large than `xcm_weight`, then it's ok.
-	let message = Xcm::<karura_runtime::RuntimeCall>(vec![
-		ReserveAssetDeposited((Parent, 100).into()),
-		BuyExecution {
-			fees: (Parent, 100).into(),
-			weight_limit: Limited(weight_limit_too_low),
-		},
-		DepositAsset {
-			assets: AllCounted(1).into(),
-			beneficiary: Here.into(),
-		},
-	]);
-	Karura::execute_with(|| {
-		let hash = message.using_encoded(sp_io::hashing::blake2_256);
-		let r = XcmExecutor::<XcmConfig>::execute_xcm(Parent, message, hash, expect_weight_limit);
-		assert_eq!(r, Outcome::Error(XcmError::Barrier));
-	});
-
-	// trader inside BuyExecution have TooExpensive error if payment less than calculated weight amount.
-	// the minimum of calculated weight amount(`FixedRateOfFungible<KsmPerSecond>`).
-	let message = Xcm::<karura_runtime::RuntimeCall>(vec![
-		ReserveAssetDeposited((Parent, trap_asset_limit - 1).into()),
-		BuyExecution {
-			fees: (Parent, trap_asset_limit - 1).into(),
-			weight_limit: Limited(expect_weight_limit),
-		},
-		DepositAsset {
-			assets: AllCounted(1).into(),
-			beneficiary: Here.into(),
-		},
-	]);
-	Karura::execute_with(|| {
-		let hash = message.using_encoded(sp_io::hashing::blake2_256);
-		let r = XcmExecutor::<XcmConfig>::execute_xcm(Parent, message, hash, expect_weight_limit);
-		assert_eq!(
-			r,
-			Outcome::Incomplete(expect_weight_limit - unit_instruction_weight, XcmError::TooExpensive)
-		);
-	});
-
-	// all situation fulfilled, execute success
-	let message = Xcm::<karura_runtime::RuntimeCall>(vec![
-		ReserveAssetDeposited((Parent, trap_asset_limit).into()),
-		BuyExecution {
-			fees: (Parent, trap_asset_limit).into(),
-			weight_limit: Limited(expect_weight_limit),
-		},
-		DepositAsset {
-			assets: AllCounted(1).into(),
-			beneficiary: Here.into(),
-		},
-	]);
-	Karura::execute_with(|| {
-		let hash = message.using_encoded(sp_io::hashing::blake2_256);
-		let r = XcmExecutor::<XcmConfig>::execute_xcm(Parent, message, hash, expect_weight_limit);
-		assert_eq!(r, Outcome::Complete(expect_weight_limit));
-	});
-}
-
-#[test]
-fn subscribe_version_notify_works() {
-	// relay chain subscribe version notify of para chain
-	KusamaNet::execute_with(|| {
-		let r = pallet_xcm::Pallet::<kusama_runtime::Runtime>::force_subscribe_version_notify(
-			kusama_runtime::RuntimeOrigin::root(),
-			Box::new(Parachain(KARURA_ID).into_versioned()),
-		);
-		assert_ok!(r);
-	});
-	KusamaNet::execute_with(|| {
-		kusama_runtime::System::assert_has_event(kusama_runtime::RuntimeEvent::XcmPallet(
-			pallet_xcm::Event::SupportedVersionChanged(
-				MultiLocation {
-					parents: 0,
-					interior: X1(Parachain(KARURA_ID)),
-				},
-				3,
-			),
-		));
-	});
-
-	// para chain subscribe version notify of relay chain
-	Karura::execute_with(|| {
-		let r = pallet_xcm::Pallet::<karura_runtime::Runtime>::force_subscribe_version_notify(
-			RuntimeOrigin::root(),
-			Box::new(Parent.into()),
-		);
-		assert_ok!(r);
-	});
-	Karura::execute_with(|| {
-		System::assert_has_event(karura_runtime::RuntimeEvent::PolkadotXcm(
-			pallet_xcm::Event::SupportedVersionChanged(
-				MultiLocation {
-					parents: 1,
-					interior: Here,
-				},
-				3,
-			),
-		));
-	});
-
-	// para chain subscribe version notify of sibling chain
-	Karura::execute_with(|| {
-		let r = pallet_xcm::Pallet::<karura_runtime::Runtime>::force_subscribe_version_notify(
-			RuntimeOrigin::root(),
-			Box::new((Parent, Parachain(SIBLING_ID)).into()),
-		);
-		assert_ok!(r);
-	});
-	Karura::execute_with(|| {
-		assert!(karura_runtime::System::events().iter().any(|r| matches!(
-			r.event,
-			karura_runtime::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent {
-				message_hash: Some(_)
-			})
-		)));
-	});
-	Sibling::execute_with(|| {
-		assert!(System::events().iter().any(|r| matches!(
-			r.event,
-			karura_runtime::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent {
-				message_hash: Some(_)
-			}) | karura_runtime::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Success {
-				message_hash: Some(_),
-				..
-			})
-		)));
-	});
-}
-
-#[test]
-fn unspent_xcm_fee_is_returned_correctly() {
-	let parachain_account: AccountId = polkadot_parachain::primitives::Id::from(KARURA_ID).into_account_truncating();
-	let homa_lite_sub_account: AccountId =
-		hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into();
-	let dollar_r = dollar(RELAY_CHAIN_CURRENCY);
-	let dollar_n = dollar(NATIVE_CURRENCY);
-
-	KusamaNet::execute_with(|| {
-		assert_ok!(kusama_runtime::Balances::transfer(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			MultiAddress::Id(homa_lite_sub_account.clone()),
-			1_000 * dollar_r
-		));
-		assert_ok!(kusama_runtime::Balances::transfer(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			MultiAddress::Id(parachain_account.clone()),
-			1_000 * dollar_r
-		));
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&AccountId::from(ALICE)),
-			2 * dollar_r
-		);
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account),
-			1_000 * dollar_r
-		);
-		assert_eq!(kusama_runtime::Balances::free_balance(&AccountId::from(BOB)), 0);
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account.clone()),
-			1_002 * dollar_r
-		);
-	});
-
-	Karura::execute_with(|| {
-		// Construct a transfer XCM call with returning the deposit
-		let transfer_call =
-			RelayChainCallBuilder::<ParachainInfo>::balances_transfer_keep_alive(AccountId::from(BOB), dollar_n);
-		let batch_call = RelayChainCallBuilder::<ParachainInfo>::utility_as_derivative_call(transfer_call, 0);
-		let weight = XcmWeight::from_parts(10_000_000_000, 0);
-		// Fee to transfer into the hold register
-		let asset = MultiAsset {
-			id: Concrete(MultiLocation::here()),
-			fun: Fungibility::Fungible(dollar_n),
-		};
-		let xcm_msg = Xcm(vec![
-			WithdrawAsset(asset.clone().into()),
-			BuyExecution {
-				fees: asset,
-				weight_limit: Unlimited,
-			},
-			Transact {
-				origin_kind: OriginKind::SovereignAccount,
-				require_weight_at_most: weight,
-				call: batch_call.encode().into(),
-			},
-		]);
-
-		assert_ok!(PolkadotXcm::send_xcm(Here, Parent, xcm_msg));
-	});
-
-	KusamaNet::execute_with(|| {
-		// 1 dollar is transferred to BOB
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account),
-			999 * dollar_r
-		);
-		assert_eq!(kusama_runtime::Balances::free_balance(&AccountId::from(BOB)), dollar_r);
-		// 1 dollar is given to Hold Register for XCM call and never returned.
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account.clone()),
-			1_001 * dollar_r
-		);
-	});
-
-	Karura::execute_with(|| {
-		// Construct a transfer using the RelaychainCallBuilder
-		let transfer_call =
-			RelayChainCallBuilder::<ParachainInfo>::balances_transfer_keep_alive(AccountId::from(BOB), dollar_n);
-		let batch_call = RelayChainCallBuilder::<ParachainInfo>::utility_as_derivative_call(transfer_call, 0);
-		let finalized_call = RelayChainCallBuilder::<ParachainInfo>::finalize_call_into_xcm_message(
-			batch_call,
-			dollar_n,
-			XcmWeight::from_parts(10_000_000_000, 0),
-		);
-
-		assert_ok!(PolkadotXcm::send_xcm(Here, Parent, finalized_call));
-	});
-
-	KusamaNet::execute_with(|| {
-		// 1 dollar is transferred to BOB
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account),
-			998 * dollar_r
-		);
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&AccountId::from(BOB)),
-			2 * dollar_r
-		);
-		// Unspent fund from the 1 dollar XCM fee is returned to the sovereign account.
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account.clone()),
-			1_000 * dollar_r + 996_900_712_827
-		);
-	});
-}
-
-fn trapped_asset() -> MultiAsset {
-	let asset = MultiAsset {
-		id: Concrete(MultiLocation::here()),
-		fun: Fungibility::Fungible(dollar(NATIVE_CURRENCY)),
-	};
-
-	Karura::execute_with(|| {
-		let transfer_call = RelayChainCallBuilder::<ParachainInfo>::balances_transfer_keep_alive(
-			AccountId::from(BOB),
-			dollar(NATIVE_CURRENCY),
-		);
-		let weight = XcmWeight::from_parts(100, 0);
-		let xcm_msg = Xcm(vec![
-			WithdrawAsset(asset.clone().into()),
-			BuyExecution {
-				fees: asset,
-				weight_limit: Unlimited,
-			},
-			Transact {
-				origin_kind: OriginKind::SovereignAccount,
-				require_weight_at_most: weight,
-				call: transfer_call.encode().into(),
-			},
-		]);
-		// we can use PolkadotXcm::send_xcm() or OrmlXcm::send_as_sovereign()
-		// assert_ok!(PolkadotXcm::send_xcm(Here, Parent, xcm_msg));
-		assert_ok!(karura_runtime::OrmlXcm::send_as_sovereign(
-			RuntimeOrigin::root(),
-			Box::new(Parent.into()),
-			Box::new(xcm::prelude::VersionedXcm::from(xcm_msg))
-		));
-	});
-
-	let trapped_asset = MultiAsset {
-		id: Concrete(MultiLocation::here()),
-		fun: Fungibility::Fungible(999_951_112_624),
-	};
-
-	KusamaNet::execute_with(|| {
-		let location = MultiLocation::new(0, X1(Parachain(KARURA_ID)));
-		let versioned = xcm::VersionedMultiAssets::from(MultiAssets::from(vec![trapped_asset.clone()]));
-		let hash = BlakeTwo256::hash_of(&(&location, &versioned));
-		kusama_runtime::System::assert_has_event(kusama_runtime::RuntimeEvent::XcmPallet(
-			pallet_xcm::Event::AssetsTrapped(hash, location, versioned),
-		));
-
-		assert!(kusama_runtime::System::events().iter().any(|r| matches!(
-			r.event,
-			kusama_runtime::RuntimeEvent::Ump(polkadot_runtime_parachains::ump::Event::ExecutedUpward(
-				_,
-				xcm::v3::Outcome::Incomplete(_, _)
-			))
-		)));
-
-		kusama_runtime::System::reset_events();
-	});
-
-	trapped_asset
-}
-
-fn claim_asset(asset: MultiAsset, recipient: [u8; 32]) {
-	Karura::execute_with(|| {
-		let recipient = MultiLocation::new(
-			0,
-			X1(Junction::AccountId32 {
-				network: None,
-				id: recipient,
-			}),
-		);
-		let xcm_msg = Xcm(vec![
-			ClaimAsset {
-				assets: vec![asset.clone()].into(),
-				ticket: Here.into(),
-			},
-			BuyExecution {
-				fees: asset,
-				weight_limit: Unlimited,
-			},
-			DepositAsset {
-				assets: AllCounted(1).into(),
-				beneficiary: recipient,
-			},
-		]);
-		assert_ok!(karura_runtime::OrmlXcm::send_as_sovereign(
-			RuntimeOrigin::root(),
-			Box::new(Parent.into()),
-			Box::new(xcm::prelude::VersionedXcm::from(xcm_msg))
-		));
-	});
-}
-
-#[test]
-fn claim_trapped_asset_works() {
-	let claimed_amount = 999_866_026_842;
-	let asset = trapped_asset();
-	claim_asset(asset, BOB.into());
-
-	KusamaNet::execute_with(|| {
-		assert_eq!(
-			claimed_amount,
-			kusama_runtime::Balances::free_balance(&AccountId::from(BOB))
-		);
-		assert!(kusama_runtime::System::events().iter().any(|r| matches!(
-			r.event,
-			kusama_runtime::RuntimeEvent::Ump(polkadot_runtime_parachains::ump::Event::ExecutedUpward(
-				_,
-				xcm::v3::Outcome::Complete(_)
-			))
-		)));
-	});
-
-	// multi trapped asset
-	TestNet::reset();
-	let asset1 = trapped_asset();
-	let asset2 = trapped_asset();
-	assert_eq!(asset1, asset2);
-	claim_asset(asset1, BOB.into());
-	KusamaNet::execute_with(|| {
-		assert_eq!(
-			claimed_amount,
-			kusama_runtime::Balances::free_balance(&AccountId::from(BOB))
-		);
-	});
-	claim_asset(asset2, BOB.into());
-	KusamaNet::execute_with(|| {
-		assert_eq!(
-			claimed_amount * 2,
-			kusama_runtime::Balances::free_balance(&AccountId::from(BOB))
-		);
-	});
-}
-
-#[test]
-fn trap_assets_larger_than_ed_works() {
-	TestNet::reset();
-
-	let mut kar_treasury_amount = 0;
-	let (ksm_asset_amount, kar_asset_amount) = (dollar(KSM), dollar(KAR));
-	let trader_weight_to_treasury: u128 = relay_per_second_as_fee(3);
-
-	let parent_account: AccountId = ParentIsPreset::<AccountId>::convert(Parent.into()).unwrap();
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::deposit(KSM, &parent_account, 100 * dollar(KSM)));
-		let _ = pallet_balances::Pallet::<Runtime>::deposit_creating(&parent_account, 100 * dollar(KAR));
-
-		kar_treasury_amount = Currencies::free_balance(KAR, &KaruraTreasuryAccount::get());
-	});
-
-	let assets: MultiAsset = (Parent, ksm_asset_amount).into();
-	KusamaNet::execute_with(|| {
-		let xcm = vec![
-			WithdrawAsset(assets.clone().into()),
-			BuyExecution {
-				fees: assets,
-				weight_limit: Limited(XcmWeight::from_parts(800_000_000, 0)),
-			},
-			WithdrawAsset(
-				(
-					MultiLocation::new(0, Junction::from(BoundedVec::try_from(KAR.encode()).unwrap())),
-					kar_asset_amount,
-				)
-					.into(),
-			),
-		];
-		assert_ok!(pallet_xcm::Pallet::<kusama_runtime::Runtime>::send_xcm(
-			Here,
-			Parachain(KARURA_ID),
-			Xcm(xcm),
-		));
-	});
-
-	Karura::execute_with(|| {
-		assert!(System::events().iter().any(|r| matches!(
-			r.event,
-			RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _))
-		)));
-
-		assert_eq!(
-			trader_weight_to_treasury + dollar(KSM),
-			Currencies::free_balance(KSM, &KaruraTreasuryAccount::get())
-		);
-		assert_eq!(
-			kar_treasury_amount,
-			Currencies::free_balance(KAR, &KaruraTreasuryAccount::get())
-		);
-	});
-}
-
-#[test]
-fn trap_assets_lower_than_ed_works() {
-	TestNet::reset();
-
-	let mut kar_treasury_amount = 0;
-	let (ksm_asset_amount, kar_asset_amount) = (relay_per_second_as_fee(5), cent(KAR));
-
-	let parent_account: AccountId = ParentIsPreset::<AccountId>::convert(Parent.into()).unwrap();
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::deposit(KSM, &parent_account, dollar(KSM)));
-		let _ = pallet_balances::Pallet::<Runtime>::deposit_creating(&parent_account, dollar(KAR));
-		kar_treasury_amount = Currencies::free_balance(KAR, &KaruraTreasuryAccount::get());
-	});
-
-	let assets: MultiAsset = (Parent, ksm_asset_amount).into();
-	KusamaNet::execute_with(|| {
-		let xcm = vec![
-			WithdrawAsset(assets.clone().into()),
-			BuyExecution {
-				fees: assets,
-				weight_limit: Limited(XcmWeight::from_parts(800_000_000, 0)),
-			},
-			WithdrawAsset(
-				(
-					MultiLocation::new(0, X1(Junction::from(BoundedVec::try_from(KAR.encode()).unwrap()))),
-					kar_asset_amount,
-				)
-					.into(),
-			),
-			// two asset left in holding register, they both lower than ED, so goes to treasury.
-		];
-		assert_ok!(pallet_xcm::Pallet::<kusama_runtime::Runtime>::send_xcm(
-			Here,
-			Parachain(KARURA_ID),
-			Xcm(xcm),
-		));
-	});
-
-	Karura::execute_with(|| {
-		assert_eq!(
-			System::events().iter().find(|r| matches!(
-				r.event,
-				RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _))
-			)),
-			None
-		);
-
-		assert_eq!(
-			ksm_asset_amount + dollar(KSM),
-			Currencies::free_balance(KSM, &KaruraTreasuryAccount::get())
-		);
-		assert_eq!(
-			kar_asset_amount,
-			Currencies::free_balance(KAR, &KaruraTreasuryAccount::get()) - kar_treasury_amount
-		);
-	});
-}
-
-#[test]
-fn sibling_trap_assets_works() {
-	TestNet::reset();
-
-	let mut kar_treasury_amount = 0;
-	let (bnc_asset_amount, kar_asset_amount) = (cent(BNC) / 10, cent(KAR));
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::deposit(BNC, &sibling_reserve_account(), 100 * dollar(BNC)));
-		let _ = pallet_balances::Pallet::<Runtime>::deposit_creating(&sibling_reserve_account(), 100 * dollar(KAR));
-		kar_treasury_amount = Currencies::free_balance(KAR, &KaruraTreasuryAccount::get());
-	});
-
-	Sibling::execute_with(|| {
-		let assets: MultiAsset = (
-			MultiLocation::new(0, X1(Junction::from(BoundedVec::try_from(KAR.encode()).unwrap()))),
-			kar_asset_amount,
-		)
-			.into();
-
-		let xcm = vec![
-			WithdrawAsset(assets.clone().into()),
-			BuyExecution {
-				fees: assets,
-				weight_limit: Unlimited,
-			},
-			WithdrawAsset(
-				(
-					(
-						Parent,
-						X2(
-							Parachain(BIFROST_ID),
-							Junction::from(BoundedVec::try_from(BNC_KEY.to_vec()).unwrap()),
-						),
-					),
-					bnc_asset_amount,
-				)
-					.into(),
-			),
-		];
-		assert_ok!(pallet_xcm::Pallet::<Runtime>::send_xcm(
-			Here,
-			(Parent, Parachain(KARURA_ID)),
-			Xcm(xcm),
-		));
-	});
-
-	Karura::execute_with(|| {
-		assert_eq!(
-			System::events().iter().find(|r| matches!(
-				r.event,
-				RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _))
-			)),
-			None
-		);
-		assert_eq!(
-			Currencies::free_balance(KAR, &KaruraTreasuryAccount::get()) - kar_treasury_amount,
-			kar_asset_amount
-		);
-		assert_eq!(
-			Currencies::free_balance(BNC, &KaruraTreasuryAccount::get()),
-			bnc_asset_amount
-		);
-	});
-}
-
-#[test]
-fn send_arbitrary_xcm_fails() {
-	TestNet::reset();
-
-	Karura::execute_with(|| {
-		assert_noop!(
-			PolkadotXcm::send(
-				karura_runtime::RuntimeOrigin::signed(ALICE.into()),
-				Box::new(MultiLocation::new(1, Here).into()),
-				Box::new(VersionedXcm::from(Xcm(vec![WithdrawAsset((Here, 1).into())]))),
-			),
-			BadOrigin
-		);
-	});
-}
diff --git a/runtime/integration-tests/src/relaychain/kusama_test_net.rs b/runtime/integration-tests/src/relaychain/kusama_test_net.rs
deleted file mode 100644
index 4b5b3055d4..0000000000
--- a/runtime/integration-tests/src/relaychain/kusama_test_net.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Relay chain and parachains emulation.
-
-use crate::setup::*;
-
-use cumulus_primitives_core::ParaId;
-use frame_support::traits::GenesisBuild;
-use polkadot_primitives::v4::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
-use polkadot_runtime_parachains::configuration::HostConfiguration;
-use sp_runtime::traits::AccountIdConversion;
-
-use xcm_emulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain};
-
-decl_test_relay_chain! {
-	pub struct KusamaNet {
-		Runtime = kusama_runtime::Runtime,
-		XcmConfig = kusama_runtime::xcm_config::XcmConfig,
-		new_ext = kusama_ext(),
-	}
-}
-
-decl_test_parachain! {
-	pub struct Karura {
-		Runtime = Runtime,
-		RuntimeOrigin = RuntimeOrigin,
-		XcmpMessageHandler = karura_runtime::XcmpQueue,
-		DmpMessageHandler = karura_runtime::DmpQueue,
-		new_ext = para_ext(2000),
-	}
-}
-
-decl_test_parachain! {
-	pub struct MockBifrost {
-		Runtime = Runtime,
-		RuntimeOrigin = RuntimeOrigin,
-		XcmpMessageHandler = karura_runtime::XcmpQueue,
-		DmpMessageHandler = karura_runtime::DmpQueue,
-		new_ext = para_ext(2001),
-	}
-}
-
-decl_test_parachain! {
-	pub struct Sibling {
-		Runtime = Runtime,
-		RuntimeOrigin = RuntimeOrigin,
-		XcmpMessageHandler = karura_runtime::XcmpQueue,
-		DmpMessageHandler = karura_runtime::DmpQueue,
-		new_ext = para_ext(2002),
-	}
-}
-
-decl_test_parachain! {
-	pub struct Statemine {
-		Runtime = statemine_runtime::Runtime,
-		RuntimeOrigin = statemine_runtime::RuntimeOrigin,
-		XcmpMessageHandler = statemine_runtime::XcmpQueue,
-		DmpMessageHandler = statemine_runtime::DmpQueue,
-		new_ext = para_ext(1000),
-	}
-}
-
-decl_test_network! {
-	pub struct TestNet {
-		relay_chain = KusamaNet,
-		parachains = vec![
-			(1000, Statemine),
-			(2000, Karura),
-			(2001, MockBifrost),
-			(2002, Sibling),
-		],
-	}
-}
-
-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()
-	}
-}
-
-pub fn kusama_ext() -> sp_io::TestExternalities {
-	use kusama_runtime::{Runtime, System};
-
-	let mut t = frame_system::GenesisConfig::default()
-		.build_storage::<Runtime>()
-		.unwrap();
-
-	pallet_balances::GenesisConfig::<Runtime> {
-		balances: vec![
-			(AccountId::from(ALICE), 2002 * dollar(KSM)),
-			(ParaId::from(2000).into_account_truncating(), 2 * dollar(KSM)),
-		],
-	}
-	.assimilate_storage(&mut t)
-	.unwrap();
-
-	polkadot_runtime_parachains::configuration::GenesisConfig::<Runtime> {
-		config: default_parachains_host_configuration(),
-	}
-	.assimilate_storage(&mut t)
-	.unwrap();
-
-	<pallet_xcm::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
-		&pallet_xcm::GenesisConfig {
-			safe_xcm_version: Some(2),
-		},
-		&mut t,
-	)
-	.unwrap();
-
-	let mut ext = sp_io::TestExternalities::new(t);
-	ext.execute_with(|| System::set_block_number(1));
-	ext
-}
-
-pub fn para_ext(parachain_id: u32) -> sp_io::TestExternalities {
-	ExtBuilder::default()
-		.balances(vec![
-			(AccountId::from(ALICE), KSM, 10 * dollar(KSM)),
-			(karura_runtime::KaruraTreasuryAccount::get(), KSM, dollar(KSM)),
-		])
-		.parachain_id(parachain_id)
-		.build()
-}
diff --git a/runtime/integration-tests/src/relaychain/liquid_crowdloan.rs b/runtime/integration-tests/src/relaychain/liquid_crowdloan.rs
deleted file mode 100644
index 7639f8f578..0000000000
--- a/runtime/integration-tests/src/relaychain/liquid_crowdloan.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-use crate::relaychain::polkadot_test_net::*;
-use crate::setup::*;
-
-use frame_support::assert_ok;
-use module_xcm_interface::XcmInterfaceOperation;
-use sp_runtime::traits::StaticLookup;
-use xcm_emulator::TestExt;
-
-const ACALA_PARA_ID: u32 = 2000;
-
-//TODO: Enable after Polkadot runtime allows XCM proxy calls:
-// https://github.com/paritytech/polkadot/blob/5c554b95e223b507a9b7e420e2cdee06e0982ab0/runtime/polkadot/src/xcm_config.rs#L167
-#[ignore = "polkadot runtime does not allow XCM proxy calls"]
-#[test]
-fn transfer_from_crowdloan_vault_works() {
-	TestNet::reset();
-
-	let vault = acala_runtime::CrowdloanVault::get();
-	let module_liquid_crowdloan_account = acala_runtime::LiquidCrowdloan::account_id();
-	let acala_sovereign_account: AccountId = ParaId::from(ACALA_PARA_ID).into_account_truncating();
-
-	PolkadotNet::execute_with(|| {
-		use polkadot_runtime::{Balances, Proxy, ProxyType, Runtime, RuntimeOrigin};
-
-		let _ = Balances::deposit_creating(&vault, dollar(DOT) * 100);
-
-		assert_ok!(Proxy::add_proxy(
-			RuntimeOrigin::signed(vault.clone()),
-			<Runtime as frame_system::Config>::Lookup::unlookup(acala_sovereign_account.clone()),
-			ProxyType::Any,
-			0
-		));
-
-		// NOTE: the following code is to help debugging via duplicating the XCM transact in
-		// Polkadot runtime. Feel free to delete it after Polkadot runtime allows XCM proxy calls
-		// and the test can be enabled.
-
-		// let call = RuntimeCall::XcmPallet(pallet_xcm::Call::reserve_transfer_assets {
-		// 	dest: Box::new(Parachain(2000).into_versioned()),
-		// 	beneficiary: Box::new(
-		// 		Junction::AccountId32 {
-		// 			id: module_liquid_crowdloan_account.clone().into(),
-		// 			network: None
-		// 		}
-		// 		.into_versioned()
-		// 	),
-		// 	assets: Box::new((Here, dollar(DOT)).into()),
-		// 	fee_asset_item: 0,
-		// });
-		// assert_ok!(Proxy::proxy(
-		// 	RuntimeOrigin::signed(acala_sovereign_account.clone()),
-		// 	<Runtime as frame_system::Config>::Lookup::unlookup(vault.clone()),
-		// 	None,
-		// 	Box::new(call),
-		// ));
-	});
-
-	Acala::execute_with(|| {
-		use acala_runtime::{LiquidCrowdloan, RuntimeOrigin, XcmInterface};
-
-		assert_ok!(XcmInterface::update_xcm_dest_weight_and_fee(
-			RuntimeOrigin::root(),
-			vec![(
-				XcmInterfaceOperation::ProxyReserveTransferAssets,
-				Some(XcmWeight::from_parts(20_000_000_000, 0)),
-				Some(100_000_000_000)
-			)]
-		));
-
-		assert_ok!(LiquidCrowdloan::transfer_from_crowdloan_vault(
-			RuntimeOrigin::root(),
-			dollar(DOT),
-		));
-
-		assert_eq!(
-			Tokens::free_balance(DOT, &module_liquid_crowdloan_account),
-			9_998_397_440,
-		);
-	});
-}
diff --git a/runtime/integration-tests/src/relaychain/mod.rs b/runtime/integration-tests/src/relaychain/mod.rs
deleted file mode 100644
index e6f4e8be7b..0000000000
--- a/runtime/integration-tests/src/relaychain/mod.rs
+++ /dev/null
@@ -1,295 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-mod relay_chain;
-
-#[cfg(feature = "with-karura-runtime")]
-mod erc20;
-#[cfg(feature = "with-karura-runtime")]
-mod kusama_cross_chain_transfer;
-#[cfg(feature = "with-karura-runtime")]
-pub mod kusama_test_net;
-#[cfg(feature = "with-karura-runtime")]
-mod statemine;
-
-#[cfg(feature = "with-acala-runtime")]
-mod liquid_crowdloan;
-#[cfg(feature = "with-acala-runtime")]
-mod polkadot_cross_chain_transfer;
-#[cfg(feature = "with-acala-runtime")]
-pub mod polkadot_test_net;
-#[cfg(feature = "with-acala-runtime")]
-mod statemint;
-
-pub use fee_test::{relay_per_second_as_fee, token_per_second_as_fee};
-use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight};
-use sp_runtime::{FixedPointNumber, FixedU128};
-
-// N * unit_weight * (weight/10^12) * token_per_second
-fn weight_calculation(instruction_count: u32, unit_weight: Weight, per_second: u128) -> u128 {
-	let weight = unit_weight.saturating_mul(instruction_count as u64);
-	let weight_ratio = FixedU128::saturating_from_rational(weight.ref_time(), WEIGHT_REF_TIME_PER_SECOND);
-	weight_ratio.saturating_mul_int(per_second)
-}
-
-// N * unit_weight * (weight/10^12) * token_per_second *
-// (minimal_balance/native_asset_minimal_balance)
-fn foreign_asset_fee(weight: u128, minimal_balance: u128) -> u128 {
-	use crate::setup::Balances;
-	use frame_support::traits::fungible::Inspect;
-
-	let minimum_ratio = FixedU128::saturating_from_rational(minimal_balance, Balances::minimum_balance());
-	minimum_ratio.saturating_mul_int(weight)
-}
-
-// N * unit_weight * (weight/10^12) * token_per_second * token_rate
-fn token_asset_fee(weight: u128, token_rate: FixedU128) -> u128 {
-	token_rate.saturating_mul_int(weight as u128)
-}
-
-mod fee_test {
-	use super::{foreign_asset_fee, token_asset_fee, weight_calculation};
-	use crate::setup::*;
-
-	fn native_unit_cost(instruction_count: u32, per_second: u128) -> u128 {
-		#[cfg(feature = "with-karura-runtime")]
-		let unit_weight: Weight = karura_runtime::xcm_config::UnitWeightCost::get();
-		#[cfg(feature = "with-karura-runtime")]
-		assert_eq!(unit_weight, Weight::from_parts(200_000_000, 0));
-
-		#[cfg(feature = "with-acala-runtime")]
-		let unit_weight: Weight = acala_runtime::xcm_config::UnitWeightCost::get();
-		#[cfg(feature = "with-acala-runtime")]
-		assert_eq!(unit_weight, Weight::from_parts(200_000_000, 0));
-
-		#[cfg(feature = "with-mandala-runtime")]
-		let unit_weight: Weight = mandala_runtime::xcm_config::UnitWeightCost::get();
-		#[cfg(feature = "with-mandala-runtime")]
-		assert_eq!(unit_weight, Weight::from_parts(1_000_000, 0));
-
-		weight_calculation(instruction_count, unit_weight, per_second)
-	}
-
-	pub fn relay_per_second_as_fee(instruction_count: u32) -> u128 {
-		#[cfg(feature = "with-karura-runtime")]
-		let relay_per_second = karura_runtime::ksm_per_second();
-		#[cfg(feature = "with-karura-runtime")]
-		assert_eq!(175_980_000_000, relay_per_second);
-
-		#[cfg(feature = "with-acala-runtime")]
-		let relay_per_second = acala_runtime::dot_per_second();
-		#[cfg(feature = "with-acala-runtime")]
-		assert_eq!(1_759_800_000, relay_per_second);
-
-		#[cfg(feature = "with-mandala-runtime")]
-		let relay_per_second = mandala_runtime::dot_per_second();
-		#[cfg(feature = "with-mandala-runtime")]
-		assert_eq!(87_990_000_000, relay_per_second);
-
-		native_unit_cost(instruction_count, relay_per_second)
-	}
-
-	pub fn native_per_second_as_fee(instruction_count: u32) -> u128 {
-		#[cfg(feature = "with-karura-runtime")]
-		let native_per_second = karura_runtime::kar_per_second();
-		#[cfg(feature = "with-karura-runtime")]
-		assert_eq!(8_799_000_000_000, native_per_second);
-		#[cfg(feature = "with-acala-runtime")]
-		let native_per_second = acala_runtime::aca_per_second();
-		#[cfg(feature = "with-acala-runtime")]
-		assert_eq!(8_799_000_000_000, native_per_second);
-		#[cfg(feature = "with-mandala-runtime")]
-		let native_per_second = mandala_runtime::aca_per_second();
-		#[cfg(feature = "with-mandala-runtime")]
-		assert_eq!(8_799_000_000_000, native_per_second);
-
-		native_unit_cost(instruction_count, native_per_second)
-	}
-
-	#[cfg(feature = "with-karura-runtime")]
-	pub fn bnc_per_second_as_fee(instruction_count: u32) -> u128 {
-		relay_per_second_as_fee(instruction_count) * 80
-	}
-
-	pub fn foreign_per_second_as_fee(instruction_count: u32, minimal_balance: u128) -> u128 {
-		#[cfg(feature = "with-karura-runtime")]
-		let native_per_second = karura_runtime::kar_per_second();
-		#[cfg(feature = "with-acala-runtime")]
-		let native_per_second = acala_runtime::aca_per_second();
-		#[cfg(feature = "with-mandala-runtime")]
-		let native_per_second = mandala_runtime::aca_per_second();
-
-		let weight = native_unit_cost(instruction_count, native_per_second);
-
-		foreign_asset_fee(weight, minimal_balance)
-	}
-
-	pub fn token_per_second_as_fee(instruction_count: u32, rate: FixedU128) -> u128 {
-		let native_fee = native_per_second_as_fee(instruction_count);
-		token_asset_fee(native_fee, rate)
-	}
-
-	#[cfg(feature = "with-karura-runtime")]
-	#[test]
-	fn karura_per_second_works() {
-		assert_eq!(140_784_000, relay_per_second_as_fee(4));
-		assert_eq!(105_588_000, relay_per_second_as_fee(3));
-		assert_eq!(7_039_200_000, native_per_second_as_fee(4));
-		assert_eq!(11_262_720_000, bnc_per_second_as_fee(4));
-
-		assert_eq!(7_039_200_000, foreign_per_second_as_fee(4, Balances::minimum_balance()));
-		assert_eq!(
-			703_920_000,
-			foreign_per_second_as_fee(4, Balances::minimum_balance() / 10)
-		);
-	}
-
-	#[cfg(feature = "with-acala-runtime")]
-	#[test]
-	fn acala_per_second_works() {
-		assert_eq!(1_407_840, relay_per_second_as_fee(4));
-		assert_eq!(1_055_880, relay_per_second_as_fee(3));
-		assert_eq!(7_039_200_000, native_per_second_as_fee(4));
-
-		assert_eq!(7_039_200_000, foreign_per_second_as_fee(4, Balances::minimum_balance()));
-		assert_eq!(
-			703_920_000,
-			foreign_per_second_as_fee(4, Balances::minimum_balance() / 10)
-		);
-	}
-
-	#[cfg(feature = "with-mandala-runtime")]
-	#[test]
-	fn mandala_per_second_works() {
-		assert_eq!(351_960, relay_per_second_as_fee(4));
-		assert_eq!(263_970, relay_per_second_as_fee(3));
-		assert_eq!(35_196_000, native_per_second_as_fee(4));
-
-		assert_eq!(35_196_000, foreign_per_second_as_fee(4, Balances::minimum_balance()));
-		assert_eq!(
-			3_519_600,
-			foreign_per_second_as_fee(4, Balances::minimum_balance() / 10)
-		);
-	}
-}
-
-#[test]
-fn weight_to_fee_works() {
-	#[cfg(any(feature = "with-karura-runtime", feature = "with-acala-runtime"))]
-	use frame_support::weights::{Weight, WeightToFee as WeightToFeeT};
-
-	// Kusama
-	#[cfg(feature = "with-karura-runtime")]
-	{
-		use kusama_runtime_constants::fee::WeightToFee;
-
-		let base_weight: Weight = kusama_runtime::xcm_config::BaseXcmWeight::get();
-		assert_eq!(base_weight, Weight::from_parts(1_000_000_000, 65536));
-
-		let weight: Weight = base_weight.saturating_mul(4);
-		let fee = WeightToFee::weight_to_fee(&weight);
-		assert_eq!(1_202_056_716, fee);
-
-		// transfer_to_relay_chain weight in KusamaNet
-		let weight: Weight = Weight::from_parts(299_506_000, 0);
-		let fee = WeightToFee::weight_to_fee(&weight);
-		assert_eq!(90_005_800, fee);
-	}
-
-	// Polkadot
-	#[cfg(feature = "with-acala-runtime")]
-	{
-		use polkadot_runtime_constants::fee::WeightToFee;
-
-		let base_weight: Weight = polkadot_runtime::xcm_config::BaseXcmWeight::get();
-		assert_eq!(base_weight, Weight::from_parts(1_000_000_000, 1024));
-
-		let weight: Weight = base_weight.saturating_mul(4);
-		let fee = WeightToFee::weight_to_fee(&weight);
-		assert_eq!(364_421_524, fee);
-
-		// transfer_to_relay_chain weight in PolkadotNet
-		let weight: Weight = Weight::from_parts(299_506_000, 0);
-		let fee = WeightToFee::weight_to_fee(&weight);
-		assert_eq!(27_286_608, fee);
-	}
-
-	// Statemine
-	#[cfg(feature = "with-karura-runtime")]
-	{
-		use statemine_runtime::constants::fee::WeightToFee;
-
-		let base_weight: Weight = Weight::from_parts(1_000_000_000, 0);
-
-		let weight: Weight = base_weight.saturating_mul(4);
-		let fee = WeightToFee::weight_to_fee(&weight);
-		assert_eq!(117_331_640, fee);
-	}
-
-	// Statemint
-	#[cfg(feature = "with-acala-runtime")]
-	{
-		use statemint_runtime::constants::fee::WeightToFee;
-
-		let base_weight: Weight = Weight::from_parts(1_000_000_000, 0);
-
-		let weight: Weight = base_weight.saturating_mul(4);
-		let fee = WeightToFee::weight_to_fee(&weight);
-		assert_eq!(35_199_492, fee);
-	}
-
-	// Karura
-	#[cfg(feature = "with-karura-runtime")]
-	{
-		use karura_runtime::constants::fee::WeightToFee;
-
-		let base_weight: Weight = karura_runtime::xcm_config::BaseXcmWeight::get();
-		assert_eq!(base_weight, Weight::from_parts(100_000_000, 0));
-
-		let unit_weight: Weight = karura_runtime::xcm_config::UnitWeightCost::get();
-		assert_eq!(unit_weight, Weight::from_parts(200_000_000, 0));
-
-		let weight: Weight = base_weight.saturating_mul(4);
-		let fee = WeightToFee::weight_to_fee(&weight);
-		assert_eq!(3_519_949_312, fee);
-
-		let weight: Weight = unit_weight.saturating_mul(4);
-		let fee = WeightToFee::weight_to_fee(&weight);
-		assert_eq!(7_039_898_625, fee);
-	}
-
-	// Acala
-	#[cfg(feature = "with-acala-runtime")]
-	{
-		use acala_runtime::constants::fee::WeightToFee;
-
-		let base_weight: Weight = acala_runtime::xcm_config::BaseXcmWeight::get();
-		assert_eq!(base_weight, Weight::from_parts(100_000_000, 0));
-
-		let unit_weight: Weight = acala_runtime::xcm_config::UnitWeightCost::get();
-		assert_eq!(unit_weight, Weight::from_parts(200_000_000, 0));
-
-		let weight: Weight = base_weight.saturating_mul(4);
-		let fee = WeightToFee::weight_to_fee(&weight);
-		assert_eq!(3_519_949_312, fee);
-
-		let weight: Weight = unit_weight.saturating_mul(4);
-		let fee = WeightToFee::weight_to_fee(&weight);
-		assert_eq!(7_039_898_625, fee);
-	}
-}
diff --git a/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs b/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs
deleted file mode 100644
index 4ee9e0de2f..0000000000
--- a/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs
+++ /dev/null
@@ -1,213 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Cross-chain transfer tests within Polkadot network.
-
-use crate::relaychain::fee_test::*;
-use crate::relaychain::polkadot_test_net::*;
-use crate::setup::*;
-
-use frame_support::{assert_noop, assert_ok};
-use orml_traits::MultiCurrency;
-use sp_core::bounded::BoundedVec;
-use xcm::VersionedXcm;
-use xcm_emulator::TestExt;
-
-pub const ACALA_ID: u32 = 2000;
-pub const MOCK_BIFROST_ID: u32 = 2001;
-
-fn bifrost_reserve_account() -> AccountId {
-	polkadot_parachain::primitives::Sibling::from(MOCK_BIFROST_ID).into_account_truncating()
-}
-
-#[test]
-fn token_per_second_works() {
-	let aca_per_second = acala_runtime::aca_per_second();
-	assert_eq!(8_799_000_000_000, aca_per_second);
-
-	let dot_per_second = acala_runtime::dot_per_second();
-	assert_eq!(1_759_800_000, dot_per_second);
-}
-
-#[test]
-fn transfer_from_relay_chain() {
-	PolkadotNet::execute_with(|| {
-		assert_ok!(polkadot_runtime::XcmPallet::reserve_transfer_assets(
-			polkadot_runtime::RuntimeOrigin::signed(ALICE.into()),
-			Box::new(Parachain(ACALA_ID).into_versioned()),
-			Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
-			Box::new((Here, dollar(DOT)).into()),
-			0
-		));
-	});
-
-	Acala::execute_with(|| {
-		assert_eq!(9_998_592_160, Tokens::free_balance(DOT, &AccountId::from(BOB)));
-	});
-}
-
-#[test]
-fn transfer_to_relay_chain() {
-	Acala::execute_with(|| {
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(ALICE.into()),
-			DOT,
-			5 * dollar(DOT),
-			Box::new(MultiLocation::new(1, X1(Junction::AccountId32 { id: BOB, network: None })).into()),
-			WeightLimit::Unlimited
-		));
-	});
-	PolkadotNet::execute_with(|| {
-		assert_eq!(
-			// v0.9.19: 49_517_228_896
-			// v0.9.22: 49_530_582_548
-			// v0.9.31: 49_573_469_824
-			// v0.9.33: 49_581_059_712
-			// v0.9.36: 49_591_353_032
-			// v0.9.37: 49_578_565_860
-			// v0.9.38: 49_637_471_000
-			// v0.9.40: 49_616_751_780
-			// v0.9.42: 49_635_578_476
-			49_635_578_476,
-			polkadot_runtime::Balances::free_balance(&AccountId::from(BOB))
-		);
-		assert_eq!(
-			5 * dollar(DOT),
-			polkadot_runtime::Balances::free_balance(&ParaId::from(ACALA_ID).into_account_truncating())
-		);
-	});
-}
-
-#[test]
-fn liquid_crowdloan_xtokens_works() {
-	TestNet::reset();
-	let foreign_asset = CurrencyId::ForeignAsset(0);
-	let dollar = dollar(KAR);
-	let minimal_balance = Balances::minimum_balance() / 10; // 10%
-	let foreign_fee = foreign_per_second_as_fee(4, minimal_balance);
-
-	MockBifrost::execute_with(|| {
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(ACALA_ID),
-						Junction::from(BoundedVec::try_from(LCDOT.encode()).unwrap())
-					)
-				)
-				.into()
-			),
-			Box::new(AssetMetadata {
-				name: b"Liquid Crowdloan Token".to_vec(),
-				symbol: b"LCDOT".to_vec(),
-				decimals: 12,
-				minimal_balance
-			})
-		));
-	});
-
-	Acala::execute_with(|| {
-		assert_ok!(AssetRegistry::register_native_asset(
-			RuntimeOrigin::root(),
-			LCDOT,
-			Box::new(AssetMetadata {
-				name: b"Liquid Crowdloan Token".to_vec(),
-				symbol: b"LCDOT".to_vec(),
-				decimals: 12,
-				minimal_balance
-			})
-		));
-		assert_ok!(Tokens::deposit(LCDOT, &AccountId::from(BOB), 10 * dollar));
-
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(BOB.into()),
-			LCDOT,
-			5 * dollar,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(MOCK_BIFROST_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: ALICE.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(8_000_000_000, 0)),
-		));
-
-		assert_eq!(Tokens::free_balance(LCDOT, &AccountId::from(BOB)), 5 * dollar);
-		assert_eq!(Tokens::free_balance(LCDOT, &bifrost_reserve_account()), 5 * dollar);
-	});
-
-	MockBifrost::execute_with(|| {
-		assert_eq!(
-			Tokens::free_balance(foreign_asset, &AccountId::from(ALICE)),
-			5 * dollar - foreign_fee
-		);
-
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(ALICE.into()),
-			foreign_asset,
-			dollar,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(ACALA_ID),
-						Junction::AccountId32 {
-							network: None,
-							id: BOB.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(8_000_000_000, 0)),
-		));
-	});
-
-	Acala::execute_with(|| {
-		assert_eq!(
-			Tokens::free_balance(LCDOT, &AccountId::from(BOB)),
-			6 * dollar - foreign_fee
-		);
-		assert_eq!(Tokens::free_balance(LCDOT, &bifrost_reserve_account()), 4 * dollar);
-	});
-}
-
-#[test]
-fn send_arbitrary_xcm_fails() {
-	TestNet::reset();
-
-	Acala::execute_with(|| {
-		assert_noop!(
-			PolkadotXcm::send(
-				acala_runtime::RuntimeOrigin::signed(ALICE.into()),
-				Box::new(MultiLocation::new(1, Here).into()),
-				Box::new(VersionedXcm::from(Xcm(vec![WithdrawAsset((Here, 1).into())]))),
-			),
-			BadOrigin
-		);
-	});
-}
diff --git a/runtime/integration-tests/src/relaychain/polkadot_test_net.rs b/runtime/integration-tests/src/relaychain/polkadot_test_net.rs
deleted file mode 100644
index 2a778cbfcf..0000000000
--- a/runtime/integration-tests/src/relaychain/polkadot_test_net.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Relay chain and parachains emulation.
-
-use crate::setup::*;
-
-use cumulus_primitives_core::ParaId;
-use frame_support::traits::GenesisBuild;
-use polkadot_primitives::v4::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
-use polkadot_runtime_parachains::configuration::HostConfiguration;
-use sp_runtime::traits::AccountIdConversion;
-
-use xcm_emulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain};
-
-decl_test_relay_chain! {
-	pub struct PolkadotNet {
-		Runtime = polkadot_runtime::Runtime,
-		XcmConfig = polkadot_runtime::xcm_config::XcmConfig,
-		new_ext = polkadot_ext(),
-	}
-}
-
-decl_test_parachain! {
-	pub struct Acala {
-		Runtime = Runtime,
-		RuntimeOrigin = RuntimeOrigin,
-		XcmpMessageHandler = acala_runtime::XcmpQueue,
-		DmpMessageHandler = acala_runtime::DmpQueue,
-		new_ext = para_ext(2000),
-	}
-}
-
-decl_test_parachain! {
-	pub struct MockBifrost {
-		Runtime = Runtime,
-		RuntimeOrigin = RuntimeOrigin,
-		XcmpMessageHandler = acala_runtime::XcmpQueue,
-		DmpMessageHandler = acala_runtime::DmpQueue,
-		new_ext = para_ext(2001),
-	}
-}
-
-decl_test_parachain! {
-	pub struct Sibling {
-		Runtime = Runtime,
-		RuntimeOrigin = RuntimeOrigin,
-		XcmpMessageHandler = acala_runtime::XcmpQueue,
-		DmpMessageHandler = acala_runtime::DmpQueue,
-		new_ext = para_ext(2002),
-	}
-}
-
-decl_test_parachain! {
-	pub struct Statemint {
-		Runtime = statemint_runtime::Runtime,
-		RuntimeOrigin = statemint_runtime::RuntimeOrigin,
-		XcmpMessageHandler = statemint_runtime::XcmpQueue,
-		DmpMessageHandler = statemint_runtime::DmpQueue,
-		new_ext = para_ext(1000),
-	}
-}
-
-decl_test_network! {
-	pub struct TestNet {
-		relay_chain = PolkadotNet,
-		parachains = vec![
-			(1000, Statemint),
-			(2000, Acala),
-			(2001, MockBifrost),
-			(2002, Sibling),
-		],
-	}
-}
-
-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()
-	}
-}
-
-pub fn polkadot_ext() -> sp_io::TestExternalities {
-	use polkadot_runtime::{Runtime, System};
-
-	let mut t = frame_system::GenesisConfig::default()
-		.build_storage::<Runtime>()
-		.unwrap();
-
-	pallet_balances::GenesisConfig::<Runtime> {
-		balances: vec![
-			(AccountId::from(ALICE), 2002 * dollar(DOT)),
-			(ParaId::from(2000).into_account_truncating(), 10 * dollar(DOT)),
-		],
-	}
-	.assimilate_storage(&mut t)
-	.unwrap();
-
-	polkadot_runtime_parachains::configuration::GenesisConfig::<Runtime> {
-		config: default_parachains_host_configuration(),
-	}
-	.assimilate_storage(&mut t)
-	.unwrap();
-
-	<pallet_xcm::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
-		&pallet_xcm::GenesisConfig {
-			safe_xcm_version: Some(2),
-		},
-		&mut t,
-	)
-	.unwrap();
-
-	let mut ext = sp_io::TestExternalities::new(t);
-	ext.execute_with(|| System::set_block_number(1));
-	ext
-}
-
-pub fn para_ext(parachain_id: u32) -> sp_io::TestExternalities {
-	ExtBuilder::default()
-		.balances(vec![
-			(AccountId::from(ALICE), DOT, 10 * dollar(DOT)),
-			(acala_runtime::AcalaTreasuryAccount::get(), DOT, dollar(DOT)),
-		])
-		.parachain_id(parachain_id)
-		.build()
-}
diff --git a/runtime/integration-tests/src/relaychain/relay_chain.rs b/runtime/integration-tests/src/relaychain/relay_chain.rs
deleted file mode 100644
index c49591350a..0000000000
--- a/runtime/integration-tests/src/relaychain/relay_chain.rs
+++ /dev/null
@@ -1,373 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Tests Relay Chain related things.
-//! Currently only Karura XCM is tested.
-
-#[cfg(feature = "with-karura-runtime")]
-mod karura_tests {
-	use crate::relaychain::kusama_test_net::*;
-	use crate::setup::*;
-
-	use frame_support::{assert_noop, assert_ok, BoundedVec};
-
-	use codec::Decode;
-	use module_relaychain::RelayChainCallBuilder;
-	use module_support::CallBuilder;
-	use pallet_staking::StakingLedger;
-	use xcm_emulator::TestExt;
-
-	type KusamaCallBuilder = RelayChainCallBuilder<ParachainInfo>;
-
-	#[test]
-	/// Tests the staking_withdraw_unbonded call.
-	/// Also tests utility_as_derivative call.
-	fn relaychain_staking_withdraw_unbonded_works() {
-		let homa_sub_account: AccountId =
-			hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into();
-		KusamaNet::execute_with(|| {
-			kusama_runtime::Staking::trigger_new_era(0, BoundedVec::default());
-
-			// Transfer some KSM into the parachain.
-			assert_ok!(kusama_runtime::Balances::transfer(
-				kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-				MultiAddress::Id(homa_sub_account.clone()),
-				1_001_000_000_000_000
-			));
-
-			// bond and unbond some fund for staking
-			assert_ok!(kusama_runtime::Staking::bond(
-				kusama_runtime::RuntimeOrigin::signed(homa_sub_account.clone()),
-				MultiAddress::Id(homa_sub_account.clone()),
-				1_000_000_000_000_000,
-				pallet_staking::RewardDestination::<AccountId>::Staked,
-			));
-
-			kusama_runtime::System::set_block_number(100);
-			assert_ok!(kusama_runtime::Staking::unbond(
-				kusama_runtime::RuntimeOrigin::signed(homa_sub_account.clone()),
-				1_000_000_000_000_000
-			));
-
-			// Kusama's unbonding period is 7 days = 7 * 3600 / 6 = 100_800 blocks
-			kusama_runtime::System::set_block_number(101_000);
-			// Kusama: 6 hours per era. 7 days = 4 * 7 = 28 eras.
-			for _i in 0..29 {
-				kusama_runtime::Staking::trigger_new_era(0, BoundedVec::default());
-			}
-
-			assert_eq!(
-				kusama_runtime::Balances::free_balance(&homa_sub_account.clone()),
-				1_001_000_000_000_000
-			);
-
-			// Transfer fails because liquidity is locked.
-			assert_noop!(
-				kusama_runtime::Balances::transfer(
-					kusama_runtime::RuntimeOrigin::signed(homa_sub_account.clone()),
-					MultiAddress::Id(ALICE.into()),
-					1_000_000_000_000_000
-				),
-				sp_runtime::TokenError::Frozen
-			);
-
-			// Uncomment this to test if withdraw_unbonded and transfer_keep_alive
-			// work without XCM. Used to isolate error when the test fails.
-			// assert_ok!(kusama_runtime::Staking::withdraw_unbonded(
-			// 	kusama_runtime::Origin::signed(homa_sub_account.clone()),
-			// 	5
-			// ));
-		});
-
-		Karura::execute_with(|| {
-			// send v3 xcm message to relaychain
-			assert_ok!(PolkadotXcm::force_xcm_version(
-				RuntimeOrigin::root(),
-				Box::new(MultiLocation::new(1, Here)),
-				3
-			));
-
-			// Call withdraw_unbonded as the homa subaccount
-			let transact_call =
-				KusamaCallBuilder::utility_as_derivative_call(KusamaCallBuilder::staking_withdraw_unbonded(5), 0);
-			let msg = KusamaCallBuilder::finalize_call_into_xcm_message(
-				transact_call,
-				10_000_000_000,
-				XcmWeight::from_parts(10_000_000_000, 1024 * 128),
-			);
-
-			// Withdraw unbonded
-			assert_ok!(pallet_xcm::Pallet::<Runtime>::send_xcm(Here, Parent, msg));
-		});
-
-		KusamaNet::execute_with(|| {
-			assert_eq!(
-				kusama_runtime::Balances::free_balance(&homa_sub_account.clone()),
-				1_001_000_000_000_000
-			);
-
-			assert_ok!(kusama_runtime::Balances::transfer(
-				kusama_runtime::RuntimeOrigin::signed(homa_sub_account.clone()),
-				MultiAddress::Id(ALICE.into()),
-				1_000_000_000_000_000
-			));
-			assert_eq!(
-				kusama_runtime::Balances::free_balance(&homa_sub_account.clone()),
-				1_000_000_000_000
-			);
-		});
-	}
-
-	#[test]
-	/// Tests the staking_bond_extra call.
-	/// Also tests utility_as_derivative call.
-	fn relaychain_staking_bond_extra_works() {
-		let homa_sub_account: AccountId =
-			hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into();
-		KusamaNet::execute_with(|| {
-			kusama_runtime::Staking::trigger_new_era(0, BoundedVec::default());
-
-			// Transfer some KSM into the parachain.
-			assert_ok!(kusama_runtime::Balances::transfer(
-				kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-				MultiAddress::Id(homa_sub_account.clone()),
-				1_001_000_000_000_000
-			));
-
-			// bond some fund for staking
-			assert_ok!(kusama_runtime::Staking::bond(
-				kusama_runtime::RuntimeOrigin::signed(homa_sub_account.clone()),
-				MultiAddress::Id(homa_sub_account.clone()),
-				2_000_000_000_000,
-				pallet_staking::RewardDestination::<AccountId>::Staked,
-			));
-
-			assert_eq!(
-				kusama_runtime::Staking::ledger(&homa_sub_account),
-				Some(StakingLedger {
-					stash: homa_sub_account.clone(),
-					total: 2_000_000_000_000,
-					active: 2_000_000_000_000,
-					unlocking: BoundedVec::default(),
-					claimed_rewards: BoundedVec::default(),
-				})
-			);
-		});
-
-		Karura::execute_with(|| {
-			// send v3 xcm message to relaychain
-			assert_ok!(PolkadotXcm::force_xcm_version(
-				RuntimeOrigin::root(),
-				Box::new(MultiLocation::new(1, Here)),
-				3
-			));
-
-			// Call bond_extra as the homa subaccount
-			let transact_call = KusamaCallBuilder::utility_as_derivative_call(
-				KusamaCallBuilder::staking_bond_extra(5_000_000_000_000),
-				0,
-			);
-			let msg = KusamaCallBuilder::finalize_call_into_xcm_message(
-				transact_call,
-				10_000_000_000,
-				XcmWeight::from_parts(20_000_000_000, 1024 * 128),
-			);
-
-			// bond_extra
-			assert_ok!(pallet_xcm::Pallet::<Runtime>::send_xcm(Here, Parent, msg));
-		});
-
-		KusamaNet::execute_with(|| {
-			assert_eq!(
-				kusama_runtime::Staking::ledger(&homa_sub_account),
-				Some(StakingLedger {
-					stash: homa_sub_account.clone(),
-					total: 7_000_000_000_000,
-					active: 7_000_000_000_000,
-					unlocking: BoundedVec::default(),
-					claimed_rewards: BoundedVec::default(),
-				})
-			);
-
-			assert_eq!(
-				kusama_runtime::Balances::free_balance(&homa_sub_account.clone()),
-				1_001_000_000_000_000
-			);
-		});
-	}
-
-	#[test]
-	/// Tests the staking_unbond call.
-	/// Also tests utility_as_derivative call.
-	fn relaychain_staking_unbond_works() {
-		let homa_sub_account: AccountId =
-			hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into();
-		KusamaNet::execute_with(|| {
-			kusama_runtime::Staking::trigger_new_era(0, BoundedVec::default());
-
-			// Transfer some KSM into the parachain.
-			assert_ok!(kusama_runtime::Balances::transfer(
-				kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-				MultiAddress::Id(homa_sub_account.clone()),
-				1_001_000_000_000_000
-			));
-
-			// bond some fund for staking
-			assert_ok!(kusama_runtime::Staking::bond(
-				kusama_runtime::RuntimeOrigin::signed(homa_sub_account.clone()),
-				MultiAddress::Id(homa_sub_account.clone()),
-				1_000_000_000_000_000,
-				pallet_staking::RewardDestination::<AccountId>::Staked,
-			));
-
-			assert_eq!(
-				kusama_runtime::Staking::ledger(&homa_sub_account),
-				Some(StakingLedger {
-					stash: homa_sub_account.clone(),
-					total: 1_000_000_000_000_000,
-					active: 1_000_000_000_000_000,
-					unlocking: BoundedVec::default(),
-					claimed_rewards: BoundedVec::default(),
-				})
-			);
-		});
-
-		Karura::execute_with(|| {
-			// send v3 xcm message to relaychain
-			assert_ok!(PolkadotXcm::force_xcm_version(
-				RuntimeOrigin::root(),
-				Box::new(MultiLocation::new(1, Here)),
-				3
-			));
-
-			// Call unbond as the homa subaccount
-			let transact_call =
-				KusamaCallBuilder::utility_as_derivative_call(KusamaCallBuilder::staking_unbond(50_000_000_000_000), 0);
-			let msg = KusamaCallBuilder::finalize_call_into_xcm_message(
-				transact_call,
-				10_000_000_000,
-				XcmWeight::from_parts(20_000_000_000, 1024 * 128),
-			);
-
-			// unbond
-			assert_ok!(pallet_xcm::Pallet::<Runtime>::send_xcm(Here, Parent, msg));
-		});
-
-		KusamaNet::execute_with(|| {
-			assert_eq!(
-				kusama_runtime::Staking::ledger(&homa_sub_account).unwrap().active,
-				950_000_000_000_000
-			);
-		});
-	}
-
-	#[test]
-	/// Tests transfer_keep_alive call
-	fn relaychain_transfer_keep_alive_works() {
-		let mut parachain_account: AccountId = AccountId::new([0u8; 32]);
-		Karura::execute_with(|| {
-			parachain_account = ParachainAccount::get();
-		});
-		KusamaNet::execute_with(|| {
-			assert_eq!(
-				kusama_runtime::Balances::free_balance(AccountId::from(ALICE)),
-				2_002_000_000_000_000
-			);
-			assert_eq!(
-				kusama_runtime::Balances::free_balance(&parachain_account.clone()),
-				2_000_000_000_000
-			);
-		});
-
-		Karura::execute_with(|| {
-			// send v3 xcm message to relaychain
-			assert_ok!(PolkadotXcm::force_xcm_version(
-				RuntimeOrigin::root(),
-				Box::new(MultiLocation::new(1, Here)),
-				3
-			));
-
-			// Transfer all remaining, but leave enough fund to pay for the XCM transaction.
-			let xcm_message = KusamaCallBuilder::balances_transfer_keep_alive(ALICE.into(), 1_970_000_000_000);
-
-			let msg = KusamaCallBuilder::finalize_call_into_xcm_message(
-				xcm_message,
-				10_000_000_000,
-				XcmWeight::from_parts(20_000_000_000, 1024 * 128),
-			);
-
-			// Withdraw unbonded
-			assert_ok!(pallet_xcm::Pallet::<Runtime>::send_xcm(Here, Parent, msg));
-		});
-
-		KusamaNet::execute_with(|| {
-			assert_eq!(
-				kusama_runtime::Balances::free_balance(AccountId::from(ALICE)),
-				2_003_970_000_000_000
-			);
-			// Only leftover XCM fee remains in the account
-			assert_eq!(
-				kusama_runtime::Balances::free_balance(&parachain_account.clone()),
-				23_895_571_037
-			);
-		});
-	}
-
-	#[test]
-	/// Tests the calls built by the call builder are encoded and decoded correctly
-	fn relaychain_call_codec_works() {
-		KusamaNet::execute_with(|| {
-			let encoded = KusamaCallBuilder::staking_withdraw_unbonded(5).encode();
-			let withdraw_unbond_call = kusama_runtime::RuntimeCall::decode(&mut &encoded[..]).unwrap();
-			assert_eq!(encoded, hex_literal::hex!["060305000000"]);
-			assert_eq!(
-				withdraw_unbond_call,
-				kusama_runtime::RuntimeCall::Staking(pallet_staking::Call::withdraw_unbonded { num_slashing_spans: 5 })
-			);
-
-			let encoded = KusamaCallBuilder::balances_transfer_keep_alive(ALICE.into(), 1).encode();
-			let transfer_call = kusama_runtime::RuntimeCall::decode(&mut &encoded[..]).unwrap();
-			assert_eq!(
-				encoded,
-				hex_literal::hex!["040300040404040404040404040404040404040404040404040404040404040404040404"]
-			);
-			assert_eq!(
-				transfer_call,
-				kusama_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer_keep_alive {
-					dest: MultiAddress::Id(AccountId::from([4u8; 32])),
-					value: 1
-				})
-			);
-
-			let encoded =
-				KusamaCallBuilder::utility_as_derivative_call(KusamaCallBuilder::staking_withdraw_unbonded(5), 10)
-					.encode();
-			let batch_as_call = kusama_runtime::RuntimeCall::decode(&mut &encoded[..]).unwrap();
-			assert_eq!(encoded, hex_literal::hex!["18010a00060305000000"]);
-			assert_eq!(
-				batch_as_call,
-				kusama_runtime::RuntimeCall::Utility(pallet_utility::Call::as_derivative {
-					index: 10,
-					call: Box::new(kusama_runtime::RuntimeCall::Staking(
-						pallet_staking::Call::withdraw_unbonded { num_slashing_spans: 5 }
-					))
-				})
-			);
-		});
-	}
-}
diff --git a/runtime/integration-tests/src/relaychain/statemine.rs b/runtime/integration-tests/src/relaychain/statemine.rs
deleted file mode 100644
index 8ab68399d0..0000000000
--- a/runtime/integration-tests/src/relaychain/statemine.rs
+++ /dev/null
@@ -1,392 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Tests parachain to parachain xcm communication between Statemine and Karura.
-
-use crate::relaychain::kusama_test_net::*;
-use crate::setup::*;
-use cumulus_primitives_core::ParaId;
-
-use frame_support::assert_ok;
-pub use orml_traits::GetByKey;
-use polkadot_parachain::primitives::Sibling;
-use primitives::currency::AssetMetadata;
-use sp_runtime::traits::AccountIdConversion;
-use xcm::v3::{Junction, MultiLocation};
-use xcm_emulator::TestExt;
-
-pub const UNIT: Balance = 1_000_000_000_000;
-pub const TEN: Balance = 10_000_000_000_000;
-pub const FEE_WEIGHT: Balance = 40_000_000_000;
-pub const FEE: Balance = 250_000_000;
-pub const FEE_STATEMINE: Balance = 239_533_333;
-pub const FEE_KUSAMA: Balance = 11_492_737;
-const ASSET_ID: u32 = 100;
-
-fn init_statemine_xcm_interface() {
-	let xcm_operation =
-		module_xcm_interface::XcmInterfaceOperation::ParachainFee(Box::new((Parent, Parachain(1000)).into()));
-	assert_ok!(<module_xcm_interface::Pallet<Runtime>>::update_xcm_dest_weight_and_fee(
-		RuntimeOrigin::root(),
-		vec![(
-			xcm_operation.clone(),
-			Some(XcmWeight::from_parts(4_000_000_000, 0)),
-			Some(250_000_000),
-		)],
-	));
-	System::assert_has_event(RuntimeEvent::XcmInterface(
-		module_xcm_interface::Event::XcmDestWeightUpdated {
-			xcm_operation: xcm_operation.clone(),
-			new_xcm_dest_weight: XcmWeight::from_parts(4_000_000_000, 0),
-		},
-	));
-	System::assert_has_event(RuntimeEvent::XcmInterface(module_xcm_interface::Event::XcmFeeUpdated {
-		xcm_operation,
-		new_xcm_dest_weight: 250_000_000,
-	}));
-}
-
-#[test]
-fn statemine_min_xcm_fee_matched() {
-	Statemine::execute_with(|| {
-		use frame_support::weights::{IdentityFee, WeightToFee};
-
-		init_statemine_xcm_interface();
-		let weight = FEE_WEIGHT as u64;
-
-		let fee: Balance = IdentityFee::weight_to_fee(&Weight::from_parts(weight, 0));
-		let statemine: MultiLocation = (Parent, Parachain(parachains::statemine::ID)).into();
-		let bifrost: MultiLocation = (Parent, Parachain(parachains::bifrost::ID)).into();
-
-		let statemine_fee: u128 = ParachainMinFee::get(&statemine).unwrap();
-		assert_eq!(statemine_fee, FEE);
-		assert_eq!(fee, FEE_WEIGHT);
-
-		let bifrost_fee: Option<u128> = ParachainMinFee::get(&bifrost);
-		assert_eq!(None, bifrost_fee);
-	});
-}
-
-#[test]
-fn statemine_reserve_transfer_ksm_to_karura_should_not_allowed() {
-	TestNet::reset();
-	let sibling_2000: AccountId = Sibling::from(2000).into_account_truncating();
-	let child_2000: AccountId = ParaId::from(2000).into_account_truncating();
-	let child_1000: AccountId = ParaId::from(1000).into_account_truncating();
-
-	KusamaNet::execute_with(|| {
-		assert_eq!(2 * UNIT, kusama_runtime::Balances::free_balance(&child_2000));
-		assert_eq!(0, kusama_runtime::Balances::free_balance(&child_1000));
-	});
-
-	Statemine::execute_with(|| {
-		Balances::make_free_balance_be(&ALICE.into(), 2 * UNIT);
-		// Suppose reserve transfer can success, then dest chain(Karura) has a sibling sovereign account on
-		// source chain(Statemine).
-		Balances::make_free_balance_be(&sibling_2000, 2 * UNIT);
-
-		assert_ok!(statemine_runtime::PolkadotXcm::limited_reserve_transfer_assets(
-			statemine_runtime::RuntimeOrigin::signed(ALICE.into()),
-			// Unlike Statemine reserve transfer to relaychain is not allowed,
-			// Here Statemine reserve transfer to parachain. let's see what happened.
-			Box::new(MultiLocation::new(1, X1(Parachain(2000))).into()),
-			Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
-			Box::new((Parent, UNIT).into()),
-			0,
-			WeightLimit::Unlimited
-		));
-
-		// In sender xcm execution is successed, sender account is withdrawn.
-		assert_eq!(UNIT, statemine_runtime::Balances::free_balance(&AccountId::from(ALICE)));
-		// And sibling parachain sovereign account on Statemine deposited.
-		assert_eq!(3 * UNIT, statemine_runtime::Balances::free_balance(&sibling_2000));
-	});
-
-	KusamaNet::execute_with(|| {
-		assert_eq!(2 * UNIT, kusama_runtime::Balances::free_balance(&child_2000));
-		assert_eq!(0, kusama_runtime::Balances::free_balance(&child_1000));
-	});
-
-	// Xcm execution error on receiver: UntrustedReserveLocation.
-	// This means Karura not consider Statemine as reserve chain of KSM.
-	Karura::execute_with(|| {
-		assert_eq!(0, Tokens::free_balance(KSM, &AccountId::from(BOB)));
-	});
-}
-
-#[test]
-fn karura_transfer_ksm_to_statemine_should_not_allowed() {
-	TestNet::reset();
-	let child_2000: AccountId = ParaId::from(2000).into_account_truncating();
-	let child_1000: AccountId = ParaId::from(1000).into_account_truncating();
-
-	KusamaNet::execute_with(|| {
-		assert_eq!(2 * UNIT, kusama_runtime::Balances::free_balance(&child_2000));
-		assert_eq!(0, kusama_runtime::Balances::free_balance(&child_1000));
-	});
-
-	// Karura transfer KSM to Statemine, it's `NonRerserve` scene(A->[B]->C).
-	Karura::execute_with(|| {
-		assert_ok!(XTokens::transfer(
-			RuntimeOrigin::signed(ALICE.into()),
-			KSM,
-			UNIT,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(1000),
-						Junction::AccountId32 {
-							network: None,
-							id: BOB.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(XcmWeight::from_parts(4_000_000_000, 0))
-		));
-
-		assert_eq!(9 * UNIT, Tokens::free_balance(KSM, &AccountId::from(ALICE)));
-	});
-
-	// In relaychain, two parachain sovereign account balance changed.
-	KusamaNet::execute_with(|| {
-		// source parachain sovereign account withrawn.
-		assert_eq!(UNIT, kusama_runtime::Balances::free_balance(&child_2000));
-		// destination parachain sovereign account deposited.
-		assert_eq!(999_769_002_864, kusama_runtime::Balances::free_balance(&child_1000));
-	});
-
-	// In receiver, xm execution error: UntrustedReserveLocation.
-	// This's same as Relaychain reserve transfer to Statemine which not allowed.
-	Statemine::execute_with(|| {
-		assert_eq!(0, Balances::free_balance(&AccountId::from(BOB)));
-	});
-}
-
-#[test]
-fn karura_transfer_asset_to_statemine_works() {
-	TestNet::reset();
-
-	let para_2000: AccountId = Sibling::from(2000).into_account_truncating();
-
-	// Alice on Statemine send USDT to Bob on Karura.
-	statemine_transfer_asset_to_karura();
-
-	// Bob on Karura send back USDT to Bob on Statemine.
-	// Trying use USDT as fee when execte xcm on Statemine.
-	karura_transfer_asset_to_statemine(0);
-
-	Statemine::execute_with(|| {
-		use statemine_runtime::*;
-
-		assert_eq!(9 * UNIT, Assets::balance(ASSET_ID, &para_2000));
-
-		// https://github.com/paritytech/cumulus/pull/1278 support using self sufficient asset
-		// for paying xcm execution fee on Statemine.
-		assert_eq!(964_069_999_541, Assets::balance(ASSET_ID, &AccountId::from(BOB)));
-	});
-}
-
-#[test]
-fn karura_statemine_transfer_use_ksm_as_fee() {
-	TestNet::reset();
-	let para_2000: AccountId = Sibling::from(2000).into_account_truncating();
-	let child_2000: AccountId = ParaId::from(2000).into_account_truncating();
-	let child_1000: AccountId = ParaId::from(1000).into_account_truncating();
-
-	// minimum asset should be: FEE_WEIGHT+FEE_KUSAMA+max(KUSAMA_ED,STATEMINE_ED+FEE_STATEMINE).
-	// but due to current half fee, sender asset should at lease: FEE_WEIGHT + 2 * FEE_KUSAMA
-	let asset = FEE_WEIGHT + 2 * 31_488_122; //  40_062_976_244
-
-	// Alice on Statemine send USDT to Bob on Karura
-	statemine_transfer_asset_to_karura();
-
-	KusamaNet::execute_with(|| {
-		let _ = kusama_runtime::Balances::make_free_balance_be(&child_2000, TEN);
-		assert_eq!(0, kusama_runtime::Balances::free_balance(&child_1000));
-	});
-
-	// Bob on Karura send back USDT with KSM as fee to Bob on Statemine
-	karura_transfer_asset_to_statemine(asset);
-
-	KusamaNet::execute_with(|| {
-		assert_eq!(TEN - (asset - FEE), kusama_runtime::Balances::free_balance(&child_2000));
-	});
-
-	Statemine::execute_with(|| {
-		use statemine_runtime::*;
-
-		// Karura send back custom asset to Statemine, ensure recipient got custom asset
-		assert_eq!(UNIT, Assets::balance(ASSET_ID, &AccountId::from(BOB)));
-		// and withdraw sibling parachain sovereign account
-		assert_eq!(9 * UNIT, Assets::balance(ASSET_ID, &para_2000));
-
-		assert_eq!(
-			UNIT + FEE - FEE_STATEMINE,
-			Balances::free_balance(&AccountId::from(BOB))
-		);
-		assert_eq!(1_039_327_124_828, Balances::free_balance(&para_2000));
-	});
-}
-
-// Karura(ForeignAsset) transfer asset(e.g. USDT) back to Statemine(assets)
-// `ksm_fee_amount` is used to indicate how much KSM paying as fee.
-// If specify `ksm_fee_amount` to 0, then wouldn't use KSM as fee.
-fn karura_transfer_asset_to_statemine(ksm_fee_amount: u128) {
-	Karura::execute_with(|| {
-		init_statemine_xcm_interface();
-
-		assert_eq!(
-			9_999_929_608_000,
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB))
-		);
-		// ensure sender has enough KSM balance to be charged as fee
-		assert_ok!(Tokens::deposit(KSM, &AccountId::from(BOB), TEN));
-
-		if ksm_fee_amount == 0 {
-			// use custom asset(USDT on Statemine) as fee
-			assert_ok!(XTokens::transfer(
-				RuntimeOrigin::signed(BOB.into()),
-				CurrencyId::ForeignAsset(0),
-				UNIT,
-				Box::new(
-					MultiLocation::new(
-						1,
-						X2(
-							Parachain(1000),
-							Junction::AccountId32 {
-								network: None,
-								id: BOB.into(),
-							}
-						)
-					)
-					.into()
-				),
-				WeightLimit::Limited(XcmWeight::from_parts(FEE_WEIGHT as u64, 0))
-			));
-		} else {
-			// use KSM as fee
-			assert_ok!(XTokens::transfer_multicurrencies(
-				RuntimeOrigin::signed(BOB.into()),
-				vec![(CurrencyId::ForeignAsset(0), UNIT), (KSM, ksm_fee_amount)],
-				1,
-				Box::new(
-					MultiLocation::new(
-						1,
-						X2(
-							Parachain(1000),
-							Junction::AccountId32 {
-								network: None,
-								id: BOB.into(),
-							}
-						)
-					)
-					.into()
-				),
-				//WeightLimit::Limited(XcmWeight::from_parts(400_000_000, 0))
-				WeightLimit::Unlimited
-			));
-		}
-
-		assert_eq!(
-			8_999_929_608_000,
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB))
-		);
-		assert_eq!(TEN - ksm_fee_amount, Tokens::free_balance(KSM, &AccountId::from(BOB)));
-	});
-}
-
-// Statemine(assets) transfer custom asset(e.g. USDT) to Karura(ForeignAsset)
-// Alice is using reserve transfer, and Statemine is indeed the reserve chain of USDT.
-// So the reserve transfer can success. On Karura side, USDT is consider as ForeignAsset.
-fn statemine_transfer_asset_to_karura() {
-	register_asset();
-
-	let para_2000: AccountId = Sibling::from(2000).into_account_truncating();
-
-	Statemine::execute_with(|| {
-		use statemine_runtime::*;
-
-		let origin = RuntimeOrigin::signed(ALICE.into());
-		Balances::make_free_balance_be(&ALICE.into(), TEN);
-		Balances::make_free_balance_be(&BOB.into(), UNIT);
-
-		// If using non root, create custom asset cost 0.1 KSM
-		// We're using force_create here to make sure asset is sufficient.
-		assert_ok!(Assets::force_create(
-			RuntimeOrigin::root(),
-			ASSET_ID.into(),
-			MultiAddress::Id(ALICE.into()),
-			true,
-			UNIT / 100
-		));
-
-		assert_ok!(Assets::mint(
-			origin.clone(),
-			ASSET_ID.into(),
-			MultiAddress::Id(ALICE.into()),
-			1000 * UNIT
-		));
-
-		// need to have some KSM to be able to receive user assets
-		Balances::make_free_balance_be(&para_2000, UNIT);
-
-		assert_ok!(PolkadotXcm::limited_reserve_transfer_assets(
-			origin.clone(),
-			Box::new(MultiLocation::new(1, X1(Parachain(2000))).into()),
-			Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
-			Box::new((X2(PalletInstance(50), GeneralIndex(ASSET_ID as u128)), TEN).into()),
-			0,
-			WeightLimit::Unlimited
-		));
-
-		assert_eq!(990 * UNIT, Assets::balance(ASSET_ID, &AccountId::from(ALICE)));
-		assert_eq!(0, Assets::balance(ASSET_ID, &AccountId::from(BOB)));
-
-		assert_eq!(TEN, Assets::balance(ASSET_ID, &para_2000));
-		// the KSM balance of sibling parachain sovereign account is not changed
-		assert_eq!(UNIT, Balances::free_balance(&para_2000));
-	});
-
-	// Rerun the Statemine::execute to actually send the egress message via XCM
-	Statemine::execute_with(|| {});
-}
-
-fn register_asset() {
-	Karura::execute_with(|| {
-		// register foreign asset
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(
-				MultiLocation::new(
-					1,
-					X3(Parachain(1000), PalletInstance(50), GeneralIndex(ASSET_ID as u128))
-				)
-				.into()
-			),
-			Box::new(AssetMetadata {
-				name: b"Sibling Token".to_vec(),
-				symbol: b"ST".to_vec(),
-				decimals: 10,
-				minimal_balance: Balances::minimum_balance() / 100, // 10%
-			})
-		));
-	});
-}
diff --git a/runtime/integration-tests/src/relaychain/statemint.rs b/runtime/integration-tests/src/relaychain/statemint.rs
deleted file mode 100644
index ea0b020b85..0000000000
--- a/runtime/integration-tests/src/relaychain/statemint.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Tests parachain to parachain xcm communication between Statemint and Karura.
-
-use crate::relaychain::polkadot_test_net::*;
-use crate::setup::*;
-use cumulus_primitives_core::ParaId;
-
-use frame_support::assert_ok;
-pub use orml_traits::GetByKey;
-use polkadot_parachain::primitives::Sibling;
-use primitives::currency::AssetMetadata;
-use xcm::v3::{Junction, MultiLocation};
-use xcm_emulator::TestExt;
-
-pub const UNIT: Balance = 1_000_000_000_000;
-pub const TEN: Balance = 10_000_000_000_000;
-pub const FEE_WEIGHT: Balance = 4_000_000_000;
-pub const FEE: Balance = 80_000_000;
-pub const FEE_STATEMINT: Balance = 1_433_579;
-
-fn init_statemine_xcm_interface() {
-	let xcm_operation =
-		module_xcm_interface::XcmInterfaceOperation::ParachainFee(Box::new((Parent, Parachain(1000)).into()));
-	assert_ok!(<module_xcm_interface::Pallet<Runtime>>::update_xcm_dest_weight_and_fee(
-		RuntimeOrigin::root(),
-		vec![(
-			xcm_operation.clone(),
-			Some(XcmWeight::from_parts(4_000_000_000, 0)),
-			Some(80_000_000),
-		)],
-	));
-	System::assert_has_event(RuntimeEvent::XcmInterface(
-		module_xcm_interface::Event::XcmDestWeightUpdated {
-			xcm_operation: xcm_operation.clone(),
-			new_xcm_dest_weight: XcmWeight::from_parts(4_000_000_000, 0),
-		},
-	));
-	System::assert_has_event(RuntimeEvent::XcmInterface(module_xcm_interface::Event::XcmFeeUpdated {
-		xcm_operation,
-		new_xcm_dest_weight: 80_000_000,
-	}));
-}
-
-#[test]
-fn statemint_min_xcm_fee_matched() {
-	Statemint::execute_with(|| {
-		use frame_support::weights::{IdentityFee, WeightToFee};
-
-		init_statemine_xcm_interface();
-		let weight = Weight::from_parts(FEE_WEIGHT as u64, 0);
-
-		let fee: Balance = IdentityFee::weight_to_fee(&weight);
-		let statemine: MultiLocation = (Parent, Parachain(parachains::statemint::ID)).into();
-		assert_eq!(fee, 4_000_000_000);
-
-		let statemine_fee: u128 = ParachainMinFee::get(&statemine).unwrap();
-		assert_eq!(statemine_fee, 80_000_000);
-	});
-}
-
-#[test]
-fn teleport_from_relay_chain() {
-	PolkadotNet::execute_with(|| {
-		assert_ok!(polkadot_runtime::XcmPallet::teleport_assets(
-			polkadot_runtime::RuntimeOrigin::signed(ALICE.into()),
-			Box::new(Parachain(1000).into_versioned()),
-			Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
-			Box::new((Here, dollar(DOT)).into()),
-			0
-		));
-	});
-
-	Statemint::execute_with(|| {
-		assert_eq!(
-			dollar(DOT) - FEE_STATEMINT,
-			Balances::free_balance(&AccountId::from(BOB))
-		);
-	});
-}
-
-#[test]
-fn acala_statemint_transfer_works() {
-	TestNet::reset();
-	let para_2000: AccountId = Sibling::from(2000).into_account_truncating();
-	let child_2000: AccountId = ParaId::from(2000).into_account_truncating();
-	let child_1000: AccountId = ParaId::from(1000).into_account_truncating();
-
-	// minimum asset should be: FEE_WEIGHT+FEE_KUSAMA+max(KUSAMA_ED,STATEMINE_ED+FEE_STATEMINE).
-	// but due to current half fee, sender asset should at lease: FEE_WEIGHT + 2 * FEE_KUSAMA
-	let asset = FEE_WEIGHT + 2 * 31_488_122; // 4_062_976_244
-
-	statemint_side(UNIT);
-
-	PolkadotNet::execute_with(|| {
-		let _ = polkadot_runtime::Balances::make_free_balance_be(&child_2000, TEN);
-		assert_eq!(0, polkadot_runtime::Balances::free_balance(&child_1000));
-	});
-
-	acala_side(asset);
-
-	PolkadotNet::execute_with(|| {
-		assert_eq!(
-			TEN - (asset - FEE),
-			polkadot_runtime::Balances::free_balance(&child_2000)
-		);
-	});
-
-	Statemint::execute_with(|| {
-		use statemint_runtime::*;
-
-		// Karura send back custom asset to Statemint, ensure recipient got custom asset
-		assert_eq!(UNIT, Assets::balance(0, &AccountId::from(BOB)));
-		// and withdraw sibling parachain sovereign account
-		assert_eq!(9 * UNIT, Assets::balance(0, &para_2000));
-
-		assert_eq!(1_000_008_140_000, Balances::free_balance(&AccountId::from(BOB)));
-		assert_eq!(1_003_537_121_141, Balances::free_balance(&para_2000));
-	});
-}
-
-// transfer custom asset from Karura to Statemint
-fn acala_side(fee_amount: u128) {
-	Acala::execute_with(|| {
-		init_statemine_xcm_interface();
-
-		assert_eq!(
-			TEN - 70_392_000,
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB))
-		);
-		// ensure sender has enough DOT balance to be charged as fee
-		assert_ok!(Tokens::deposit(DOT, &AccountId::from(BOB), TEN));
-
-		assert_ok!(XTokens::transfer_multicurrencies(
-			RuntimeOrigin::signed(BOB.into()),
-			vec![(CurrencyId::ForeignAsset(0), UNIT), (DOT, fee_amount)],
-			1,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Parachain(1000),
-						Junction::AccountId32 {
-							network: None,
-							id: BOB.into(),
-						}
-					)
-				)
-				.into()
-			),
-			WeightLimit::Unlimited
-		));
-
-		assert_eq!(
-			TEN - UNIT - 70_392_000,
-			Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB))
-		);
-		assert_eq!(TEN - fee_amount, Tokens::free_balance(DOT, &AccountId::from(BOB)));
-	});
-}
-
-// transfer custom asset from Statemint to Karura
-fn statemint_side(para_2000_init_amount: u128) {
-	register_asset();
-
-	let para_acc: AccountId = Sibling::from(2000).into_account_truncating();
-
-	Statemint::execute_with(|| {
-		use statemint_runtime::*;
-
-		let origin = RuntimeOrigin::signed(ALICE.into());
-		Balances::make_free_balance_be(&ALICE.into(), TEN);
-		Balances::make_free_balance_be(&BOB.into(), UNIT);
-
-		// create custom asset cost 1 DOT
-		assert_ok!(Assets::create(
-			origin.clone(),
-			0.into(),
-			MultiAddress::Id(ALICE.into()),
-			UNIT / 100
-		));
-		assert_eq!(9_900_000_000_000, Balances::free_balance(&AccountId::from(ALICE)));
-
-		assert_ok!(Assets::mint(
-			origin.clone(),
-			0.into(),
-			MultiAddress::Id(ALICE.into()),
-			1000 * UNIT
-		));
-
-		// need to have some DOT to be able to receive user assets
-		Balances::make_free_balance_be(&para_acc, para_2000_init_amount);
-
-		assert_ok!(PolkadotXcm::limited_reserve_transfer_assets(
-			origin.clone(),
-			Box::new(MultiLocation::new(1, X1(Parachain(2000))).into()),
-			Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
-			Box::new((X2(PalletInstance(50), GeneralIndex(0)), TEN).into()),
-			0,
-			WeightLimit::Unlimited
-		));
-
-		assert_eq!(0, Assets::balance(0, &AccountId::from(BOB)));
-
-		assert_eq!(TEN, Assets::balance(0, &para_acc));
-		// the DOT balance of sibling parachain sovereign account is not changed
-		assert_eq!(para_2000_init_amount, Balances::free_balance(&para_acc));
-	});
-
-	// Rerun the Statemint::execute to actually send the egress message via XCM
-	Statemint::execute_with(|| {});
-}
-
-fn register_asset() {
-	Acala::execute_with(|| {
-		// register foreign asset
-		assert_ok!(AssetRegistry::register_foreign_asset(
-			RuntimeOrigin::root(),
-			Box::new(MultiLocation::new(1, X3(Parachain(1000), PalletInstance(50), GeneralIndex(0))).into()),
-			Box::new(AssetMetadata {
-				name: b"Sibling Token".to_vec(),
-				symbol: b"ST".to_vec(),
-				decimals: 10,
-				minimal_balance: Balances::minimum_balance() / 100, // 10%
-			})
-		));
-	});
-}
diff --git a/runtime/integration-tests/src/runtime.rs b/runtime/integration-tests/src/runtime.rs
index 145ed5aec4..bbe6670e41 100644
--- a/runtime/integration-tests/src/runtime.rs
+++ b/runtime/integration-tests/src/runtime.rs
@@ -370,10 +370,10 @@ mod mandala_only_tests {
 
 			assert_eq!(base_fee, 1_000_000_000);
 			assert_eq!(len_fee, 50_000_000);
-			assert_eq!(adjusted_weight_fee, 22_193_280);
+			assert_eq!(adjusted_weight_fee, 17031845);
 
 			let total_fee = base_fee.saturating_add(len_fee).saturating_add(adjusted_weight_fee);
-			assert_eq!(total_fee, 1_072_193_280);
+			assert_eq!(total_fee, 1067031845);
 		});
 	}
 
@@ -416,7 +416,7 @@ mod mandala_only_tests {
 						bytes.len()
 					),
 					Ok(ValidTransaction {
-						priority: 198_255,
+						priority: 235960,
 						requires: vec![],
 						provides: vec![],
 						longevity: 18_446_744_073_709_551_615,
@@ -433,7 +433,7 @@ mod mandala_only_tests {
 						bytes.len()
 					),
 					Ok(ValidTransaction {
-						priority: 198_255,
+						priority: 235960,
 						requires: vec![],
 						provides: vec![],
 						longevity: 18_446_744_073_709_551_615,
@@ -450,7 +450,7 @@ mod mandala_only_tests {
 						bytes.len()
 					),
 					Ok(ValidTransaction {
-						priority: 198_255_000_000,
+						priority: 235960000000,
 						requires: vec![],
 						provides: vec![],
 						longevity: 18_446_744_073_709_551_615,
@@ -512,7 +512,7 @@ mod mandala_only_tests {
 						bytes.len()
 					),
 					Ok(ValidTransaction {
-						priority: 56_773_627_318_880_000,
+						priority: 51918138056970000,
 						requires: vec![],
 						provides: vec![],
 						longevity: 18_446_744_073_709_551_615,
diff --git a/runtime/integration-tests/src/setup.rs b/runtime/integration-tests/src/setup.rs
index 6ad5aa21a0..10b6b6e508 100644
--- a/runtime/integration-tests/src/setup.rs
+++ b/runtime/integration-tests/src/setup.rs
@@ -18,7 +18,7 @@
 
 pub use codec::{Decode, Encode};
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
-use frame_support::traits::{GenesisBuild, OnFinalize, OnIdle, OnInitialize};
+use frame_support::traits::{OnFinalize, OnIdle, OnInitialize};
 pub use frame_support::{assert_noop, assert_ok, traits::Currency};
 pub use frame_system::RawOrigin;
 use runtime_common::evm_genesis;
@@ -42,7 +42,8 @@ pub use sp_core::H160;
 use sp_io::hashing::keccak_256;
 pub use sp_runtime::{
 	traits::{AccountIdConversion, BadOrigin, BlakeTwo256, Convert, Hash, Zero},
-	Digest, DigestItem, DispatchError, DispatchResult, FixedPointNumber, FixedU128, MultiAddress, Perbill, Permill,
+	BuildStorage, Digest, DigestItem, DispatchError, DispatchResult, FixedPointNumber, FixedU128, MultiAddress,
+	Perbill, Permill,
 };
 
 pub use xcm::v3::prelude::*;
@@ -93,9 +94,6 @@ mod mandala_imports {
 		primitives::DexShare::Token(TokenSymbol::DOT),
 	);
 	pub const NATIVE_TOKEN_SYMBOL: TokenSymbol = TokenSymbol::ACA;
-	pub type Trader = FixedRateOfFungible<DotPerSecond, ()>;
-	pub type TransactionFeePoolTrader =
-		FixedRateOfAsset<BaseRate, (), BuyWeightRateOfTransactionFeePool<Runtime, CurrencyIdConvert>>;
 	pub const ALTERNATIVE_SURPLUS: Percent = AlternativeFeeSurplus::get();
 }
 
@@ -119,7 +117,6 @@ mod karura_imports {
 		TipPerWeightStep, TokenSymbol, Tokens, TransactionPayment, TransactionPaymentPalletId, TreasuryPalletId,
 		Utility, Vesting, XTokens, XcmInterface, EVM, NFT,
 	};
-	use module_transaction_payment::BuyWeightRateOfTransactionFeePool;
 	pub use primitives::TradingPair;
 	pub use runtime_common::{cent, dollar, millicent, FixedRateOfAsset, KAR, KSM, KUSD, LKSM};
 	pub use sp_runtime::traits::AccountIdConversion;
@@ -146,9 +143,6 @@ mod karura_imports {
 		primitives::DexShare::Token(TokenSymbol::KSM),
 	);
 	pub const NATIVE_TOKEN_SYMBOL: TokenSymbol = TokenSymbol::KAR;
-	pub type Trader = FixedRateOfFungible<KsmPerSecond, ()>;
-	pub type TransactionFeePoolTrader =
-		FixedRateOfAsset<BaseRate, (), BuyWeightRateOfTransactionFeePool<Runtime, CurrencyIdConvert>>;
 	pub const ALTERNATIVE_SURPLUS: Percent = AlternativeFeeSurplus::get();
 }
 
@@ -201,9 +195,6 @@ mod acala_imports {
 		primitives::DexShare::Token(TokenSymbol::DOT),
 	);
 	pub const NATIVE_TOKEN_SYMBOL: TokenSymbol = TokenSymbol::ACA;
-	pub type Trader = FixedRateOfFungible<DotPerSecond, ()>;
-	pub type TransactionFeePoolTrader =
-		FixedRateOfAsset<BaseRate, (), BuyWeightRateOfTransactionFeePool<Runtime, CurrencyIdConvert>>;
 	pub const ALTERNATIVE_SURPLUS: Percent = AlternativeFeeSurplus::get();
 }
 
@@ -292,10 +283,18 @@ impl ExtBuilder {
 	}
 
 	pub fn build(self) -> sp_io::TestExternalities {
+		let t = self.build_storage();
+
+		let mut ext = sp_io::TestExternalities::new(t);
+		ext.execute_with(|| System::set_block_number(1));
+		ext
+	}
+
+	pub fn build_storage(self) -> sp_core::storage::Storage {
 		let evm_genesis_accounts = evm_genesis(vec![]);
 
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 
 		let native_currency_id = GetNativeCurrencyId::get();
@@ -379,25 +378,21 @@ impl ExtBuilder {
 			.assimilate_storage(&mut t)
 			.unwrap();
 
-		<parachain_info::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
-			&parachain_info::GenesisConfig {
-				parachain_id: self.parachain_id.into(),
-			},
-			&mut t,
-		)
+		parachain_info::GenesisConfig::<Runtime> {
+			_config: Default::default(),
+			parachain_id: self.parachain_id.into(),
+		}
+		.assimilate_storage(&mut t)
 		.unwrap();
 
-		<pallet_xcm::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
-			&pallet_xcm::GenesisConfig {
-				safe_xcm_version: Some(2),
-			},
-			&mut t,
-		)
+		pallet_xcm::GenesisConfig::<Runtime> {
+			_config: Default::default(),
+			safe_xcm_version: Some(2),
+		}
+		.assimilate_storage(&mut t)
 		.unwrap();
 
-		let mut ext = sp_io::TestExternalities::new(t);
-		ext.execute_with(|| System::set_block_number(1));
-		ext
+		t
 	}
 }
 
diff --git a/runtime/integration-tests/src/stable_asset.rs b/runtime/integration-tests/src/stable_asset.rs
index 156db90357..8e23f445be 100644
--- a/runtime/integration-tests/src/stable_asset.rs
+++ b/runtime/integration-tests/src/stable_asset.rs
@@ -388,7 +388,7 @@ fn three_usd_pool_works() {
 				100 * dollar as i128,
 			));
 
-			// USDT is asset on Statemine
+			// USDT is asset on AssetHubKusama
 			assert_ok!(AssetRegistry::register_foreign_asset(
 				RuntimeOrigin::root(),
 				Box::new(
@@ -598,9 +598,9 @@ fn three_usd_pool_works() {
 				)
 			);
 			#[cfg(any(feature = "with-karura-runtime", feature = "with-acala-runtime"))]
-			let (amount1, amount2) = (227_029_652u128, 2_250_001_320u128);
+			let (amount1, amount2) = (227029641, 2250001206);
 			#[cfg(feature = "with-mandala-runtime")]
-			let (amount1, amount2) = (226_576_493, 2_250_001_320);
+			let (amount1, amount2) = (226576482, 2250001206);
 			System::assert_has_event(RuntimeEvent::Dex(module_dex::Event::Swap {
 				trader: AccountId::from(BOB),
 				path: vec![USD_CURRENCY, NATIVE_CURRENCY],
diff --git a/runtime/integration-tests/src/treasury.rs b/runtime/integration-tests/src/treasury.rs
index 0265bbf0ca..1f3092238c 100644
--- a/runtime/integration-tests/src/treasury.rs
+++ b/runtime/integration-tests/src/treasury.rs
@@ -23,11 +23,11 @@ fn treasury_should_take_xcm_execution_revenue() {
 	ExtBuilder::default().build().execute_with(|| {
 		let dot_amount = 1000 * dollar(RELAY_CHAIN_CURRENCY);
 		#[cfg(feature = "with-mandala-runtime")] // Mandala uses DOT, which has 10 d.p. accuracy.
-		let actual_amount = 9_999_999_736_030;
+		let actual_amount = 9999999758890;
 		#[cfg(feature = "with-karura-runtime")] // Karura uses KSM, which has 12 d.p. accuracy.
-		let actual_amount = 999_999_894_412_000;
+		let actual_amount = 999999903556000;
 		#[cfg(feature = "with-acala-runtime")] // Acala uses DOT, which has 10 d.p. accuracy.
-		let actual_amount = 9_999_998_944_120;
+		let actual_amount = 9999999035560;
 
 		#[cfg(feature = "with-mandala-runtime")]
 		let shallow_weight = 3_000_000;
diff --git a/runtime/integration-tests/src/xcm_interface.rs b/runtime/integration-tests/src/xcm_interface.rs
deleted file mode 100644
index 6f83b87eb7..0000000000
--- a/runtime/integration-tests/src/xcm_interface.rs
+++ /dev/null
@@ -1,683 +0,0 @@
-// This file is part of Acala.
-
-// Copyright (C) 2020-2023 Acala Foundation.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Tests the Homa and XcmInterface module - cross-chain functionalities for the Homa module.
-
-use crate::relaychain::kusama_test_net::*;
-use crate::setup::*;
-use frame_support::{assert_ok, traits::Get, BoundedVec};
-use module_homa::UnlockChunk;
-use module_support::HomaSubAccountXcm;
-use module_xcm_interface::XcmInterfaceOperation;
-use pallet_staking::StakingLedger;
-use primitives::EraIndex;
-use sp_runtime::MultiAddress;
-use xcm_emulator::TestExt;
-
-// Weight and fee cost is related to the XCM_WEIGHT passed in.
-const XCM_WEIGHT: XcmWeight = XcmWeight::from_parts(50_000_000_000, 1024 * 128);
-const XCM_FEE: Balance = 50_000_000_000;
-const XCM_BOND_FEE: Balance = 15_119_854_333;
-const XCM_UNBOND_FEE: Balance = 13_652_826_154;
-const XCM_TRANSFER_FEE: Balance = 90_005_800;
-
-fn get_xcm_weight() -> Vec<(XcmInterfaceOperation, Option<XcmWeight>, Option<Balance>)> {
-	vec![
-		// Xcm weight = 400_000_000, fee = XCM_BOND_FEE
-		(XcmInterfaceOperation::XtokensTransfer, Some(XCM_WEIGHT), Some(XCM_FEE)),
-		(
-			XcmInterfaceOperation::ParachainFee(Box::new((Parent, Parachain(1000)).into())),
-			Some(XCM_WEIGHT),
-			Some(XCM_FEE),
-		),
-		// Xcm weight = 14_000_000_000, fee = XCM_BOND_FEE
-		(
-			XcmInterfaceOperation::HomaWithdrawUnbonded,
-			Some(XCM_WEIGHT),
-			Some(XCM_FEE),
-		),
-		// Xcm weight = 14_000_000_000, fee = XCM_BOND_FEE
-		(XcmInterfaceOperation::HomaBondExtra, Some(XCM_WEIGHT), Some(XCM_FEE)),
-		(XcmInterfaceOperation::HomaUnbond, Some(XCM_WEIGHT), Some(XCM_FEE)),
-	]
-}
-
-struct HomaParams {
-	pub soft_bonded_cap_per_sub_account: Option<Balance>,
-	pub estimated_reward_rate_per_era: Option<Rate>,
-	pub commission_rate: Option<Rate>,
-	pub fast_match_fee_rate: Option<Rate>,
-}
-impl Default for HomaParams {
-	fn default() -> Self {
-		HomaParams {
-			soft_bonded_cap_per_sub_account: Some(1_000_000_000 * dollar(RELAY_CHAIN_CURRENCY)),
-			estimated_reward_rate_per_era: None,
-			commission_rate: None,
-			fast_match_fee_rate: None,
-		}
-	}
-}
-
-// Helper function to setup config. Called within Karura Externalities.
-fn configure_homa_and_xcm_interface() {
-	// Configure Homa and XcmInterface
-	assert_ok!(XcmInterface::update_xcm_dest_weight_and_fee(
-		RuntimeOrigin::root(),
-		get_xcm_weight()
-	));
-	let param = HomaParams::default();
-	assert_ok!(Homa::update_homa_params(
-		RuntimeOrigin::root(),
-		param.soft_bonded_cap_per_sub_account,
-		param.estimated_reward_rate_per_era,
-		param.commission_rate,
-		param.fast_match_fee_rate,
-	));
-	assert_eq!(
-		XcmInterface::get_parachain_fee(MultiLocation::new(1, Parachain(1000))),
-		XCM_FEE
-	);
-	assert_ok!(PolkadotXcm::force_xcm_version(
-		RuntimeOrigin::root(),
-		Box::new(MultiLocation::new(1, Here)),
-		3
-	));
-}
-
-#[test]
-fn xcm_interface_transfer_staking_to_sub_account_works() {
-	let homa_lite_sub_account: AccountId =
-		hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into();
-	let mut parachain_account: AccountId = AccountId::new([0u8; 32]);
-	Karura::execute_with(|| {
-		parachain_account = ParachainAccount::get();
-	});
-	KusamaNet::execute_with(|| {
-		// Transfer some KSM into the parachain.
-		assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			Box::new(Parachain(2000).into_versioned()),
-			Box::new(
-				Junction::AccountId32 {
-					id: alice().into(),
-					network: None
-				}
-				.into_versioned()
-			),
-			Box::new((Here, 2001 * dollar(RELAY_CHAIN_CURRENCY)).into()),
-			0
-		));
-
-		assert_eq!(kusama_runtime::Balances::free_balance(&homa_lite_sub_account), 0);
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account),
-			2003 * dollar(RELAY_CHAIN_CURRENCY)
-		);
-	});
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::set_balance(
-			RuntimeOrigin::root(),
-			MultiAddress::Id(AccountId::from(bob())),
-			RELAY_CHAIN_CURRENCY,
-			1_000_000 * dollar(RELAY_CHAIN_CURRENCY),
-			0
-		));
-
-		configure_homa_and_xcm_interface();
-
-		// Transfer fund via XCM by Mint
-		assert_ok!(Homa::mint(
-			RuntimeOrigin::signed(bob()),
-			1_000 * dollar(RELAY_CHAIN_CURRENCY)
-		));
-		assert_ok!(Homa::process_to_bond_pool());
-	});
-
-	KusamaNet::execute_with(|| {
-		// 1000 dollars (minus fee) are transferred into the Kusama chain
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account),
-			1_000 * dollar(RELAY_CHAIN_CURRENCY) - XCM_TRANSFER_FEE
-		);
-		// XCM fee is paid by the parachain account.
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account),
-			1003 * dollar(RELAY_CHAIN_CURRENCY) - XCM_BOND_FEE
-		);
-	});
-}
-
-#[test]
-fn xcm_interface_withdraw_unbonded_from_sub_account_works() {
-	let homa_lite_sub_account: AccountId =
-		hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into();
-	let mut parachain_account: AccountId = AccountId::new([0u8; 32]);
-	Karura::execute_with(|| {
-		parachain_account = ParachainAccount::get();
-	});
-	KusamaNet::execute_with(|| {
-		kusama_runtime::Staking::trigger_new_era(0, BoundedVec::default());
-
-		// Transfer some KSM into the parachain.
-		assert_ok!(kusama_runtime::Balances::transfer(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			MultiAddress::Id(homa_lite_sub_account.clone()),
-			1_001 * dollar(RELAY_CHAIN_CURRENCY)
-		));
-
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account.clone()),
-			1_001 * dollar(RELAY_CHAIN_CURRENCY)
-		);
-
-		// bond and unbond some fund for staking
-		assert_ok!(kusama_runtime::Staking::bond(
-			kusama_runtime::RuntimeOrigin::signed(homa_lite_sub_account.clone()),
-			MultiAddress::Id(homa_lite_sub_account.clone()),
-			1_000 * dollar(RELAY_CHAIN_CURRENCY),
-			pallet_staking::RewardDestination::<AccountId>::Staked,
-		));
-
-		kusama_runtime::System::set_block_number(100);
-		assert_ok!(kusama_runtime::Staking::unbond(
-			kusama_runtime::RuntimeOrigin::signed(homa_lite_sub_account.clone()),
-			1_000 * dollar(RELAY_CHAIN_CURRENCY)
-		));
-
-		// Kusama's unbonding period is 28 eras = 100_800 blocks
-		kusama_runtime::System::set_block_number(101_000);
-		for _i in 0..29 {
-			kusama_runtime::Staking::trigger_new_era(0, BoundedVec::default());
-		}
-
-		// Endowed from kusama_ext()
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account.clone()),
-			2 * dollar(RELAY_CHAIN_CURRENCY)
-		);
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account.clone()),
-			1_001 * dollar(RELAY_CHAIN_CURRENCY)
-		);
-	});
-
-	Karura::execute_with(|| {
-		configure_homa_and_xcm_interface();
-
-		// Add an unlock chunk to the ledger
-		assert_ok!(Homa::reset_ledgers(
-			RuntimeOrigin::root(),
-			vec![(
-				0,
-				Some(1_000 * dollar(RELAY_CHAIN_CURRENCY)),
-				Some(vec![UnlockChunk {
-					value: 1000 * dollar(RELAY_CHAIN_CURRENCY),
-					era: 0
-				},])
-			),]
-		));
-
-		// Process the unlocking and withdraw unbonded.
-		assert_ok!(Homa::process_scheduled_unbond(0));
-	});
-
-	KusamaNet::execute_with(|| {
-		// Fund has been withdrew and transferred.
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account),
-			dollar(RELAY_CHAIN_CURRENCY)
-		);
-		// Final parachain balance is: unbond_withdrew($1000) + initial_endowment($2) - xcm_fee
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account.clone()),
-			1_001_969_850_350_626
-		);
-	});
-}
-
-#[test]
-fn xcm_interface_bond_extra_on_sub_account_works() {
-	let homa_lite_sub_account: AccountId =
-		hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into();
-	let mut parachain_account: AccountId = AccountId::new([0u8; 32]);
-	Karura::execute_with(|| {
-		parachain_account = ParachainAccount::get();
-	});
-	KusamaNet::execute_with(|| {
-		assert_ok!(kusama_runtime::Balances::transfer(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			MultiAddress::Id(homa_lite_sub_account.clone()),
-			1_001 * dollar(RELAY_CHAIN_CURRENCY)
-		));
-
-		// Transfer some KSM into the parachain.
-		assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			Box::new(Parachain(2000).into_versioned()),
-			Box::new(
-				Junction::AccountId32 {
-					id: alice().into(),
-					network: None
-				}
-				.into_versioned()
-			),
-			Box::new((Here, 1_000 * dollar(RELAY_CHAIN_CURRENCY)).into()),
-			0
-		));
-
-		// Bond some money
-		assert_ok!(kusama_runtime::Staking::bond(
-			kusama_runtime::RuntimeOrigin::signed(homa_lite_sub_account.clone()),
-			MultiAddress::Id(homa_lite_sub_account.clone()),
-			500 * dollar(RELAY_CHAIN_CURRENCY),
-			pallet_staking::RewardDestination::<AccountId>::Staked,
-		));
-
-		assert_eq!(
-			kusama_runtime::Staking::ledger(&homa_lite_sub_account),
-			Some(StakingLedger {
-				stash: homa_lite_sub_account.clone(),
-				total: 500 * dollar(RELAY_CHAIN_CURRENCY),
-				active: 500 * dollar(RELAY_CHAIN_CURRENCY),
-				unlocking: BoundedVec::default(),
-				claimed_rewards: BoundedVec::default(),
-			})
-		);
-
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account),
-			1001 * dollar(RELAY_CHAIN_CURRENCY)
-		);
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account),
-			1002 * dollar(RELAY_CHAIN_CURRENCY)
-		);
-	});
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::set_balance(
-			RuntimeOrigin::root(),
-			MultiAddress::Id(AccountId::from(bob())),
-			RELAY_CHAIN_CURRENCY,
-			501 * dollar(RELAY_CHAIN_CURRENCY),
-			0
-		));
-
-		configure_homa_and_xcm_interface();
-
-		// Use Mint to bond more.
-		assert_ok!(Homa::mint(
-			RuntimeOrigin::signed(bob()),
-			500 * dollar(RELAY_CHAIN_CURRENCY)
-		));
-		assert_ok!(Homa::process_to_bond_pool());
-	});
-
-	KusamaNet::execute_with(|| {
-		assert_eq!(
-			kusama_runtime::Staking::ledger(&homa_lite_sub_account),
-			Some(StakingLedger {
-				stash: homa_lite_sub_account.clone(),
-				total: 1000 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE,
-				active: 1000 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE,
-				unlocking: BoundedVec::default(),
-				claimed_rewards: BoundedVec::default(),
-			})
-		);
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account),
-			1501 * dollar(RELAY_CHAIN_CURRENCY) - XCM_TRANSFER_FEE
-		);
-		// XCM fee is paid by the sovereign account.
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account),
-			502 * dollar(RELAY_CHAIN_CURRENCY) - XCM_BOND_FEE
-		);
-	});
-}
-
-#[test]
-fn xcm_interface_unbond_on_sub_account_works() {
-	let homa_lite_sub_account: AccountId =
-		hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into();
-	let mut parachain_account: AccountId = AccountId::new([0u8; 32]);
-	Karura::execute_with(|| {
-		parachain_account = ParachainAccount::get();
-	});
-	KusamaNet::execute_with(|| {
-		assert_ok!(kusama_runtime::Balances::transfer(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			MultiAddress::Id(homa_lite_sub_account.clone()),
-			1_001 * dollar(RELAY_CHAIN_CURRENCY)
-		));
-
-		// Transfer some KSM into the parachain.
-		assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			Box::new(Parachain(2000).into_versioned()),
-			Box::new(
-				Junction::AccountId32 {
-					id: alice().into(),
-					network: None
-				}
-				.into_versioned()
-			),
-			Box::new((Here, 1_000 * dollar(RELAY_CHAIN_CURRENCY)).into()),
-			0
-		));
-
-		// Bond some tokens.
-		assert_ok!(kusama_runtime::Staking::bond(
-			kusama_runtime::RuntimeOrigin::signed(homa_lite_sub_account.clone()),
-			MultiAddress::Id(homa_lite_sub_account.clone()),
-			dollar(RELAY_CHAIN_CURRENCY),
-			pallet_staking::RewardDestination::<AccountId>::Staked,
-		));
-
-		assert_eq!(
-			kusama_runtime::Staking::ledger(&homa_lite_sub_account),
-			Some(StakingLedger {
-				stash: homa_lite_sub_account.clone(),
-				total: dollar(RELAY_CHAIN_CURRENCY),
-				active: dollar(RELAY_CHAIN_CURRENCY),
-				unlocking: BoundedVec::default(),
-				claimed_rewards: BoundedVec::default(),
-			})
-		);
-
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account),
-			1_001 * dollar(RELAY_CHAIN_CURRENCY)
-		);
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account),
-			1_002 * dollar(RELAY_CHAIN_CURRENCY)
-		);
-	});
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::set_balance(
-			RuntimeOrigin::root(),
-			MultiAddress::Id(AccountId::from(bob())),
-			RELAY_CHAIN_CURRENCY,
-			1_001 * dollar(RELAY_CHAIN_CURRENCY),
-			0
-		));
-
-		configure_homa_and_xcm_interface();
-
-		// Bond more using Mint
-		// Amount bonded = $1000 - XCM_FEE = 999_990_000_000_000
-		assert_ok!(Homa::mint(
-			RuntimeOrigin::signed(bob()),
-			1_000 * dollar(RELAY_CHAIN_CURRENCY),
-		));
-
-		// Update internal storage in Homa
-		assert_ok!(Homa::bump_current_era(1));
-
-		// Put in redeem request
-		assert_ok!(Homa::request_redeem(
-			RuntimeOrigin::signed(bob()),
-			10_000 * dollar(LIQUID_CURRENCY),
-			false,
-		));
-
-		// Process the redeem request and unbond funds on the relaychain.
-		assert_ok!(Homa::process_redeem_requests(1));
-	});
-
-	KusamaNet::execute_with(|| {
-		// Ensure the correct amount of fund is unbonded
-		let ledger = kusama_runtime::Staking::ledger(&homa_lite_sub_account).expect("record should exist");
-		assert_eq!(ledger.total, 1_001 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE);
-		assert_eq!(ledger.active, 1 * dollar(RELAY_CHAIN_CURRENCY));
-
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account),
-			2_001 * dollar(RELAY_CHAIN_CURRENCY) - XCM_TRANSFER_FEE
-		);
-
-		// 2 x XCM fee is paid: for Mint and Redeem
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account),
-			2 * dollar(RELAY_CHAIN_CURRENCY) - XCM_BOND_FEE - XCM_UNBOND_FEE
-		);
-	});
-}
-
-// Test the entire process from Mint to Redeem.
-#[test]
-fn homa_mint_and_redeem_works() {
-	let homa_lite_sub_account: AccountId =
-		hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into();
-	let mut parachain_account: AccountId = AccountId::new([0u8; 32]);
-	let bonding_duration: EraIndex = <Runtime as module_homa::Config>::BondingDuration::get(); // Defined in Runtime
-
-	Karura::execute_with(|| {
-		parachain_account = ParachainAccount::get();
-	});
-	KusamaNet::execute_with(|| {
-		// Transfer some KSM into the parachain.
-		assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			Box::new(Parachain(2000).into_versioned()),
-			Box::new(
-				Junction::AccountId32 {
-					id: alice().into(),
-					network: None
-				}
-				.into_versioned()
-			),
-			Box::new((Here, 2001 * dollar(RELAY_CHAIN_CURRENCY)).into()),
-			0
-		));
-
-		// Transfer some KSM into the parachain.
-		assert_ok!(kusama_runtime::Balances::transfer(
-			kusama_runtime::RuntimeOrigin::signed(ALICE.into()),
-			MultiAddress::Id(homa_lite_sub_account.clone()),
-			dollar(RELAY_CHAIN_CURRENCY)
-		));
-
-		assert_ok!(kusama_runtime::Staking::bond(
-			kusama_runtime::RuntimeOrigin::signed(homa_lite_sub_account.clone()),
-			MultiAddress::Id(homa_lite_sub_account.clone()),
-			dollar(RELAY_CHAIN_CURRENCY),
-			pallet_staking::RewardDestination::<AccountId>::Staked,
-		));
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account),
-			2003 * dollar(RELAY_CHAIN_CURRENCY)
-		);
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&homa_lite_sub_account),
-			dollar(RELAY_CHAIN_CURRENCY),
-		);
-	});
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::set_balance(
-			RuntimeOrigin::root(),
-			MultiAddress::Id(AccountId::from(alice())),
-			RELAY_CHAIN_CURRENCY,
-			1_000 * dollar(RELAY_CHAIN_CURRENCY),
-			0
-		));
-		assert_ok!(Tokens::set_balance(
-			RuntimeOrigin::root(),
-			MultiAddress::Id(AccountId::from(bob())),
-			RELAY_CHAIN_CURRENCY,
-			1_000 * dollar(RELAY_CHAIN_CURRENCY),
-			0
-		));
-
-		configure_homa_and_xcm_interface();
-
-		// Test mint works
-		// Amount bonded = $1000 - XCM_FEE = 999_990_000_000_000
-		assert_ok!(Homa::mint(
-			RuntimeOrigin::signed(alice()),
-			1_000 * dollar(RELAY_CHAIN_CURRENCY)
-		));
-		assert_ok!(Homa::mint(
-			RuntimeOrigin::signed(bob()),
-			1_000 * dollar(RELAY_CHAIN_CURRENCY)
-		));
-
-		assert_eq!(Homa::get_total_bonded(), 0);
-		assert_eq!(Homa::get_total_staking_currency(), 2_000 * dollar(RELAY_CHAIN_CURRENCY));
-
-		// Synchronize with Relay chain via Xcm messages. Also update internal storage.
-		assert_ok!(Homa::bump_current_era(1));
-
-		assert_eq!(
-			Tokens::free_balance(LIQUID_CURRENCY, &AccountId::from(alice())),
-			10_000 * dollar(LIQUID_CURRENCY)
-		);
-		assert_eq!(
-			Tokens::free_balance(LIQUID_CURRENCY, &AccountId::from(bob())),
-			10_000 * dollar(LIQUID_CURRENCY)
-		);
-		assert_eq!(Tokens::free_balance(RELAY_CHAIN_CURRENCY, &AccountId::from(alice())), 0);
-		assert_eq!(Tokens::free_balance(RELAY_CHAIN_CURRENCY, &AccountId::from(bob())), 0);
-
-		assert_eq!(Homa::get_total_bonded(), 2_000 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE);
-		assert_eq!(
-			Homa::get_total_staking_currency(),
-			2_000 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE
-		);
-	});
-
-	KusamaNet::execute_with(|| {
-		// Ensure the correct amount is bonded.
-		let ledger = kusama_runtime::Staking::ledger(&homa_lite_sub_account).expect("record should exist");
-		assert_eq!(ledger.total, 2001 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE);
-		assert_eq!(ledger.active, 2001 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE);
-
-		// XCM fee is paid: for Mint
-		assert_eq!(
-			kusama_runtime::Balances::free_balance(&parachain_account),
-			3 * dollar(RELAY_CHAIN_CURRENCY) - XCM_BOND_FEE
-		);
-	});
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::set_balance(
-			RuntimeOrigin::root(),
-			MultiAddress::Id(AccountId::from(alice())),
-			RELAY_CHAIN_CURRENCY,
-			0,
-			0
-		));
-		assert_ok!(Tokens::set_balance(
-			RuntimeOrigin::root(),
-			MultiAddress::Id(AccountId::from(bob())),
-			RELAY_CHAIN_CURRENCY,
-			0,
-			0
-		));
-
-		// Redeem the liquid currency.
-		assert_ok!(Homa::request_redeem(
-			RuntimeOrigin::signed(alice()),
-			10_000 * dollar(LIQUID_CURRENCY),
-			false,
-		));
-		assert_ok!(Homa::request_redeem(
-			RuntimeOrigin::signed(bob()),
-			10_000 * dollar(LIQUID_CURRENCY),
-			false,
-		));
-
-		// Unbonds the tokens on the Relay chain.
-		assert_ok!(Homa::bump_current_era(1));
-		let unbonding_era = Homa::relay_chain_current_era() + bonding_duration;
-		assert_eq!(unbonding_era, 30);
-
-		assert_eq!(Homa::unbondings(&alice(), unbonding_era), 999_975_000_000_000);
-		assert_eq!(Homa::unbondings(&bob(), unbonding_era), 999_975_000_000_000);
-
-		assert_eq!(Homa::get_total_bonded(), 0);
-		assert_eq!(Homa::get_total_staking_currency(), 0);
-		assert_eq!(Tokens::free_balance(RELAY_CHAIN_CURRENCY, &AccountId::from(alice())), 0);
-		assert_eq!(Tokens::free_balance(RELAY_CHAIN_CURRENCY, &AccountId::from(bob())), 0);
-	});
-
-	KusamaNet::execute_with(|| {
-		// Some bonds are being unlocked via Xcm from the parachain.
-		let ledger = kusama_runtime::Staking::ledger(&homa_lite_sub_account).expect("record should exist");
-		assert_eq!(ledger.total, 2001 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE);
-		assert_eq!(ledger.active, dollar(RELAY_CHAIN_CURRENCY));
-
-		// Fast forward the era until unlocking period ends.
-		kusama_runtime::System::set_block_number(101_000);
-		for _i in 0..29 {
-			kusama_runtime::Staking::trigger_new_era(0, BoundedVec::default());
-		}
-	});
-
-	Karura::execute_with(|| {
-		assert_ok!(Tokens::set_balance(
-			RuntimeOrigin::root(),
-			MultiAddress::Id(AccountId::from(alice())),
-			RELAY_CHAIN_CURRENCY,
-			0,
-			0
-		));
-		assert_ok!(Tokens::set_balance(
-			RuntimeOrigin::root(),
-			MultiAddress::Id(AccountId::from(bob())),
-			RELAY_CHAIN_CURRENCY,
-			0,
-			0
-		));
-
-		// Wait for the chunk to unlock
-		for _ in 0..bonding_duration + 1 {
-			assert_ok!(Homa::bump_current_era(1));
-		}
-
-		// Claim the unlocked chunk
-		assert_ok!(Homa::claim_redemption(RuntimeOrigin::signed(alice()), alice(),));
-		assert_ok!(Homa::claim_redemption(RuntimeOrigin::signed(alice()), bob(),));
-
-		// Redeem process is completed.
-		assert_eq!(Homa::get_total_bonded(), 0);
-		assert_eq!(Homa::get_total_staking_currency(), 0);
-		assert_eq!(
-			Tokens::free_balance(RELAY_CHAIN_CURRENCY, &AccountId::from(alice())),
-			999_975_000_000_000
-		);
-		assert_eq!(
-			Tokens::free_balance(RELAY_CHAIN_CURRENCY, &AccountId::from(bob())),
-			999_975_000_000_000
-		);
-		assert_eq!(Tokens::free_balance(LIQUID_CURRENCY, &AccountId::from(alice())), 0);
-		assert_eq!(Tokens::free_balance(LIQUID_CURRENCY, &AccountId::from(bob())), 0);
-	});
-
-	KusamaNet::execute_with(|| {
-		// Unbonded chunks are withdrew.
-		let ledger = kusama_runtime::Staking::ledger(&homa_lite_sub_account).expect("record should exist");
-		assert_eq!(ledger.total, dollar(RELAY_CHAIN_CURRENCY));
-		assert_eq!(ledger.active, dollar(RELAY_CHAIN_CURRENCY));
-	});
-}
diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml
index 621e11c084..309eb89934 100644
--- a/runtime/karura/Cargo.toml
+++ b/runtime/karura/Cargo.toml
@@ -8,68 +8,68 @@ build = "build.rs"
 [dependencies]
 smallvec = "1.4.0"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.85", default-features = false, features = ["alloc"] }
 hex = { version = "0.4", default-features = false }
-hex-literal = { version = "0.3.1" }
+hex-literal = { version = "0.4.1" }
 
 # substrate
-frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", 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 }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-pallet-aura = { 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-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features =false }
-pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-scheduler = { 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, features = ["historical"] }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-preimage = { 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-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-consensus-aura = { 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-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-offchain = { 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-session = { 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 }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false}
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false}
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features =false }
+pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["historical"] }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 # cumulus
-cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
 
 # polkadot
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
 
 # orml
 orml-auction = { path = "../../orml/auction", default-features = false }
@@ -128,16 +128,16 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path =
 
 # benchmarking deps
 libsecp256k1 = { version = "0.7", default-features = false, optional = true }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
 
 [build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true }
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
 
 [features]
 default = ["std"]
@@ -156,6 +156,7 @@ std = [
 	"frame-try-runtime/std",
 	"pallet-aura/std",
 	"pallet-authorship/std",
+	"pallet-bags-list/std",
 	"pallet-balances/std",
 	"pallet-bounties/std",
 	"pallet-bounties/std",
diff --git a/runtime/karura/src/constants.rs b/runtime/karura/src/constants.rs
index 185865ff97..c73303e1c7 100644
--- a/runtime/karura/src/constants.rs
+++ b/runtime/karura/src/constants.rs
@@ -108,7 +108,7 @@ pub mod parachains {
 		pub const KINT_KEY: &[u8] = &[0, 12];
 	}
 
-	pub mod statemine {
+	pub mod asset_hub_kusama {
 		pub const ID: u32 = 1000;
 	}
 }
@@ -124,6 +124,6 @@ mod tests {
 		let q = Balance::from(ExtrinsicBaseWeight::get().ref_time());
 
 		assert_eq!(p, 1_000_000_000);
-		assert_eq!(q, 113_638_000);
+		assert_eq!(q, 124_414_000);
 	}
 }
diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs
index 6f75a2640b..29d893ff83 100644
--- a/runtime/karura/src/lib.rs
+++ b/runtime/karura/src/lib.rs
@@ -74,7 +74,6 @@ pub use frame_support::{
 		ConstBool, ConstU128, ConstU16, ConstU32, Contains, ContainsLengthBound, Currency as PalletCurrency, Currency,
 		EnsureOrigin, EqualPrivilegeOnly, Everything, Get, Imbalance, InstanceFilter, IsSubType, IsType,
 		KeyOwnerProofSystem, LockIdentifier, Nothing, OnRuntimeUpgrade, OnUnbalanced, Randomness, SortedMembers,
-		U128CurrencyToVote,
 	},
 	weights::{constants::RocksDbWeight, ConstantMultiplier, IdentityFee, Weight},
 	PalletId, RuntimeDebug, StorageValue,
@@ -255,11 +254,10 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	type RuntimeCall = RuntimeCall;
 	type Lookup = (AccountIdLookup<AccountId, AccountIndex>, EvmAccounts);
-	type Index = Nonce;
-	type BlockNumber = BlockNumber;
+	type Nonce = Nonce;
 	type Hash = Hash;
 	type Hashing = BlakeTwo256;
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type BlockHashCount = BlockHashCount;
@@ -285,6 +283,7 @@ impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<32>;
+	type AllowMultipleBlocksPerSlot = ConstBool<false>;
 }
 
 impl pallet_authorship::Config for Runtime {
@@ -369,7 +368,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ReserveIdentifier;
+	type RuntimeHoldReason = ReserveIdentifier;
 	type FreezeIdentifier = ();
 	type MaxHolds = MaxReserves;
 	type MaxFreezes = ();
@@ -397,6 +396,7 @@ pub type SlowAdjustingFeeUpdate<R> =
 impl pallet_sudo::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -1709,11 +1709,7 @@ impl module_earning::Config for Runtime {
 }
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = primitives::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
+	pub enum Runtime {
 		// Core & Utility
 		System: frame_system = 0,
 		Timestamp: pallet_timestamp = 1,
@@ -1755,7 +1751,7 @@ construct_runtime!(
 		CumulusXcm: cumulus_pallet_xcm exclude_parts { Call } = 52,
 		DmpQueue: cumulus_pallet_dmp_queue = 53,
 		XTokens: orml_xtokens = 54,
-		UnknownTokens: orml_unknown_tokens exclude_parts { Call } = 55,
+		UnknownTokens: orml_unknown_tokens = 55,
 		OrmlXcm: orml_xcm = 56,
 
 		// Governance
@@ -2404,8 +2400,8 @@ mod tests {
 	where
 		F: FnMut(),
 	{
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap()
 			.into();
 		t.execute_with(|| {
diff --git a/runtime/karura/src/weights/module_aggregated_dex.rs b/runtime/karura/src/weights/module_aggregated_dex.rs
index 57f13a0db5..8643d15f89 100644
--- a/runtime/karura/src/weights/module_aggregated_dex.rs
+++ b/runtime/karura/src/weights/module_aggregated_dex.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_aggregated_dex
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,63 +47,63 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_aggregated_dex.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_aggregated_dex::WeightInfo for WeightInfo<T> {
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:3)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:3)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
 	/// The range of component `u` is `[2, 4]`.
 	fn swap_with_exact_supply(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1627 + u * (112 ±0)`
-		//  Estimated: `17078 + u * (1270 ±19)`
-		// Minimum execution time: 85_800 nanoseconds.
-		Weight::from_parts(64_050_388, 17078)
-			// Standard Error: 71_792
-			.saturating_add(Weight::from_parts(12_410_412, 0).saturating_mul(u.into()))
+		//  Measured:  `1777 + u * (112 ±0)`
+		//  Estimated: `6234 + u * (643 ±19)`
+		// Minimum execution time: 102_006 nanoseconds.
+		Weight::from_parts(80_179_204, 6234)
+			// Standard Error: 55_692
+			.saturating_add(Weight::from_parts(12_348_058, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 1270).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 643).saturating_mul(u.into()))
 	}
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:3)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:3)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
 	/// The range of component `u` is `[2, 4]`.
 	fn swap_with_exact_target(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1627 + u * (112 ±0)`
-		//  Estimated: `17078 + u * (1270 ±18)`
-		// Minimum execution time: 94_631 nanoseconds.
-		Weight::from_parts(60_248_894, 17078)
-			// Standard Error: 80_754
-			.saturating_add(Weight::from_parts(18_659_185, 0).saturating_mul(u.into()))
+		//  Measured:  `1777 + u * (112 ±0)`
+		//  Estimated: `6234 + u * (643 ±18)`
+		// Minimum execution time: 110_729 nanoseconds.
+		Weight::from_parts(77_632_959, 6234)
+			// Standard Error: 67_607
+			.saturating_add(Weight::from_parts(18_129_599, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 1270).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 643).saturating_mul(u.into()))
 	}
-	// Storage: AggregatedDex AggregatedSwapPaths (r:0 w:6)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `n` is `[0, 7]`.
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:0 w:5)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 6]`.
 	fn update_aggregated_swap_paths(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `666`
 		//  Estimated: `666`
-		// Minimum execution time: 5_676 nanoseconds.
-		Weight::from_parts(5_208_057, 666)
-			// Standard Error: 10_102
-			.saturating_add(Weight::from_parts(1_672_737, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_785 nanoseconds.
+		Weight::from_parts(5_425_040, 666)
+			// Standard Error: 11_403
+			.saturating_add(Weight::from_parts(1_491_605, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
 	}
 }
diff --git a/runtime/karura/src/weights/module_asset_registry.rs b/runtime/karura/src/weights/module_asset_registry.rs
index cf60927c27..07b4633d8f 100644
--- a/runtime/karura/src/weights/module_asset_registry.rs
+++ b/runtime/karura/src/weights/module_asset_registry.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_asset_registry
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,109 +47,109 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_asset_registry.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_asset_registry::WeightInfo for WeightInfo<T> {
-	// Storage: AssetRegistry NextForeignAssetId (r:1 w:1)
-	// Proof Skipped: AssetRegistry NextForeignAssetId (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry LocationToCurrencyIds (r:1 w:1)
-	// Proof Skipped: AssetRegistry LocationToCurrencyIds (max_values: None, max_size: None, mode: Measured)
-	// Storage: AssetRegistry ForeignAssetLocations (r:1 w:1)
-	// Proof Skipped: AssetRegistry ForeignAssetLocations (max_values: None, max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::NextForeignAssetId` (r:1 w:1)
+	// Proof: `AssetRegistry::NextForeignAssetId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::LocationToCurrencyIds` (r:1 w:1)
+	// Proof: `AssetRegistry::LocationToCurrencyIds` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::ForeignAssetLocations` (r:1 w:1)
+	// Proof: `AssetRegistry::ForeignAssetLocations` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_foreign_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1106`
-		//  Estimated: `16304`
-		// Minimum execution time: 28_257 nanoseconds.
-		Weight::from_parts(29_234_000, 16304)
+		//  Measured:  `1107`
+		//  Estimated: `4572`
+		// Minimum execution time: 27_625 nanoseconds.
+		Weight::from_parts(28_396_000, 4572)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: AssetRegistry ForeignAssetLocations (r:1 w:1)
-	// Proof Skipped: AssetRegistry ForeignAssetLocations (max_values: None, max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::ForeignAssetLocations` (r:1 w:1)
+	// Proof: `AssetRegistry::ForeignAssetLocations` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_foreign_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1262`
-		//  Estimated: `9454`
-		// Minimum execution time: 27_891 nanoseconds.
-		Weight::from_parts(28_625_000, 9454)
+		//  Measured:  `1263`
+		//  Estimated: `4728`
+		// Minimum execution time: 27_003 nanoseconds.
+		Weight::from_parts(27_577_000, 4728)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: AssetRegistry NextStableAssetId (r:1 w:1)
-	// Proof Skipped: AssetRegistry NextStableAssetId (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::NextStableAssetId` (r:1 w:1)
+	// Proof: `AssetRegistry::NextStableAssetId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_stable_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1106`
-		//  Estimated: `7162`
-		// Minimum execution time: 22_649 nanoseconds.
-		Weight::from_parts(23_414_000, 7162)
+		//  Measured:  `1107`
+		//  Estimated: `4572`
+		// Minimum execution time: 22_482 nanoseconds.
+		Weight::from_parts(22_887_000, 4572)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_stable_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1200`
-		//  Estimated: `4665`
-		// Minimum execution time: 22_932 nanoseconds.
-		Weight::from_parts(23_551_000, 4665)
+		//  Measured:  `1201`
+		//  Estimated: `4666`
+		// Minimum execution time: 22_629 nanoseconds.
+		Weight::from_parts(23_101_000, 4666)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EVM Accounts (r:2 w:0)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:1 w:0)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM AccountStorages (r:5 w:0)
-	// Proof Skipped: EVM AccountStorages (max_values: None, max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: AssetRegistry Erc20IdToAddress (r:1 w:1)
-	// Proof Skipped: AssetRegistry Erc20IdToAddress (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EVM::Accounts` (r:2 w:0)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:1 w:0)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::AccountStorages` (r:5 w:0)
+	// Proof: `EVM::AccountStorages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::Erc20IdToAddress` (r:1 w:1)
+	// Proof: `AssetRegistry::Erc20IdToAddress` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_erc20_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6813`
-		//  Estimated: `63765`
-		// Minimum execution time: 203_492 nanoseconds.
-		Weight::from_parts(206_860_000, 63765)
+		//  Measured:  `6814`
+		//  Estimated: `20179`
+		// Minimum execution time: 200_649 nanoseconds.
+		Weight::from_parts(205_860_000, 20179)
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_erc20_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1351`
-		//  Estimated: `4816`
-		// Minimum execution time: 31_106 nanoseconds.
-		Weight::from_parts(32_420_000, 4816)
+		//  Measured:  `1352`
+		//  Estimated: `4817`
+		// Minimum execution time: 31_537 nanoseconds.
+		Weight::from_parts(33_024_000, 4817)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn register_native_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1106`
-		//  Estimated: `4571`
-		// Minimum execution time: 21_192 nanoseconds.
-		Weight::from_parts(21_596_000, 4571)
+		//  Measured:  `1107`
+		//  Estimated: `4572`
+		// Minimum execution time: 20_895 nanoseconds.
+		Weight::from_parts(21_499_000, 4572)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:1)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:1)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_native_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1175`
-		//  Estimated: `4640`
-		// Minimum execution time: 22_556 nanoseconds.
-		Weight::from_parts(22_962_000, 4640)
+		//  Measured:  `1176`
+		//  Estimated: `4641`
+		// Minimum execution time: 21_496 nanoseconds.
+		Weight::from_parts(22_284_000, 4641)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/karura/src/weights/module_auction_manager.rs b/runtime/karura/src/weights/module_auction_manager.rs
index 611f530c2d..7941896a03 100644
--- a/runtime/karura/src/weights/module_auction_manager.rs
+++ b/runtime/karura/src/weights/module_auction_manager.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_auction_manager
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,34 +47,34 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_auction_manager.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_auction_manager::WeightInfo for WeightInfo<T> {
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: AuctionManager CollateralAuctions (r:1 w:1)
-	// Proof: AuctionManager CollateralAuctions (max_values: None, max_size: Some(139), added: 2614, mode: MaxEncodedLen)
-	// Storage: Auction Auctions (r:1 w:1)
-	// Proof: Auction Auctions (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalTargetInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalTargetInAuction (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Auction AuctionEndTime (r:0 w:1)
-	// Proof: Auction AuctionEndTime (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::CollateralAuctions` (r:1 w:1)
+	// Proof: `AuctionManager::CollateralAuctions` (`max_values`: None, `max_size`: Some(139), added: 2614, mode: `MaxEncodedLen`)
+	// Storage: `Auction::Auctions` (r:1 w:1)
+	// Proof: `Auction::Auctions` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalTargetInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalTargetInAuction` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionEndTime` (r:0 w:1)
+	// Proof: `Auction::AuctionEndTime` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
 	fn cancel_collateral_auction() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2795`
-		//  Estimated: `44437`
-		// Minimum execution time: 106_741 nanoseconds.
-		Weight::from_parts(109_443_000, 44437)
+		//  Measured:  `2796`
+		//  Estimated: `8736`
+		// Minimum execution time: 103_988 nanoseconds.
+		Weight::from_parts(106_297_000, 8736)
 			.saturating_add(T::DbWeight::get().reads(14))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
diff --git a/runtime/karura/src/weights/module_cdp_engine.rs b/runtime/karura/src/weights/module_cdp_engine.rs
index 5f973f8e0a..4fd8480d59 100644
--- a/runtime/karura/src/weights/module_cdp_engine.rs
+++ b/runtime/karura/src/weights/module_cdp_engine.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_cdp_engine
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,221 +47,223 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_cdp_engine.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_cdp_engine::WeightInfo for WeightInfo<T> {
-	// Storage: Aura CurrentSlot (r:1 w:1)
-	// Proof: Aura CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	// Storage: Aura Authorities (r:1 w:0)
-	// Proof: Aura Authorities (max_values: Some(1), max_size: Some(1025), added: 1520, mode: MaxEncodedLen)
-	// Storage: CdpEngine LastAccumulationSecs (r:1 w:1)
-	// Proof: CdpEngine LastAccumulationSecs (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:4 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: System ParentHash (r:0 w:1)
-	// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	// Storage: System Digest (r:0 w:1)
-	// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: System BlockHash (r:0 w:1)
-	// Proof: System BlockHash (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: unknown `0x3a65787472696e7369635f696e646578` (r:0 w:1)
-	// Proof Skipped: unknown `0x3a65787472696e7369635f696e646578` (r:0 w:1)
-	// 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: `Aura::CurrentSlot` (r:1 w:1)
+	// Proof: `Aura::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	// Storage: `Aura::Authorities` (r:1 w:0)
+	// Proof: `Aura::Authorities` (`max_values`: Some(1), `max_size`: Some(1025), added: 1520, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::LastAccumulationSecs` (r:1 w:1)
+	// Proof: `CdpEngine::LastAccumulationSecs` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:4 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `System::ParentHash` (r:0 w:1)
+	// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	// Storage: `System::Digest` (r:0 w:1)
+	// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::BlockHash` (r:0 w:1)
+	// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: UNKNOWN KEY `0x3a65787472696e7369635f696e646578` (r:0 w:1)
+	// Proof: UNKNOWN KEY `0x3a65787472696e7369635f696e646578` (r:0 w:1)
+	// Storage: UNKNOWN KEY `0x3a696e747261626c6f636b5f656e74726f7079` (r:0 w:1)
+	// Proof: UNKNOWN KEY `0x3a696e747261626c6f636b5f656e74726f7079` (r:0 w:1)
+	// 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`)
 	/// The range of component `c` is `[0, 4]`.
 	fn on_initialize(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1018 + c * (90 ±0)`
-		//  Estimated: `12711 + c * (2691 ±0)`
-		// Minimum execution time: 25_511 nanoseconds.
-		Weight::from_parts(27_470_398, 12711)
-			// Standard Error: 47_076
-			.saturating_add(Weight::from_parts(5_891_002, 0).saturating_mul(c.into()))
+		//  Estimated: `3691 + c * (2515 ±0)`
+		// Minimum execution time: 26_040 nanoseconds.
+		Weight::from_parts(28_054_332, 3691)
+			// Standard Error: 48_952
+			.saturating_add(Weight::from_parts(6_413_070, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(8))
-			.saturating_add(Weight::from_parts(0, 2691).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().writes(9))
+			.saturating_add(Weight::from_parts(0, 2515).saturating_mul(c.into()))
 	}
-	// Storage: CdpEngine CollateralParams (r:1 w:1)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:1)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
 	fn set_collateral_params() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1172`
+		//  Measured:  `1173`
 		//  Estimated: `3600`
-		// Minimum execution time: 35_995 nanoseconds.
-		Weight::from_parts(36_647_000, 3600)
+		// Minimum execution time: 35_847 nanoseconds.
+		Weight::from_parts(36_367_000, 3600)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:3 w:3)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: CdpTreasury DebitPool (r:1 w:1)
-	// Proof: CdpTreasury DebitPool (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:2 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:1 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine LiquidationContracts (r:1 w:0)
-	// Proof: CdpEngine LiquidationContracts (max_values: Some(1), max_size: Some(201), added: 696, mode: MaxEncodedLen)
-	// Storage: CdpTreasury ExpectedCollateralAuctionSize (r:1 w:0)
-	// Proof: CdpTreasury ExpectedCollateralAuctionSize (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalTargetInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalTargetInAuction (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Auction AuctionsIndex (r:1 w:1)
-	// Proof: Auction AuctionsIndex (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: AuctionManager CollateralAuctions (r:0 w:50)
-	// Proof: AuctionManager CollateralAuctions (max_values: None, max_size: Some(139), added: 2614, mode: MaxEncodedLen)
-	// Storage: Auction AuctionEndTime (r:0 w:50)
-	// Proof: Auction AuctionEndTime (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen)
-	// Storage: Auction Auctions (r:0 w:50)
-	// Proof: Auction Auctions (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:3 w:3)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::DebitPool` (r:1 w:1)
+	// Proof: `CdpTreasury::DebitPool` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:2 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:1 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::LiquidationContracts` (r:1 w:0)
+	// Proof: `CdpEngine::LiquidationContracts` (`max_values`: Some(1), `max_size`: Some(201), added: 696, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::ExpectedCollateralAuctionSize` (r:1 w:0)
+	// Proof: `CdpTreasury::ExpectedCollateralAuctionSize` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalTargetInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalTargetInAuction` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionsIndex` (r:1 w:1)
+	// Proof: `Auction::AuctionsIndex` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::CollateralAuctions` (r:0 w:50)
+	// Proof: `AuctionManager::CollateralAuctions` (`max_values`: None, `max_size`: Some(139), added: 2614, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionEndTime` (r:0 w:50)
+	// Proof: `Auction::AuctionEndTime` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
+	// Storage: `Auction::Auctions` (r:0 w:50)
+	// Proof: `Auction::Auctions` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
 	/// The range of component `b` is `[1, 50]`.
 	fn liquidate_by_auction(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3484`
-		//  Estimated: `100717`
-		// Minimum execution time: 209_322 nanoseconds.
-		Weight::from_parts(215_023_051, 100717)
-			// Standard Error: 24_197
-			.saturating_add(Weight::from_parts(13_400_809, 0).saturating_mul(b.into()))
+		//  Measured:  `3518`
+		//  Estimated: `9458`
+		// Minimum execution time: 202_784 nanoseconds.
+		Weight::from_parts(202_779_138, 9458)
+			// Standard Error: 30_499
+			.saturating_add(Weight::from_parts(13_704_742, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(28))
 			.saturating_add(T::DbWeight::get().writes(15))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:1 w:0)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:6 w:6)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:4 w:3)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: CdpTreasury DebitPool (r:1 w:1)
-	// Proof: CdpTreasury DebitPool (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:0)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:2 w:2)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:1 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:0)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:6 w:6)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:4 w:3)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::DebitPool` (r:1 w:1)
+	// Proof: `CdpTreasury::DebitPool` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:0)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:2 w:2)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:1 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn liquidate_by_dex() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4362`
-		//  Estimated: `139925`
-		// Minimum execution time: 316_787 nanoseconds.
-		Weight::from_parts(325_474_000, 139925)
+		//  Measured:  `4396`
+		//  Estimated: `16722`
+		// Minimum execution time: 307_869 nanoseconds.
+		Weight::from_parts(318_025_000, 16722)
 			.saturating_add(T::DbWeight::get().reads(36))
 			.saturating_add(T::DbWeight::get().writes(16))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: CdpTreasury DebitPool (r:1 w:1)
-	// Proof: CdpTreasury DebitPool (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::DebitPool` (r:1 w:1)
+	// Proof: `CdpTreasury::DebitPool` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
 	fn settle() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2706`
-		//  Estimated: `50672`
-		// Minimum execution time: 120_847 nanoseconds.
-		Weight::from_parts(124_136_000, 50672)
+		//  Measured:  `2740`
+		//  Estimated: `6234`
+		// Minimum execution time: 117_235 nanoseconds.
+		Weight::from_parts(120_240_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(14))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
-	// Storage: CdpEngine LiquidationContracts (r:1 w:1)
-	// Proof: CdpEngine LiquidationContracts (max_values: Some(1), max_size: Some(201), added: 696, mode: MaxEncodedLen)
+	// Storage: `CdpEngine::LiquidationContracts` (r:1 w:1)
+	// Proof: `CdpEngine::LiquidationContracts` (`max_values`: Some(1), `max_size`: Some(201), added: 696, mode: `MaxEncodedLen`)
 	fn register_liquidation_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1172`
+		//  Measured:  `1173`
 		//  Estimated: `1686`
-		// Minimum execution time: 20_432 nanoseconds.
-		Weight::from_parts(20_972_000, 1686)
+		// Minimum execution time: 20_450 nanoseconds.
+		Weight::from_parts(20_817_000, 1686)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: CdpEngine LiquidationContracts (r:1 w:1)
-	// Proof: CdpEngine LiquidationContracts (max_values: Some(1), max_size: Some(201), added: 696, mode: MaxEncodedLen)
+	// Storage: `CdpEngine::LiquidationContracts` (r:1 w:1)
+	// Proof: `CdpEngine::LiquidationContracts` (`max_values`: Some(1), `max_size`: Some(201), added: 696, mode: `MaxEncodedLen`)
 	fn deregister_liquidation_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1217`
+		//  Measured:  `1218`
 		//  Estimated: `1686`
-		// Minimum execution time: 20_973 nanoseconds.
-		Weight::from_parts(21_567_000, 1686)
+		// Minimum execution time: 21_264 nanoseconds.
+		Weight::from_parts(21_714_000, 1686)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/karura/src/weights/module_cdp_treasury.rs b/runtime/karura/src/weights/module_cdp_treasury.rs
index 13e2a60e2b..71ba79b02a 100644
--- a/runtime/karura/src/weights/module_cdp_treasury.rs
+++ b/runtime/karura/src/weights/module_cdp_treasury.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_cdp_treasury
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,90 +47,90 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_cdp_treasury.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_cdp_treasury::WeightInfo for WeightInfo<T> {
-	// Storage: Tokens Accounts (r:1 w:0)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpTreasury ExpectedCollateralAuctionSize (r:1 w:0)
-	// Proof: CdpTreasury ExpectedCollateralAuctionSize (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalTargetInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalTargetInAuction (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Auction AuctionsIndex (r:1 w:1)
-	// Proof: Auction AuctionsIndex (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: AuctionManager CollateralAuctions (r:0 w:50)
-	// Proof: AuctionManager CollateralAuctions (max_values: None, max_size: Some(139), added: 2614, mode: MaxEncodedLen)
-	// Storage: Auction AuctionEndTime (r:0 w:50)
-	// Proof: Auction AuctionEndTime (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen)
-	// Storage: Auction Auctions (r:0 w:50)
-	// Proof: Auction Auctions (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
+	// Storage: `Tokens::Accounts` (r:1 w:0)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::ExpectedCollateralAuctionSize` (r:1 w:0)
+	// Proof: `CdpTreasury::ExpectedCollateralAuctionSize` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalTargetInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalTargetInAuction` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionsIndex` (r:1 w:1)
+	// Proof: `Auction::AuctionsIndex` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::CollateralAuctions` (r:0 w:50)
+	// Proof: `AuctionManager::CollateralAuctions` (`max_values`: None, `max_size`: Some(139), added: 2614, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionEndTime` (r:0 w:50)
+	// Proof: `Auction::AuctionEndTime` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
+	// Storage: `Auction::Auctions` (r:0 w:50)
+	// Proof: `Auction::Auctions` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
 	/// The range of component `b` is `[1, 50]`.
 	fn auction_collateral(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1977`
-		//  Estimated: `17259`
-		// Minimum execution time: 49_889 nanoseconds.
-		Weight::from_parts(50_764_158, 17259)
-			// Standard Error: 21_359
-			.saturating_add(Weight::from_parts(13_096_976, 0).saturating_mul(b.into()))
+		//  Measured:  `2011`
+		//  Estimated: `3612`
+		// Minimum execution time: 48_814 nanoseconds.
+		Weight::from_parts(45_714_801, 3612)
+			// Standard Error: 21_252
+			.saturating_add(Weight::from_parts(13_401_680, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(6))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
 	}
-	// Storage: Tokens Accounts (r:4 w:4)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:0)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:2)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:2 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:1 w:0)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Tokens::Accounts` (r:6 w:4)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:0)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:2)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:2 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:0)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn exchange_collateral_to_stable() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3765`
-		//  Estimated: `78741`
-		// Minimum execution time: 213_147 nanoseconds.
-		Weight::from_parts(219_880_000, 78741)
-			.saturating_add(T::DbWeight::get().reads(21))
+		//  Measured:  `3914`
+		//  Estimated: `16722`
+		// Minimum execution time: 222_608 nanoseconds.
+		Weight::from_parts(229_212_000, 16722)
+			.saturating_add(T::DbWeight::get().reads(23))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	// Storage: CdpTreasury ExpectedCollateralAuctionSize (r:0 w:1)
-	// Proof: CdpTreasury ExpectedCollateralAuctionSize (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `CdpTreasury::ExpectedCollateralAuctionSize` (r:0 w:1)
+	// Proof: `CdpTreasury::ExpectedCollateralAuctionSize` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn set_expected_collateral_auction_size() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `964`
+		//  Measured:  `965`
 		//  Estimated: `0`
-		// Minimum execution time: 17_637 nanoseconds.
-		Weight::from_parts(17_955_000, 0)
+		// Minimum execution time: 17_821 nanoseconds.
+		Weight::from_parts(18_296_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn extract_surplus_to_treasury() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1435`
-		//  Estimated: `12430`
-		// Minimum execution time: 48_660 nanoseconds.
-		Weight::from_parts(50_562_000, 12430)
+		//  Measured:  `1436`
+		//  Estimated: `6234`
+		// Minimum execution time: 47_828 nanoseconds.
+		Weight::from_parts(48_827_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
diff --git a/runtime/karura/src/weights/module_collator_selection.rs b/runtime/karura/src/weights/module_collator_selection.rs
index de119d01d8..8b5bc4a1be 100644
--- a/runtime/karura/src/weights/module_collator_selection.rs
+++ b/runtime/karura/src/weights/module_collator_selection.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_collator_selection
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,192 +47,192 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_collator_selection.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_collator_selection::WeightInfo for WeightInfo<T> {
-	// Storage: CollatorSelection Invulnerables (r:0 w:1)
-	// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::Invulnerables` (r:0 w:1)
+	// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(321), added: 816, mode: `MaxEncodedLen`)
 	/// The range of component `b` is `[1, 10]`.
 	fn set_invulnerables(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `964`
+		//  Measured:  `965`
 		//  Estimated: `0`
-		// Minimum execution time: 15_303 nanoseconds.
-		Weight::from_parts(15_795_061, 0)
-			// Standard Error: 2_465
-			.saturating_add(Weight::from_parts(89_625, 0).saturating_mul(b.into()))
+		// Minimum execution time: 14_430 nanoseconds.
+		Weight::from_parts(15_049_762, 0)
+			// Standard Error: 1_984
+			.saturating_add(Weight::from_parts(19_400, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: CollatorSelection DesiredCandidates (r:0 w:1)
-	// Proof: CollatorSelection DesiredCandidates (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::DesiredCandidates` (r:0 w:1)
+	// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_desired_candidates() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `964`
+		//  Measured:  `965`
 		//  Estimated: `0`
-		// Minimum execution time: 14_428 nanoseconds.
-		Weight::from_parts(14_721_000, 0)
+		// Minimum execution time: 14_460 nanoseconds.
+		Weight::from_parts(14_725_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: CollatorSelection CandidacyBond (r:0 w:1)
-	// Proof: CollatorSelection CandidacyBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
+	// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn set_candidacy_bond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `964`
+		//  Measured:  `965`
 		//  Estimated: `0`
-		// Minimum execution time: 14_722 nanoseconds.
-		Weight::from_parts(15_328_000, 0)
+		// Minimum execution time: 14_245 nanoseconds.
+		Weight::from_parts(14_701_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: CollatorSelection NonCandidates (r:1 w:1)
-	// Proof: CollatorSelection NonCandidates (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: CollatorSelection CandidacyBond (r:1 w:0)
-	// Proof: CollatorSelection CandidacyBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: CollatorSelection Candidates (r:1 w:1)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: CollatorSelection DesiredCandidates (r:1 w:0)
-	// Proof: CollatorSelection DesiredCandidates (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: CollatorSelection Invulnerables (r:1 w:0)
-	// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
-	// Storage: Session NextKeys (r:1 w:0)
-	// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::NonCandidates` (r:1 w:1)
+	// Proof: `CollatorSelection::NonCandidates` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0)
+	// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:1)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0)
+	// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
+	// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(321), added: 816, mode: `MaxEncodedLen`)
+	// Storage: `Session::NextKeys` (r:1 w:0)
+	// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[5, 50]`.
 	fn register_as_candidate(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2259 + c * (60 ±0)`
-		//  Estimated: `20694 + c * (61 ±0)`
-		// Minimum execution time: 59_058 nanoseconds.
-		Weight::from_parts(60_032_190, 20694)
-			// Standard Error: 3_946
-			.saturating_add(Weight::from_parts(489_480, 0).saturating_mul(c.into()))
+		//  Measured:  `2260 + c * (60 ±0)`
+		//  Estimated: `5671 + c * (61 ±0)`
+		// Minimum execution time: 61_492 nanoseconds.
+		Weight::from_parts(61_463_245, 5671)
+			// Standard Error: 3_510
+			.saturating_add(Weight::from_parts(501_606, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 61).saturating_mul(c.into()))
 	}
-	// Storage: CollatorSelection Candidates (r:1 w:1)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: CollatorSelection DesiredCandidates (r:1 w:0)
-	// Proof: CollatorSelection DesiredCandidates (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: CollatorSelection Invulnerables (r:1 w:0)
-	// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
-	// Storage: Session NextKeys (r:1 w:0)
-	// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:0)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:1)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0)
+	// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
+	// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(321), added: 816, mode: `MaxEncodedLen`)
+	// Storage: `Session::NextKeys` (r:1 w:0)
+	// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:0)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 50]`.
 	fn register_candidate(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1772 + c * (55 ±0)`
-		//  Estimated: `15243 + c * (55 ±0)`
-		// Minimum execution time: 35_859 nanoseconds.
-		Weight::from_parts(40_953_095, 15243)
-			// Standard Error: 3_691
-			.saturating_add(Weight::from_parts(452_267, 0).saturating_mul(c.into()))
+		//  Measured:  `1773 + c * (55 ±0)`
+		//  Estimated: `5230 + c * (55 ±0)`
+		// Minimum execution time: 34_687 nanoseconds.
+		Weight::from_parts(39_626_307, 5230)
+			// Standard Error: 3_650
+			.saturating_add(Weight::from_parts(457_457, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(Weight::from_parts(0, 55).saturating_mul(c.into()))
 	}
-	// Storage: CollatorSelection Candidates (r:1 w:1)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: Session CurrentIndex (r:1 w:0)
-	// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: CollatorSelection NonCandidates (r:0 w:1)
-	// Proof: CollatorSelection NonCandidates (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:1)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `Session::CurrentIndex` (r:1 w:0)
+	// Proof: `Session::CurrentIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `CollatorSelection::NonCandidates` (r:0 w:1)
+	// Proof: `CollatorSelection::NonCandidates` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[6, 50]`.
 	fn leave_intent(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1562 + c * (39 ±0)`
-		//  Estimated: `6129 + c * (39 ±0)`
-		// Minimum execution time: 28_618 nanoseconds.
-		Weight::from_parts(28_775_577, 6129)
-			// Standard Error: 2_729
-			.saturating_add(Weight::from_parts(343_967, 0).saturating_mul(c.into()))
+		//  Measured:  `1563 + c * (39 ±0)`
+		//  Estimated: `3086 + c * (39 ±0)`
+		// Minimum execution time: 27_920 nanoseconds.
+		Weight::from_parts(27_053_534, 3086)
+			// Standard Error: 3_749
+			.saturating_add(Weight::from_parts(374_736, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(Weight::from_parts(0, 39).saturating_mul(c.into()))
 	}
-	// Storage: CollatorSelection NonCandidates (r:1 w:1)
-	// Proof: CollatorSelection NonCandidates (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: Session CurrentIndex (r:1 w:0)
-	// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::NonCandidates` (r:1 w:1)
+	// Proof: `CollatorSelection::NonCandidates` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: `Session::CurrentIndex` (r:1 w:0)
+	// Proof: `Session::CurrentIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	fn withdraw_bond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3125`
-		//  Estimated: `11752`
-		// Minimum execution time: 58_600 nanoseconds.
-		Weight::from_parts(61_052_000, 11752)
+		//  Measured:  `3128`
+		//  Estimated: `4613`
+		// Minimum execution time: 62_024 nanoseconds.
+		Weight::from_parts(63_901_000, 4613)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: CollatorSelection SessionPoints (r:1 w:0)
-	// Proof: CollatorSelection SessionPoints (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::SessionPoints` (r:1 w:0)
+	// Proof: `CollatorSelection::SessionPoints` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	fn note_author() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1889`
-		//  Estimated: `9705`
-		// Minimum execution time: 43_758 nanoseconds.
-		Weight::from_parts(45_031_000, 9705)
+		//  Measured:  `2073`
+		//  Estimated: `6196`
+		// Minimum execution time: 64_645 nanoseconds.
+		Weight::from_parts(67_067_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: CollatorSelection Candidates (r:1 w:0)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: CollatorSelection Invulnerables (r:1 w:0)
-	// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:0)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
+	// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(321), added: 816, mode: `MaxEncodedLen`)
 	fn new_session() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2654`
-		//  Estimated: `4892`
-		// Minimum execution time: 25_614 nanoseconds.
-		Weight::from_parts(27_384_000, 4892)
+		//  Measured:  `2655`
+		//  Estimated: `3086`
+		// Minimum execution time: 25_540 nanoseconds.
+		Weight::from_parts(26_941_000, 3086)
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
-	// Storage: Session Validators (r:1 w:0)
-	// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: CollatorSelection Candidates (r:1 w:0)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: CollatorSelection SessionPoints (r:0 w:50)
-	// Proof: CollatorSelection SessionPoints (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
+	// Storage: `Session::Validators` (r:1 w:0)
+	// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:0)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::SessionPoints` (r:0 w:50)
+	// Proof: `CollatorSelection::SessionPoints` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[5, 50]`.
 	/// The range of component `c` is `[5, 50]`.
 	fn start_session(r: u32, c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1342 + c * (64 ±0)`
-		//  Estimated: `5913 + c * (64 ±0)`
-		// Minimum execution time: 21_840 nanoseconds.
-		Weight::from_parts(17_131_556, 5913)
-			// Standard Error: 1_876
-			.saturating_add(Weight::from_parts(4_697, 0).saturating_mul(r.into()))
-			// Standard Error: 1_876
-			.saturating_add(Weight::from_parts(1_261_963, 0).saturating_mul(c.into()))
+		//  Measured:  `1346 + c * (64 ±0)`
+		//  Estimated: `3086 + c * (64 ±0)`
+		// Minimum execution time: 21_713 nanoseconds.
+		Weight::from_parts(16_438_403, 3086)
+			// Standard Error: 2_755
+			.saturating_add(Weight::from_parts(5_153, 0).saturating_mul(r.into()))
+			// Standard Error: 2_755
+			.saturating_add(Weight::from_parts(1_274_110, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
 			.saturating_add(Weight::from_parts(0, 64).saturating_mul(c.into()))
 	}
-	// Storage: CollatorSelection SessionPoints (r:51 w:50)
-	// Proof: CollatorSelection SessionPoints (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: CollatorSelection Candidates (r:1 w:1)
-	// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: Session CurrentIndex (r:1 w:0)
-	// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: CollatorSelection NonCandidates (r:0 w:1)
-	// Proof: CollatorSelection NonCandidates (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
+	// Storage: `CollatorSelection::SessionPoints` (r:51 w:50)
+	// Proof: `CollatorSelection::SessionPoints` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: `CollatorSelection::Candidates` (r:1 w:1)
+	// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `Session::CurrentIndex` (r:1 w:0)
+	// Proof: `Session::CurrentIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `CollatorSelection::NonCandidates` (r:0 w:1)
+	// Proof: `CollatorSelection::NonCandidates` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[5, 50]`.
 	/// The range of component `c` is `[5, 50]`.
 	fn end_session(_r: u32, c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3392 + c * (49 ±0)`
-		//  Estimated: `3513 + c * (2728 ±0)`
-		// Minimum execution time: 33_920 nanoseconds.
-		Weight::from_parts(498_374_280, 3513)
-			// Standard Error: 17_637
-			.saturating_add(Weight::from_parts(3_785_477, 0).saturating_mul(c.into()))
+		//  Measured:  `3393 + c * (49 ±0)`
+		//  Estimated: `3509 + c * (2519 ±0)`
+		// Minimum execution time: 32_576 nanoseconds.
+		Weight::from_parts(464_854_600, 3509)
+			// Standard Error: 18_351
+			.saturating_add(Weight::from_parts(3_854_027, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(48))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2728).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
 	}
 }
diff --git a/runtime/karura/src/weights/module_currencies.rs b/runtime/karura/src/weights/module_currencies.rs
index 630a86e499..1f8a0dcb7f 100644
--- a/runtime/karura/src/weights/module_currencies.rs
+++ b/runtime/karura/src/weights/module_currencies.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_currencies
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,119 +47,119 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_currencies.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_currencies::WeightInfo for WeightInfo<T> {
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_non_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1544`
-		//  Estimated: `13352`
-		// Minimum execution time: 56_667 nanoseconds.
-		Weight::from_parts(58_502_000, 13352)
+		//  Measured:  `1545`
+		//  Estimated: `6234`
+		// Minimum execution time: 55_032 nanoseconds.
+		Weight::from_parts(56_048_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn transfer_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1334`
-		//  Estimated: `7118`
-		// Minimum execution time: 44_553 nanoseconds.
-		Weight::from_parts(45_426_000, 7118)
+		//  Measured:  `1379`
+		//  Estimated: `3593`
+		// Minimum execution time: 64_625 nanoseconds.
+		Weight::from_parts(65_710_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, 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::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_balance_non_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1127`
-		//  Estimated: `10737`
-		// Minimum execution time: 33_418 nanoseconds.
-		Weight::from_parts(34_283_000, 10737)
+		//  Measured:  `1128`
+		//  Estimated: `3612`
+		// Minimum execution time: 32_606 nanoseconds.
+		Weight::from_parts(33_231_000, 3612)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_balance_native_currency_creating() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1234`
+		//  Measured:  `1235`
 		//  Estimated: `3593`
-		// Minimum execution time: 33_558 nanoseconds.
-		Weight::from_parts(34_242_000, 3593)
+		// Minimum execution time: 35_416 nanoseconds.
+		Weight::from_parts(36_451_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn update_balance_native_currency_killing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1374`
-		//  Estimated: `7118`
-		// Minimum execution time: 34_095 nanoseconds.
-		Weight::from_parts(34_542_000, 7118)
+		//  Measured:  `1375`
+		//  Estimated: `3593`
+		// Minimum execution time: 37_867 nanoseconds.
+		Weight::from_parts(38_643_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Tokens Accounts (r:4 w:4)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:3 w:3)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Tokens::Accounts` (r:4 w:4)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:3 w:3)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 3]`.
 	fn sweep_dust(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1452 + c * (79 ±0)`
-		//  Estimated: `4602 + c * (5225 ±0)`
-		// Minimum execution time: 42_662 nanoseconds.
-		Weight::from_parts(22_751_438, 4602)
-			// Standard Error: 33_335
-			.saturating_add(Weight::from_parts(21_704_035, 0).saturating_mul(c.into()))
+		//  Measured:  `1453 + c * (79 ±0)`
+		//  Estimated: `3612 + c * (2622 ±0)`
+		// Minimum execution time: 41_949 nanoseconds.
+		Weight::from_parts(21_822_290, 3612)
+			// Standard Error: 21_551
+			.saturating_add(Weight::from_parts(21_629_188, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 5225).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(0, 2622).saturating_mul(c.into()))
 	}
-	// Storage: Tokens Locks (r:1 w:1)
-	// Proof: Tokens Locks (max_values: None, max_size: Some(1300), added: 3775, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, 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::Locks` (r:1 w:1)
+	// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1300), added: 3775, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn force_set_lock() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1431`
-		//  Estimated: `11970`
-		// Minimum execution time: 37_247 nanoseconds.
-		Weight::from_parts(37_847_000, 11970)
+		//  Measured:  `1432`
+		//  Estimated: `4765`
+		// Minimum execution time: 35_480 nanoseconds.
+		Weight::from_parts(36_469_000, 4765)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Tokens Locks (r:1 w:1)
-	// Proof: Tokens Locks (max_values: None, max_size: Some(1300), added: 3775, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, 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::Locks` (r:1 w:1)
+	// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1300), added: 3775, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn force_remove_lock() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1536`
-		//  Estimated: `11970`
-		// Minimum execution time: 38_133 nanoseconds.
-		Weight::from_parts(39_089_000, 11970)
+		//  Measured:  `1537`
+		//  Estimated: `4765`
+		// Minimum execution time: 36_636 nanoseconds.
+		Weight::from_parts(37_322_000, 4765)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
diff --git a/runtime/karura/src/weights/module_dex.rs b/runtime/karura/src/weights/module_dex.rs
index 8f829e9673..69b85c52af 100644
--- a/runtime/karura/src/weights/module_dex.rs
+++ b/runtime/karura/src/weights/module_dex.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_dex
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,272 +47,272 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_dex.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_dex::WeightInfo for WeightInfo<T> {
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
 	fn enable_trading_pair() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1073`
+		//  Measured:  `1074`
 		//  Estimated: `3660`
-		// Minimum execution time: 20_510 nanoseconds.
-		Weight::from_parts(21_055_000, 3660)
+		// Minimum execution time: 20_846 nanoseconds.
+		Weight::from_parts(21_138_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
 	fn disable_trading_pair() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1110`
+		//  Measured:  `1111`
 		//  Estimated: `3660`
-		// Minimum execution time: 21_802 nanoseconds.
-		Weight::from_parts(22_204_000, 3660)
+		// Minimum execution time: 22_182 nanoseconds.
+		Weight::from_parts(22_591_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:0)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex ProvisioningPool (r:1 w:0)
-	// Proof: Dex ProvisioningPool (max_values: None, max_size: Some(166), added: 2641, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:0)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::ProvisioningPool` (r:1 w:0)
+	// Proof: `Dex::ProvisioningPool` (`max_values`: None, `max_size`: Some(166), added: 2641, mode: `MaxEncodedLen`)
 	fn list_provisioning() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1115`
-		//  Estimated: `10823`
-		// Minimum execution time: 28_447 nanoseconds.
-		Weight::from_parts(28_930_000, 10823)
+		//  Measured:  `1116`
+		//  Estimated: `3660`
+		// Minimum execution time: 27_666 nanoseconds.
+		Weight::from_parts(28_282_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
 	fn update_provisioning_parameters() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `915`
 		//  Estimated: `3660`
-		// Minimum execution time: 13_612 nanoseconds.
-		Weight::from_parts(13_877_000, 3660)
+		// Minimum execution time: 13_033 nanoseconds.
+		Weight::from_parts(13_240_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:1 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Dex InitialShareExchangeRates (r:0 w:1)
-	// Proof: Dex InitialShareExchangeRates (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:1 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Dex::InitialShareExchangeRates` (r:0 w:1)
+	// Proof: `Dex::InitialShareExchangeRates` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
 	fn end_provisioning() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1707`
-		//  Estimated: `17988`
-		// Minimum execution time: 55_638 nanoseconds.
-		Weight::from_parts(56_733_000, 17988)
+		//  Measured:  `1708`
+		//  Estimated: `3660`
+		// Minimum execution time: 53_093 nanoseconds.
+		Weight::from_parts(54_174_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex ProvisioningPool (r:1 w:1)
-	// Proof: Dex ProvisioningPool (max_values: None, max_size: Some(166), added: 2641, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::ProvisioningPool` (r:1 w:1)
+	// Proof: `Dex::ProvisioningPool` (`max_values`: None, `max_size`: Some(166), added: 2641, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
 	fn add_provision() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1684`
-		//  Estimated: `17118`
-		// Minimum execution time: 89_180 nanoseconds.
-		Weight::from_parts(91_072_000, 17118)
+		//  Measured:  `1834`
+		//  Estimated: `6234`
+		// Minimum execution time: 104_228 nanoseconds.
+		Weight::from_parts(106_997_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex ProvisioningPool (r:2 w:1)
-	// Proof: Dex ProvisioningPool (max_values: None, max_size: Some(166), added: 2641, mode: MaxEncodedLen)
-	// Storage: Dex InitialShareExchangeRates (r:1 w:1)
-	// Proof: Dex InitialShareExchangeRates (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::ProvisioningPool` (r:2 w:1)
+	// Proof: `Dex::ProvisioningPool` (`max_values`: None, `max_size`: Some(166), added: 2641, mode: `MaxEncodedLen`)
+	// Storage: `Dex::InitialShareExchangeRates` (r:1 w:1)
+	// Proof: `Dex::InitialShareExchangeRates` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_dex_share() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2061`
-		//  Estimated: `23350`
-		// Minimum execution time: 75_676 nanoseconds.
-		Weight::from_parts(77_447_000, 23350)
+		//  Measured:  `2062`
+		//  Estimated: `6272`
+		// Minimum execution time: 73_516 nanoseconds.
+		Weight::from_parts(74_619_000, 6272)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:1 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, 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 Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:1 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, 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::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2122`
-		//  Estimated: `26757`
-		// Minimum execution time: 107_269 nanoseconds.
-		Weight::from_parts(109_461_000, 26757)
+		//  Measured:  `2167`
+		//  Estimated: `8856`
+		// Minimum execution time: 125_124 nanoseconds.
+		Weight::from_parts(128_179_000, 8856)
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:1 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, 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 Accounts (r:4 w:4)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:1 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, 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::Accounts` (r:4 w:4)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn add_liquidity_and_stake() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2529`
-		//  Estimated: `41367`
-		// Minimum execution time: 148_161 nanoseconds.
-		Weight::from_parts(152_834_000, 41367)
+		//  Measured:  `2574`
+		//  Estimated: `11478`
+		// Minimum execution time: 165_217 nanoseconds.
+		Weight::from_parts(168_688_000, 11478)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: Dex LiquidityPool (r:1 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Dex::LiquidityPool` (r:1 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn remove_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1951`
-		//  Estimated: `19572`
-		// Minimum execution time: 100_980 nanoseconds.
-		Weight::from_parts(103_835_000, 19572)
+		//  Measured:  `2101`
+		//  Estimated: `8856`
+		// Minimum execution time: 114_526 nanoseconds.
+		Weight::from_parts(117_461_000, 8856)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: Dex LiquidityPool (r:1 w:1)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:4 w:4)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Dex::LiquidityPool` (r:1 w:1)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:4 w:4)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn remove_liquidity_by_unstake() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2469`
-		//  Estimated: `40190`
-		// Minimum execution time: 162_035 nanoseconds.
-		Weight::from_parts(167_918_000, 40190)
+		//  Measured:  `2514`
+		//  Estimated: `11478`
+		// Minimum execution time: 178_639 nanoseconds.
+		Weight::from_parts(181_511_000, 11478)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:3)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:3)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
 	/// The range of component `u` is `[2, 4]`.
 	fn swap_with_exact_supply(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1627 + u * (112 ±0)`
-		//  Estimated: `17078 + u * (1270 ±19)`
-		// Minimum execution time: 83_249 nanoseconds.
-		Weight::from_parts(61_442_135, 17078)
-			// Standard Error: 67_384
-			.saturating_add(Weight::from_parts(12_334_959, 0).saturating_mul(u.into()))
+		//  Measured:  `1777 + u * (112 ±0)`
+		//  Estimated: `6234 + u * (643 ±19)`
+		// Minimum execution time: 100_281 nanoseconds.
+		Weight::from_parts(79_016_585, 6234)
+			// Standard Error: 58_860
+			.saturating_add(Weight::from_parts(12_009_418, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 1270).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 643).saturating_mul(u.into()))
 	}
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:3)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:3)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
 	/// The range of component `u` is `[2, 4]`.
 	fn swap_with_exact_target(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1627 + u * (112 ±0)`
-		//  Estimated: `17078 + u * (1270 ±19)`
-		// Minimum execution time: 83_130 nanoseconds.
-		Weight::from_parts(61_374_746, 17078)
-			// Standard Error: 69_884
-			.saturating_add(Weight::from_parts(12_274_223, 0).saturating_mul(u.into()))
+		//  Measured:  `1777 + u * (112 ±0)`
+		//  Estimated: `6234 + u * (643 ±19)`
+		// Minimum execution time: 99_874 nanoseconds.
+		Weight::from_parts(78_061_230, 6234)
+			// Standard Error: 52_083
+			.saturating_add(Weight::from_parts(12_319_159, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 1270).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 643).saturating_mul(u.into()))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex InitialShareExchangeRates (r:1 w:0)
-	// Proof: Dex InitialShareExchangeRates (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Dex ProvisioningPool (r:1 w:1)
-	// Proof: Dex ProvisioningPool (max_values: None, max_size: Some(166), added: 2641, 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 Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::InitialShareExchangeRates` (r:1 w:0)
+	// Proof: `Dex::InitialShareExchangeRates` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Dex::ProvisioningPool` (r:1 w:1)
+	// Proof: `Dex::ProvisioningPool` (`max_values`: None, `max_size`: Some(166), added: 2641, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn refund_provision() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2123`
-		//  Estimated: `24234`
-		// Minimum execution time: 90_659 nanoseconds.
-		Weight::from_parts(93_149_000, 24234)
+		//  Measured:  `2168`
+		//  Estimated: `6234`
+		// Minimum execution time: 111_685 nanoseconds.
+		Weight::from_parts(113_843_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: Dex TradingPairStatuses (r:1 w:1)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
+	// Storage: `Dex::TradingPairStatuses` (r:1 w:1)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
 	fn abort_provisioning() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1247`
+		//  Measured:  `1248`
 		//  Estimated: `3660`
-		// Minimum execution time: 26_177 nanoseconds.
-		Weight::from_parts(26_999_000, 3660)
+		// Minimum execution time: 25_834 nanoseconds.
+		Weight::from_parts(26_635_000, 3660)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/karura/src/weights/module_dex_oracle.rs b/runtime/karura/src/weights/module_dex_oracle.rs
index 3eee5cf87a..1edab1e475 100644
--- a/runtime/karura/src/weights/module_dex_oracle.rs
+++ b/runtime/karura/src/weights/module_dex_oracle.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_dex_oracle
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,87 +47,89 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_dex_oracle.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_dex_oracle::WeightInfo for WeightInfo<T> {
-	// Storage: Aura CurrentSlot (r:1 w:1)
-	// Proof: Aura CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	// Storage: Aura Authorities (r:1 w:0)
-	// Proof: Aura Authorities (max_values: Some(1), max_size: Some(1025), added: 1520, mode: MaxEncodedLen)
-	// Storage: DexOracle AveragePrices (r:4 w:3)
-	// Proof Skipped: DexOracle AveragePrices (max_values: None, max_size: None, mode: Measured)
-	// Storage: Dex LiquidityPool (r:3 w:0)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: DexOracle Cumulatives (r:3 w:3)
-	// Proof Skipped: DexOracle Cumulatives (max_values: None, max_size: None, mode: Measured)
-	// Storage: System ParentHash (r:0 w:1)
-	// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	// Storage: System Digest (r:0 w:1)
-	// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: System BlockHash (r:0 w:1)
-	// Proof: System BlockHash (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: unknown `0x3a65787472696e7369635f696e646578` (r:0 w:1)
-	// Proof Skipped: unknown `0x3a65787472696e7369635f696e646578` (r:0 w:1)
-	// 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: `Aura::CurrentSlot` (r:1 w:1)
+	// Proof: `Aura::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	// Storage: `Aura::Authorities` (r:1 w:0)
+	// Proof: `Aura::Authorities` (`max_values`: Some(1), `max_size`: Some(1025), added: 1520, mode: `MaxEncodedLen`)
+	// Storage: `DexOracle::AveragePrices` (r:4 w:3)
+	// Proof: `DexOracle::AveragePrices` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:0)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `DexOracle::Cumulatives` (r:3 w:3)
+	// Proof: `DexOracle::Cumulatives` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `System::ParentHash` (r:0 w:1)
+	// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	// Storage: `System::Digest` (r:0 w:1)
+	// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::BlockHash` (r:0 w:1)
+	// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: UNKNOWN KEY `0x3a65787472696e7369635f696e646578` (r:0 w:1)
+	// Proof: UNKNOWN KEY `0x3a65787472696e7369635f696e646578` (r:0 w:1)
+	// Storage: UNKNOWN KEY `0x3a696e747261626c6f636b5f656e74726f7079` (r:0 w:1)
+	// Proof: UNKNOWN KEY `0x3a696e747261626c6f636b5f656e74726f7079` (r:0 w:1)
+	// 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`)
 	/// The range of component `n` is `[0, 3]`.
 	/// The range of component `u` is `[0, 3]`.
 	fn on_initialize_with_update_average_prices(n: u32, u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `279 + n * (377 ±0) + u * (249 ±0)`
-		//  Estimated: `17190 + n * (4487 ±33) + u * (1301 ±33)`
-		// Minimum execution time: 18_657 nanoseconds.
-		Weight::from_parts(19_291_000, 17190)
-			// Standard Error: 155_470
-			.saturating_add(Weight::from_parts(10_689_056, 0).saturating_mul(n.into()))
-			// Standard Error: 155_470
-			.saturating_add(Weight::from_parts(4_901_719, 0).saturating_mul(u.into()))
+		//  Estimated: `4961 + n * (2864 ±2) + u * (346 ±2)`
+		// Minimum execution time: 19_013 nanoseconds.
+		Weight::from_parts(19_636_000, 4961)
+			// Standard Error: 151_722
+			.saturating_add(Weight::from_parts(10_483_057, 0).saturating_mul(n.into()))
+			// Standard Error: 151_722
+			.saturating_add(Weight::from_parts(4_774_128, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
+			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 4487).saturating_mul(n.into()))
-			.saturating_add(Weight::from_parts(0, 1301).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 2864).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(0, 346).saturating_mul(u.into()))
 	}
-	// Storage: DexOracle AveragePrices (r:1 w:1)
-	// Proof Skipped: DexOracle AveragePrices (max_values: None, max_size: None, mode: Measured)
-	// Storage: Dex LiquidityPool (r:1 w:0)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: Timestamp Now (r:1 w:0)
-	// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	// Storage: DexOracle Cumulatives (r:0 w:1)
-	// Proof Skipped: DexOracle Cumulatives (max_values: None, max_size: None, mode: Measured)
+	// Storage: `DexOracle::AveragePrices` (r:1 w:1)
+	// Proof: `DexOracle::AveragePrices` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Dex::LiquidityPool` (r:1 w:0)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `Timestamp::Now` (r:1 w:0)
+	// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	// Storage: `DexOracle::Cumulatives` (r:0 w:1)
+	// Proof: `DexOracle::Cumulatives` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn enable_average_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `922`
-		//  Estimated: `10393`
-		// Minimum execution time: 21_767 nanoseconds.
-		Weight::from_parts(22_410_000, 10393)
+		//  Estimated: `4387`
+		// Minimum execution time: 21_861 nanoseconds.
+		Weight::from_parts(22_330_000, 4387)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: DexOracle AveragePrices (r:1 w:1)
-	// Proof Skipped: DexOracle AveragePrices (max_values: None, max_size: None, mode: Measured)
-	// Storage: DexOracle Cumulatives (r:0 w:1)
-	// Proof Skipped: DexOracle Cumulatives (max_values: None, max_size: None, mode: Measured)
+	// Storage: `DexOracle::AveragePrices` (r:1 w:1)
+	// Proof: `DexOracle::AveragePrices` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `DexOracle::Cumulatives` (r:0 w:1)
+	// Proof: `DexOracle::Cumulatives` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn disable_average_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `893`
-		//  Estimated: `5251`
-		// Minimum execution time: 13_920 nanoseconds.
-		Weight::from_parts(14_478_000, 5251)
+		//  Estimated: `4358`
+		// Minimum execution time: 14_004 nanoseconds.
+		Weight::from_parts(14_349_000, 4358)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: DexOracle AveragePrices (r:1 w:1)
-	// Proof Skipped: DexOracle AveragePrices (max_values: None, max_size: None, mode: Measured)
+	// Storage: `DexOracle::AveragePrices` (r:1 w:1)
+	// Proof: `DexOracle::AveragePrices` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_average_price_interval() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `893`
 		//  Estimated: `4358`
-		// Minimum execution time: 13_212 nanoseconds.
-		Weight::from_parts(13_953_000, 4358)
+		// Minimum execution time: 13_533 nanoseconds.
+		Weight::from_parts(13_826_000, 4358)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/karura/src/weights/module_emergency_shutdown.rs b/runtime/karura/src/weights/module_emergency_shutdown.rs
index 2ca44f4426..7ecc7a5b1f 100644
--- a/runtime/karura/src/weights/module_emergency_shutdown.rs
+++ b/runtime/karura/src/weights/module_emergency_shutdown.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_emergency_shutdown
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,56 +47,56 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_emergency_shutdown.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_emergency_shutdown::WeightInfo for WeightInfo<T> {
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:1)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:1)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 4]`.
 	fn emergency_shutdown(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1285`
-		//  Estimated: `5086`
-		// Minimum execution time: 23_633 nanoseconds.
-		Weight::from_parts(24_727_445, 5086)
-			// Standard Error: 13_709
-			.saturating_add(Weight::from_parts(527_434, 0).saturating_mul(c.into()))
+		//  Measured:  `1286`
+		//  Estimated: `3600`
+		// Minimum execution time: 23_670 nanoseconds.
+		Weight::from_parts(24_514_871, 3600)
+			// Standard Error: 8_890
+			.saturating_add(Weight::from_parts(479_084, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: EmergencyShutdown CanRefund (r:0 w:1)
-	// Proof: EmergencyShutdown CanRefund (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `EmergencyShutdown::CanRefund` (r:0 w:1)
+	// Proof: `EmergencyShutdown::CanRefund` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn open_collateral_refund() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1309`
-		//  Estimated: `5086`
-		// Minimum execution time: 23_524 nanoseconds.
-		Weight::from_parts(24_002_000, 5086)
+		//  Measured:  `1310`
+		//  Estimated: `3600`
+		// Minimum execution time: 23_593 nanoseconds.
+		Weight::from_parts(24_006_000, 3600)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EmergencyShutdown CanRefund (r:1 w:0)
-	// Proof: EmergencyShutdown CanRefund (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::CanRefund` (r:1 w:0)
+	// Proof: `EmergencyShutdown::CanRefund` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 4]`.
 	fn refund_collaterals(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2025 + c * (33 ±0)`
-		//  Estimated: `15755`
-		// Minimum execution time: 58_215 nanoseconds.
-		Weight::from_parts(60_963_071, 15755)
-			// Standard Error: 35_933
-			.saturating_add(Weight::from_parts(1_992_941, 0).saturating_mul(c.into()))
+		//  Measured:  `2026 + c * (33 ±0)`
+		//  Estimated: `3612`
+		// Minimum execution time: 57_044 nanoseconds.
+		Weight::from_parts(59_648_485, 3612)
+			// Standard Error: 27_796
+			.saturating_add(Weight::from_parts(1_862_035, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/runtime/karura/src/weights/module_evm.rs b/runtime/karura/src/weights/module_evm.rs
index b04a557b64..797a00dc61 100644
--- a/runtime/karura/src/weights/module_evm.rs
+++ b/runtime/karura/src/weights/module_evm.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_evm
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,242 +47,242 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_evm.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_evm::WeightInfo for WeightInfo<T> {
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:2 w:2)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM CodeInfos (r:2 w:1)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:1)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:2 w:2)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::CodeInfos` (r:2 w:1)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:1)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn create() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1592`
-		//  Estimated: `43770`
-		// Minimum execution time: 147_972 nanoseconds.
-		Weight::from_parts(151_209_000, 43770)
+		//  Measured:  `1593`
+		//  Estimated: `7533`
+		// Minimum execution time: 138_247 nanoseconds.
+		Weight::from_parts(141_725_000, 7533)
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:2 w:2)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM CodeInfos (r:2 w:1)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:1)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:2 w:2)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::CodeInfos` (r:2 w:1)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:1)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn create2() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1592`
-		//  Estimated: `43770`
-		// Minimum execution time: 143_804 nanoseconds.
-		Weight::from_parts(148_298_000, 43770)
+		//  Measured:  `1593`
+		//  Estimated: `7533`
+		// Minimum execution time: 133_670 nanoseconds.
+		Weight::from_parts(136_736_000, 7533)
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM NetworkContractIndex (r:1 w:1)
-	// Proof Skipped: EVM NetworkContractIndex (max_values: Some(1), 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: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:2 w:2)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM CodeInfos (r:2 w:1)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:1)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::NetworkContractIndex` (r:1 w:1)
+	// Proof: `EVM::NetworkContractIndex` (`max_values`: Some(1), `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: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:2 w:2)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::CodeInfos` (r:2 w:1)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:1)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn create_nft_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1559`
-		//  Estimated: `43157`
-		// Minimum execution time: 162_129 nanoseconds.
-		Weight::from_parts(166_584_000, 43157)
+		//  Measured:  `1562`
+		//  Estimated: `7502`
+		// Minimum execution time: 170_247 nanoseconds.
+		Weight::from_parts(174_624_000, 7502)
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(10))
 	}
-	// Storage: EVM Accounts (r:2 w:2)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: EVM CodeInfos (r:2 w:1)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:1)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EVM::Accounts` (r:2 w:2)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `EVM::CodeInfos` (r:2 w:1)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:1)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn create_predeploy_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1507`
-		//  Estimated: `39905`
-		// Minimum execution time: 165_295 nanoseconds.
-		Weight::from_parts(168_193_000, 39905)
+		//  Measured:  `1510`
+		//  Estimated: `7450`
+		// Minimum execution time: 171_797 nanoseconds.
+		Weight::from_parts(175_152_000, 7450)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:2 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: EVM Codes (r:1 w:0)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:2 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Codes` (r:1 w:0)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2366`
-		//  Estimated: `42025`
-		// Minimum execution time: 135_757 nanoseconds.
-		Weight::from_parts(140_285_000, 42025)
+		//  Measured:  `2367`
+		//  Estimated: `8307`
+		// Minimum execution time: 129_293 nanoseconds.
+		Weight::from_parts(131_697_000, 8307)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: EVM Accounts (r:1 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `EVM::Accounts` (r:1 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn transfer_maintainer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1931`
-		//  Estimated: `8921`
-		// Minimum execution time: 100_309 nanoseconds.
-		Weight::from_parts(102_340_000, 8921)
+		//  Measured:  `1777`
+		//  Estimated: `5242`
+		// Minimum execution time: 92_836 nanoseconds.
+		Weight::from_parts(93_748_000, 5242)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:1 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:1 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn publish_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2324`
-		//  Estimated: `9314`
-		// Minimum execution time: 121_742 nanoseconds.
-		Weight::from_parts(123_151_000, 9314)
+		//  Measured:  `2248`
+		//  Estimated: `5713`
+		// Minimum execution time: 130_605 nanoseconds.
+		Weight::from_parts(132_384_000, 5713)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EVM Accounts (r:1 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EVM::Accounts` (r:1 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn publish_free() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1822`
-		//  Estimated: `5287`
-		// Minimum execution time: 28_491 nanoseconds.
-		Weight::from_parts(29_226_000, 5287)
+		//  Measured:  `1668`
+		//  Estimated: `5133`
+		// Minimum execution time: 28_397 nanoseconds.
+		Weight::from_parts(28_995_000, 5133)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	fn enable_contract_development() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1368`
+		//  Measured:  `1369`
 		//  Estimated: `3633`
-		// Minimum execution time: 103_549 nanoseconds.
-		Weight::from_parts(104_601_000, 3633)
+		// Minimum execution time: 98_860 nanoseconds.
+		Weight::from_parts(99_913_000, 3633)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	fn disable_contract_development() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1456`
+		//  Measured:  `1457`
 		//  Estimated: `3633`
-		// Minimum execution time: 104_967 nanoseconds.
-		Weight::from_parts(105_985_000, 3633)
+		// Minimum execution time: 101_036 nanoseconds.
+		Weight::from_parts(101_816_000, 3633)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: EVM Accounts (r:1 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM CodeInfos (r:2 w:2)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:2)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EVM::Accounts` (r:1 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::CodeInfos` (r:2 w:2)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:2)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 61440]`.
 	fn set_code(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2537`
-		//  Estimated: `42472`
-		// Minimum execution time: 173_384 nanoseconds.
-		Weight::from_parts(171_958_738, 42472)
+		//  Measured:  `2383`
+		//  Estimated: `8323`
+		// Minimum execution time: 158_778 nanoseconds.
+		Weight::from_parts(154_909_724, 8323)
 			// Standard Error: 13
-			.saturating_add(Weight::from_parts(5_611, 0).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(5_527, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: EvmAccounts EvmAddresses (r:2 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM Accounts (r:1 w:1)
-	// Proof Skipped: EVM Accounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: EvmAccounts Accounts (r:2 w:0)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM CodeInfos (r:1 w:1)
-	// Proof Skipped: EVM CodeInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM ContractStorageSizes (r:1 w:1)
-	// Proof Skipped: EVM ContractStorageSizes (max_values: None, max_size: None, mode: Measured)
-	// Storage: IdleScheduler NextTaskId (r:1 w:1)
-	// Proof Skipped: IdleScheduler NextTaskId (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, 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 Accounts (r:1 w:0)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: IdleScheduler Tasks (r:0 w:1)
-	// Proof Skipped: IdleScheduler Tasks (max_values: None, max_size: None, mode: Measured)
-	// Storage: EVM Codes (r:0 w:1)
-	// Proof Skipped: EVM Codes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EvmAccounts::EvmAddresses` (r:2 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::Accounts` (r:1 w:1)
+	// Proof: `EVM::Accounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EvmAccounts::Accounts` (r:2 w:0)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::CodeInfos` (r:1 w:1)
+	// Proof: `EVM::CodeInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::ContractStorageSizes` (r:1 w:1)
+	// Proof: `EVM::ContractStorageSizes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `IdleScheduler::NextTaskId` (r:1 w:1)
+	// Proof: `IdleScheduler::NextTaskId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, 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::Accounts` (r:1 w:0)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `IdleScheduler::Tasks` (r:0 w:1)
+	// Proof: `IdleScheduler::Tasks` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::Codes` (r:0 w:1)
+	// Proof: `EVM::Codes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn selfdestruct() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2730`
-		//  Estimated: `51218`
-		// Minimum execution time: 187_795 nanoseconds.
-		Weight::from_parts(191_379_000, 51218)
+		//  Measured:  `2576`
+		//  Estimated: `6060`
+		// Minimum execution time: 185_391 nanoseconds.
+		Weight::from_parts(188_401_000, 6060)
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
diff --git a/runtime/karura/src/weights/module_evm_accounts.rs b/runtime/karura/src/weights/module_evm_accounts.rs
index 62b13347c7..10f439ea03 100644
--- a/runtime/karura/src/weights/module_evm_accounts.rs
+++ b/runtime/karura/src/weights/module_evm_accounts.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_evm_accounts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,35 +47,35 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_evm_accounts.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_evm_accounts::WeightInfo for WeightInfo<T> {
-	// Storage: EvmAccounts EvmAddresses (r:1 w:1)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EvmAccounts Accounts (r:1 w:1)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EVM ChainId (r:1 w:0)
-	// Proof Skipped: EVM ChainId (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: System BlockHash (r:1 w:0)
-	// Proof: System BlockHash (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:0)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:1)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::Accounts` (r:1 w:1)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EVM::ChainId` (r:1 w:0)
+	// Proof: `EVM::ChainId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::BlockHash` (r:1 w:0)
+	// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:0)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_account() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1449`
-		//  Estimated: `17086`
-		// Minimum execution time: 83_128 nanoseconds.
-		Weight::from_parts(84_176_000, 17086)
+		//  Measured:  `1450`
+		//  Estimated: `3593`
+		// Minimum execution time: 81_963 nanoseconds.
+		Weight::from_parts(83_306_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: EvmAccounts EvmAddresses (r:1 w:1)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: EvmAccounts Accounts (r:0 w:1)
-	// Proof: EvmAccounts Accounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:1)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::Accounts` (r:0 w:1)
+	// Proof: `EvmAccounts::Accounts` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn claim_default_account() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1073`
+		//  Measured:  `1074`
 		//  Estimated: `3525`
-		// Minimum execution time: 22_117 nanoseconds.
-		Weight::from_parts(22_656_000, 3525)
+		// Minimum execution time: 21_601 nanoseconds.
+		Weight::from_parts(21_870_000, 3525)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/runtime/karura/src/weights/module_homa.rs b/runtime/karura/src/weights/module_homa.rs
index 8357835efb..6dc803333f 100644
--- a/runtime/karura/src/weights/module_homa.rs
+++ b/runtime/karura/src/weights/module_homa.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_homa
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,232 +47,232 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_homa.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_homa::WeightInfo for WeightInfo<T> {
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa LastEraBumpedBlock (r:1 w:0)
-	// Proof Skipped: Homa LastEraBumpedBlock (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa BumpEraFrequency (r:1 w:0)
-	// Proof Skipped: Homa BumpEraFrequency (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::LastEraBumpedBlock` (r:1 w:0)
+	// Proof: `Homa::LastEraBumpedBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::BumpEraFrequency` (r:1 w:0)
+	// Proof: `Homa::BumpEraFrequency` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn on_initialize() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `828`
-		//  Estimated: `6939`
-		// Minimum execution time: 7_460 nanoseconds.
-		Weight::from_parts(7_841_000, 6939)
+		//  Estimated: `2313`
+		// Minimum execution time: 7_317 nanoseconds.
+		Weight::from_parts(7_549_000, 2313)
 			.saturating_add(T::DbWeight::get().reads(3))
 	}
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa LastEraBumpedBlock (r:1 w:1)
-	// Proof Skipped: Homa LastEraBumpedBlock (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa BumpEraFrequency (r:1 w:0)
-	// Proof Skipped: Homa BumpEraFrequency (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa RelayChainCurrentEra (r:1 w:1)
-	// Proof Skipped: Homa RelayChainCurrentEra (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa EstimatedRewardRatePerEra (r:1 w:0)
-	// Proof Skipped: Homa EstimatedRewardRatePerEra (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa StakingLedgers (r:4 w:2)
-	// Proof Skipped: Homa StakingLedgers (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:1)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa CommissionRate (r:1 w:0)
-	// Proof Skipped: Homa CommissionRate (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:2)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: XcmInterface XcmDestWeightAndFee (r:4 w:0)
-	// Proof Skipped: XcmInterface XcmDestWeightAndFee (max_values: None, max_size: None, mode: Measured)
-	// Storage: ParachainInfo ParachainId (r:1 w:0)
-	// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: 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: Homa UnclaimedRedemption (r:1 w:1)
-	// Proof Skipped: Homa UnclaimedRedemption (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:1)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa SoftBondedCapPerSubAccount (r:1 w:0)
-	// Proof Skipped: Homa SoftBondedCapPerSubAccount (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: EVM XcmOrigin (r:1 w:1)
-	// Proof Skipped: EVM XcmOrigin (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: UnknownTokens ConcreteFungibleBalances (r:1 w:0)
-	// Proof Skipped: UnknownTokens ConcreteFungibleBalances (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa RedeemRequests (r:2 w:1)
-	// Proof Skipped: Homa RedeemRequests (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa Unbondings (r:1 w:1)
-	// Proof Skipped: Homa Unbondings (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalVoidLiquid (r:0 w:1)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::LastEraBumpedBlock` (r:1 w:1)
+	// Proof: `Homa::LastEraBumpedBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::BumpEraFrequency` (r:1 w:0)
+	// Proof: `Homa::BumpEraFrequency` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::RelayChainCurrentEra` (r:1 w:1)
+	// Proof: `Homa::RelayChainCurrentEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::EstimatedRewardRatePerEra` (r:1 w:0)
+	// Proof: `Homa::EstimatedRewardRatePerEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::StakingLedgers` (r:4 w:2)
+	// Proof: `Homa::StakingLedgers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:1)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::CommissionRate` (r:1 w:0)
+	// Proof: `Homa::CommissionRate` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:2)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `XcmInterface::XcmDestWeightAndFee` (r:4 w:0)
+	// Proof: `XcmInterface::XcmDestWeightAndFee` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `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: `Homa::UnclaimedRedemption` (r:1 w:1)
+	// Proof: `Homa::UnclaimedRedemption` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:1)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::SoftBondedCapPerSubAccount` (r:1 w:0)
+	// Proof: `Homa::SoftBondedCapPerSubAccount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `EVM::XcmOrigin` (r:1 w:1)
+	// Proof: `EVM::XcmOrigin` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `UnknownTokens::ConcreteFungibleBalances` (r:1 w:0)
+	// Proof: `UnknownTokens::ConcreteFungibleBalances` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::RedeemRequests` (r:2 w:1)
+	// Proof: `Homa::RedeemRequests` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::Unbondings` (r:1 w:1)
+	// Proof: `Homa::Unbondings` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalVoidLiquid` (r:0 w:1)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn on_initialize_with_bump_era() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2966`
-		//  Estimated: `148257`
-		// Minimum execution time: 364_830 nanoseconds.
-		Weight::from_parts(373_402_000, 148257)
+		//  Measured:  `2967`
+		//  Estimated: `13857`
+		// Minimum execution time: 357_998 nanoseconds.
+		Weight::from_parts(365_763_000, 13857)
 			.saturating_add(T::DbWeight::get().reads(36))
 			.saturating_add(T::DbWeight::get().writes(20))
 	}
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:1)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa SoftBondedCapPerSubAccount (r:1 w:0)
-	// Proof Skipped: Homa SoftBondedCapPerSubAccount (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, 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(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:1)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa EstimatedRewardRatePerEra (r:1 w:0)
-	// Proof Skipped: Homa EstimatedRewardRatePerEra (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:1)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::SoftBondedCapPerSubAccount` (r:1 w:0)
+	// Proof: `Homa::SoftBondedCapPerSubAccount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, 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(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:1)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::EstimatedRewardRatePerEra` (r:1 w:0)
+	// Proof: `Homa::EstimatedRewardRatePerEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn mint() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1673`
-		//  Estimated: `31771`
-		// Minimum execution time: 86_646 nanoseconds.
-		Weight::from_parts(88_258_000, 31771)
+		//  Measured:  `1674`
+		//  Estimated: `8856`
+		// Minimum execution time: 84_077 nanoseconds.
+		Weight::from_parts(85_491_000, 8856)
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	// Storage: Homa RedeemRequests (r:1 w:1)
-	// Proof Skipped: Homa RedeemRequests (max_values: None, max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Homa::RedeemRequests` (r:1 w:1)
+	// Proof: `Homa::RedeemRequests` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn request_redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1582`
-		//  Estimated: `14874`
-		// Minimum execution time: 57_316 nanoseconds.
-		Weight::from_parts(58_158_000, 14874)
+		//  Measured:  `1583`
+		//  Estimated: `6234`
+		// Minimum execution time: 55_892 nanoseconds.
+		Weight::from_parts(56_642_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: Homa RedeemRequests (r:50 w:50)
-	// Proof Skipped: Homa RedeemRequests (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:1)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa FastMatchFeeRate (r:1 w:0)
-	// Proof Skipped: Homa FastMatchFeeRate (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:52 w:52)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:51 w:51)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Homa::RedeemRequests` (r:50 w:50)
+	// Proof: `Homa::RedeemRequests` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:1)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::FastMatchFeeRate` (r:1 w:0)
+	// Proof: `Homa::FastMatchFeeRate` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:52 w:52)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:51 w:51)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 50]`.
 	fn fast_match_redeems(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1922 + n * (295 ±0)`
-		//  Estimated: `29899 + n * (9175 ±0)`
-		// Minimum execution time: 98_872 nanoseconds.
-		Weight::from_parts(32_565_973, 29899)
-			// Standard Error: 27_557
-			.saturating_add(Weight::from_parts(57_441_135, 0).saturating_mul(n.into()))
+		//  Measured:  `1923 + n * (295 ±0)`
+		//  Estimated: `6234 + n * (2770 ±0)`
+		// Minimum execution time: 96_252 nanoseconds.
+		Weight::from_parts(24_145_555, 6234)
+			// Standard Error: 51_067
+			.saturating_add(Weight::from_parts(57_058_427, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(5))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 9175).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(0, 2770).saturating_mul(n.into()))
 	}
-	// Storage: Homa RelayChainCurrentEra (r:1 w:0)
-	// Proof Skipped: Homa RelayChainCurrentEra (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa Unbondings (r:2 w:1)
-	// Proof Skipped: Homa Unbondings (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa UnclaimedRedemption (r:1 w:1)
-	// Proof Skipped: Homa UnclaimedRedemption (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Homa::RelayChainCurrentEra` (r:1 w:0)
+	// Proof: `Homa::RelayChainCurrentEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::Unbondings` (r:2 w:1)
+	// Proof: `Homa::Unbondings` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::UnclaimedRedemption` (r:1 w:1)
+	// Proof: `Homa::UnclaimedRedemption` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn claim_redemption() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1792`
-		//  Estimated: `30241`
-		// Minimum execution time: 79_873 nanoseconds.
-		Weight::from_parts(82_161_000, 30241)
+		//  Measured:  `1793`
+		//  Estimated: `7733`
+		// Minimum execution time: 77_153 nanoseconds.
+		Weight::from_parts(78_872_000, 7733)
 			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: Homa EstimatedRewardRatePerEra (r:1 w:1)
-	// Proof Skipped: Homa EstimatedRewardRatePerEra (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa CommissionRate (r:1 w:1)
-	// Proof Skipped: Homa CommissionRate (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa FastMatchFeeRate (r:1 w:1)
-	// Proof Skipped: Homa FastMatchFeeRate (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa SoftBondedCapPerSubAccount (r:0 w:1)
-	// Proof Skipped: Homa SoftBondedCapPerSubAccount (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `Homa::EstimatedRewardRatePerEra` (r:1 w:1)
+	// Proof: `Homa::EstimatedRewardRatePerEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::CommissionRate` (r:1 w:1)
+	// Proof: `Homa::CommissionRate` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::FastMatchFeeRate` (r:1 w:1)
+	// Proof: `Homa::FastMatchFeeRate` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::SoftBondedCapPerSubAccount` (r:0 w:1)
+	// Proof: `Homa::SoftBondedCapPerSubAccount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn update_homa_params() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1111`
-		//  Estimated: `8899`
-		// Minimum execution time: 35_584 nanoseconds.
-		Weight::from_parts(36_355_000, 8899)
+		//  Measured:  `1112`
+		//  Estimated: `2597`
+		// Minimum execution time: 34_951 nanoseconds.
+		Weight::from_parts(35_627_000, 2597)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa LastEraBumpedBlock (r:0 w:1)
-	// Proof Skipped: Homa LastEraBumpedBlock (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa BumpEraFrequency (r:0 w:1)
-	// Proof Skipped: Homa BumpEraFrequency (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::LastEraBumpedBlock` (r:0 w:1)
+	// Proof: `Homa::LastEraBumpedBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::BumpEraFrequency` (r:0 w:1)
+	// Proof: `Homa::BumpEraFrequency` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn update_bump_era_params() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1178`
-		//  Estimated: `5019`
-		// Minimum execution time: 26_400 nanoseconds.
-		Weight::from_parts(27_220_000, 5019)
+		//  Measured:  `1179`
+		//  Estimated: `2664`
+		// Minimum execution time: 27_127 nanoseconds.
+		Weight::from_parts(27_645_000, 2664)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: Homa StakingLedgers (r:10 w:10)
-	// Proof Skipped: Homa StakingLedgers (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:1)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `Homa::StakingLedgers` (r:10 w:10)
+	// Proof: `Homa::StakingLedgers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:1)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// The range of component `n` is `[0, 10]`.
 	fn reset_ledgers(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1111`
-		//  Estimated: `4697 + n * (2475 ±0)`
-		// Minimum execution time: 5_928 nanoseconds.
-		Weight::from_parts(13_823_079, 4697)
-			// Standard Error: 45_926
-			.saturating_add(Weight::from_parts(10_379_713, 0).saturating_mul(n.into()))
+		//  Measured:  `1112`
+		//  Estimated: `2597 + n * (2475 ±0)`
+		// Minimum execution time: 6_105 nanoseconds.
+		Weight::from_parts(13_741_419, 2597)
+			// Standard Error: 44_694
+			.saturating_add(Weight::from_parts(10_268_286, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(n.into()))
 	}
-	// Storage: Homa RelayChainCurrentEra (r:1 w:1)
-	// Proof Skipped: Homa RelayChainCurrentEra (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `Homa::RelayChainCurrentEra` (r:1 w:1)
+	// Proof: `Homa::RelayChainCurrentEra` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn reset_current_era() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1111`
-		//  Estimated: `2596`
-		// Minimum execution time: 19_704 nanoseconds.
-		Weight::from_parts(20_158_000, 2596)
+		//  Measured:  `1112`
+		//  Estimated: `2597`
+		// Minimum execution time: 19_548 nanoseconds.
+		Weight::from_parts(19_946_000, 2597)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/karura/src/weights/module_honzon.rs b/runtime/karura/src/weights/module_honzon.rs
index 018eec772f..b093fe0153 100644
--- a/runtime/karura/src/weights/module_honzon.rs
+++ b/runtime/karura/src/weights/module_honzon.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_honzon
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,312 +47,312 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_honzon.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_honzon::WeightInfo for WeightInfo<T> {
-	// Storage: Honzon Authorization (r:1 w:1)
-	// Proof: Honzon Authorization (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `Honzon::Authorization` (r:1 w:1)
+	// Proof: `Honzon::Authorization` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	fn authorize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1414`
-		//  Estimated: `7245`
-		// Minimum execution time: 37_086 nanoseconds.
-		Weight::from_parts(37_811_000, 7245)
+		//  Measured:  `1415`
+		//  Estimated: `3633`
+		// Minimum execution time: 40_697 nanoseconds.
+		Weight::from_parts(41_485_000, 3633)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: Honzon Authorization (r:1 w:1)
-	// Proof: Honzon Authorization (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `Honzon::Authorization` (r:1 w:1)
+	// Proof: `Honzon::Authorization` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	fn unauthorize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1634`
-		//  Estimated: `7245`
-		// Minimum execution time: 42_064 nanoseconds.
-		Weight::from_parts(43_168_000, 7245)
+		//  Measured:  `1635`
+		//  Estimated: `3633`
+		// Minimum execution time: 44_634 nanoseconds.
+		Weight::from_parts(45_338_000, 3633)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: Honzon Authorization (r:4 w:4)
-	// Proof: Honzon Authorization (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
+	// Storage: `Honzon::Authorization` (r:4 w:4)
+	// Proof: `Honzon::Authorization` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 4]`.
 	fn unauthorize_all(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1253 + c * (176 ±0)`
-		//  Estimated: `4623 + c * (2622 ±0)`
-		// Minimum execution time: 22_511 nanoseconds.
-		Weight::from_parts(28_321_806, 4623)
-			// Standard Error: 181_754
-			.saturating_add(Weight::from_parts(6_406_729, 0).saturating_mul(c.into()))
+		//  Measured:  `1254 + c * (176 ±0)`
+		//  Estimated: `3633 + c * (2622 ±0)`
+		// Minimum execution time: 22_821 nanoseconds.
+		Weight::from_parts(29_447_086, 3633)
+			// Standard Error: 207_451
+			.saturating_add(Weight::from_parts(7_086_636, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
 			.saturating_add(Weight::from_parts(0, 2622).saturating_mul(c.into()))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn adjust_loan() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2400`
-		//  Estimated: `61419`
-		// Minimum execution time: 131_847 nanoseconds.
-		Weight::from_parts(136_545_000, 61419)
+		//  Measured:  `2401`
+		//  Estimated: `8856`
+		// Minimum execution time: 129_101 nanoseconds.
+		Weight::from_parts(131_858_000, 8856)
 			.saturating_add(T::DbWeight::get().reads(17))
 			.saturating_add(T::DbWeight::get().writes(9))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Honzon Authorization (r:1 w:0)
-	// Proof: Honzon Authorization (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:2 w:2)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:2 w:2)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, 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: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Honzon::Authorization` (r:1 w:0)
+	// Proof: `Honzon::Authorization` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:2 w:2)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:2 w:2)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `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: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
 	fn transfer_loan_from() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2745`
-		//  Estimated: `58751`
-		// Minimum execution time: 109_398 nanoseconds.
-		Weight::from_parts(112_240_000, 58751)
+		//  Measured:  `2746`
+		//  Estimated: `8686`
+		// Minimum execution time: 105_024 nanoseconds.
+		Weight::from_parts(108_468_000, 8686)
 			.saturating_add(T::DbWeight::get().reads(16))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:6 w:6)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:3 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: CdpTreasury DebitPool (r:1 w:1)
-	// Proof: CdpTreasury DebitPool (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:0)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:2)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:2 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:1 w:0)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:8 w:6)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:3 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `CdpTreasury::DebitPool` (r:1 w:1)
+	// Proof: `CdpTreasury::DebitPool` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:0)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:2)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:2 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:0)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn close_loan_has_debit_by_dex() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `5207`
-		//  Estimated: `149158`
-		// Minimum execution time: 353_554 nanoseconds.
-		Weight::from_parts(358_684_000, 149158)
-			.saturating_add(T::DbWeight::get().reads(37))
+		//  Measured:  `5390`
+		//  Estimated: `21966`
+		// Minimum execution time: 363_887 nanoseconds.
+		Weight::from_parts(367_194_000, 21966)
+			.saturating_add(T::DbWeight::get().reads(39))
 			.saturating_add(T::DbWeight::get().writes(15))
 	}
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:4 w:4)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:2)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:2 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:4 w:4)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:2)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:2 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn expand_position_collateral() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4708`
-		//  Estimated: `108696`
-		// Minimum execution time: 261_307 nanoseconds.
-		Weight::from_parts(265_242_000, 108696)
+		//  Measured:  `4709`
+		//  Estimated: `11478`
+		// Minimum execution time: 255_020 nanoseconds.
+		Weight::from_parts(259_310_000, 11478)
 			.saturating_add(T::DbWeight::get().reads(27))
 			.saturating_add(T::DbWeight::get().writes(12))
 	}
-	// Storage: CdpEngine CollateralParams (r:1 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:1 w:1)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:3 w:2)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:2 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:5 w:5)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Loans TotalPositions (r:1 w:1)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
+	// Storage: `CdpEngine::CollateralParams` (r:1 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:1 w:1)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:3 w:2)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:2 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:7 w:5)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Loans::TotalPositions` (r:1 w:1)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
 	fn shrink_position_debit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4432`
-		//  Estimated: `110245`
-		// Minimum execution time: 284_192 nanoseconds.
-		Weight::from_parts(287_393_000, 110245)
-			.saturating_add(T::DbWeight::get().reads(27))
+		//  Measured:  `4582`
+		//  Estimated: `19344`
+		// Minimum execution time: 295_473 nanoseconds.
+		Weight::from_parts(300_207_000, 19344)
+			.saturating_add(T::DbWeight::get().reads(29))
 			.saturating_add(T::DbWeight::get().writes(13))
 	}
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: CdpEngine CollateralParams (r:2 w:0)
-	// Proof: CdpEngine CollateralParams (max_values: None, max_size: Some(135), added: 2610, mode: MaxEncodedLen)
-	// Storage: Loans Positions (r:2 w:2)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Loans TotalPositions (r:2 w:2)
-	// Proof: Loans TotalPositions (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen)
-	// Storage: CdpEngine DebitExchangeRate (r:2 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:3 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (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(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::CollateralParams` (r:2 w:0)
+	// Proof: `CdpEngine::CollateralParams` (`max_values`: None, `max_size`: Some(135), added: 2610, mode: `MaxEncodedLen`)
+	// Storage: `Loans::Positions` (r:2 w:2)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Loans::TotalPositions` (r:2 w:2)
+	// Proof: `Loans::TotalPositions` (`max_values`: None, `max_size`: Some(83), added: 2558, mode: `MaxEncodedLen`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:2 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:3 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn transfer_debit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2887`
-		//  Estimated: `68361`
-		// Minimum execution time: 160_990 nanoseconds.
-		Weight::from_parts(166_485_000, 68361)
+		//  Measured:  `2888`
+		//  Estimated: `8828`
+		// Minimum execution time: 158_007 nanoseconds.
+		Weight::from_parts(164_082_000, 8828)
 			.saturating_add(T::DbWeight::get().reads(20))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: Loans Positions (r:1 w:0)
-	// Proof: Loans Positions (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
-	// Storage: Prices LockedPrice (r:2 w:0)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:2 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:1 w:0)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: CdpEngine DebitExchangeRate (r:1 w:0)
-	// Proof: CdpEngine DebitExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `Loans::Positions` (r:1 w:0)
+	// Proof: `Loans::Positions` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
+	// Storage: `Prices::LockedPrice` (r:2 w:0)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:2 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:0)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `CdpEngine::DebitExchangeRate` (r:1 w:0)
+	// Proof: `CdpEngine::DebitExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn precompile_get_current_collateral_ratio() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1987`
-		//  Estimated: `38609`
-		// Minimum execution time: 44_115 nanoseconds.
-		Weight::from_parts(45_601_000, 38609)
+		//  Estimated: `7927`
+		// Minimum execution time: 42_620 nanoseconds.
+		Weight::from_parts(43_940_000, 7927)
 			.saturating_add(T::DbWeight::get().reads(11))
 	}
 }
diff --git a/runtime/karura/src/weights/module_honzon_bridge.rs b/runtime/karura/src/weights/module_honzon_bridge.rs
index 409e328800..d7d3bdae44 100644
--- a/runtime/karura/src/weights/module_honzon_bridge.rs
+++ b/runtime/karura/src/weights/module_honzon_bridge.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_honzon_bridge
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,34 +47,34 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_honzon_bridge.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_honzon_bridge::WeightInfo for WeightInfo<T> {
-	// Storage: HonzonBridge BridgedStableCoinCurrencyId (r:0 w:1)
-	// Proof: HonzonBridge BridgedStableCoinCurrencyId (max_values: Some(1), max_size: Some(43), added: 538, mode: MaxEncodedLen)
+	// Storage: `HonzonBridge::BridgedStableCoinCurrencyId` (r:0 w:1)
+	// Proof: `HonzonBridge::BridgedStableCoinCurrencyId` (`max_values`: Some(1), `max_size`: Some(43), added: 538, mode: `MaxEncodedLen`)
 	fn set_bridged_stable_coin_address() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `964`
+		//  Measured:  `965`
 		//  Estimated: `0`
-		// Minimum execution time: 17_030 nanoseconds.
-		Weight::from_parts(17_801_000, 0)
+		// Minimum execution time: 16_919 nanoseconds.
+		Weight::from_parts(17_464_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: HonzonBridge BridgedStableCoinCurrencyId (r:1 w:0)
-	// Proof: HonzonBridge BridgedStableCoinCurrencyId (max_values: Some(1), max_size: Some(43), added: 538, mode: MaxEncodedLen)
+	// Storage: `HonzonBridge::BridgedStableCoinCurrencyId` (r:1 w:0)
+	// Proof: `HonzonBridge::BridgedStableCoinCurrencyId` (`max_values`: Some(1), `max_size`: Some(43), added: 538, mode: `MaxEncodedLen`)
 	fn to_bridged() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1118`
+		//  Measured:  `1119`
 		//  Estimated: `1528`
-		// Minimum execution time: 20_022 nanoseconds.
-		Weight::from_parts(20_493_000, 1528)
+		// Minimum execution time: 19_629 nanoseconds.
+		Weight::from_parts(20_116_000, 1528)
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
-	// Storage: HonzonBridge BridgedStableCoinCurrencyId (r:1 w:0)
-	// Proof: HonzonBridge BridgedStableCoinCurrencyId (max_values: Some(1), max_size: Some(43), added: 538, mode: MaxEncodedLen)
+	// Storage: `HonzonBridge::BridgedStableCoinCurrencyId` (r:1 w:0)
+	// Proof: `HonzonBridge::BridgedStableCoinCurrencyId` (`max_values`: Some(1), `max_size`: Some(43), added: 538, mode: `MaxEncodedLen`)
 	fn from_bridged() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1118`
+		//  Measured:  `1119`
 		//  Estimated: `1528`
-		// Minimum execution time: 19_875 nanoseconds.
-		Weight::from_parts(20_292_000, 1528)
+		// Minimum execution time: 19_671 nanoseconds.
+		Weight::from_parts(20_048_000, 1528)
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 }
diff --git a/runtime/karura/src/weights/module_idle_scheduler.rs b/runtime/karura/src/weights/module_idle_scheduler.rs
index 18deb1e49f..4851a38234 100644
--- a/runtime/karura/src/weights/module_idle_scheduler.rs
+++ b/runtime/karura/src/weights/module_idle_scheduler.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_idle_scheduler
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,51 +47,51 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_idle_scheduler.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_idle_scheduler::WeightInfo for WeightInfo<T> {
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: IdleScheduler PreviousRelayBlockNumber (r:0 w:1)
-	// Proof Skipped: IdleScheduler PreviousRelayBlockNumber (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `IdleScheduler::PreviousRelayBlockNumber` (r:0 w:1)
+	// Proof: `IdleScheduler::PreviousRelayBlockNumber` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn on_initialize() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `681`
-		//  Estimated: `2847`
-		// Minimum execution time: 4_689 nanoseconds.
-		Weight::from_parts(4_817_000, 2847)
+		//  Estimated: `2166`
+		// Minimum execution time: 4_507 nanoseconds.
+		Weight::from_parts(4_614_000, 2166)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: IdleScheduler PreviousRelayBlockNumber (r:1 w:0)
-	// Proof Skipped: IdleScheduler PreviousRelayBlockNumber (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `IdleScheduler::PreviousRelayBlockNumber` (r:1 w:0)
+	// Proof: `IdleScheduler::PreviousRelayBlockNumber` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn on_idle_base() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `790`
-		//  Estimated: `4550`
-		// Minimum execution time: 6_300 nanoseconds.
-		Weight::from_parts(6_627_000, 4550)
+		//  Estimated: `2275`
+		// Minimum execution time: 6_102 nanoseconds.
+		Weight::from_parts(6_345_000, 2275)
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
-	// Storage: IdleScheduler Tasks (r:0 w:1)
-	// Proof Skipped: IdleScheduler Tasks (max_values: None, max_size: None, mode: Measured)
+	// Storage: `IdleScheduler::Tasks` (r:0 w:1)
+	// Proof: `IdleScheduler::Tasks` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn clear_tasks() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `832`
-		//  Estimated: `832`
-		// Minimum execution time: 11_873 nanoseconds.
-		Weight::from_parts(12_138_000, 832)
+		//  Measured:  `833`
+		//  Estimated: `833`
+		// Minimum execution time: 11_234 nanoseconds.
+		Weight::from_parts(11_610_000, 833)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: IdleScheduler NextTaskId (r:1 w:1)
-	// Proof Skipped: IdleScheduler NextTaskId (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: IdleScheduler Tasks (r:0 w:1)
-	// Proof Skipped: IdleScheduler Tasks (max_values: None, max_size: None, mode: Measured)
+	// Storage: `IdleScheduler::NextTaskId` (r:1 w:1)
+	// Proof: `IdleScheduler::NextTaskId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `IdleScheduler::Tasks` (r:0 w:1)
+	// Proof: `IdleScheduler::Tasks` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn schedule_task() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1073`
-		//  Estimated: `3631`
-		// Minimum execution time: 20_917 nanoseconds.
-		Weight::from_parts(21_280_000, 3631)
+		//  Measured:  `1074`
+		//  Estimated: `2559`
+		// Minimum execution time: 20_359 nanoseconds.
+		Weight::from_parts(20_874_000, 2559)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/runtime/karura/src/weights/module_incentives.rs b/runtime/karura/src/weights/module_incentives.rs
index 61dd1d1f95..d8b16e16ee 100644
--- a/runtime/karura/src/weights/module_incentives.rs
+++ b/runtime/karura/src/weights/module_incentives.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_incentives
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,110 +47,110 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_incentives.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_incentives::WeightInfo for WeightInfo<T> {
-	// Storage: EmergencyShutdown IsShutdown (r:1 w:0)
-	// Proof: EmergencyShutdown IsShutdown (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:5 w:0)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Incentives IncentiveRewardAmounts (r:8 w:0)
-	// Proof Skipped: Incentives IncentiveRewardAmounts (max_values: None, max_size: None, mode: Measured)
-	// Storage: System Account (r:2 w:0)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `EmergencyShutdown::IsShutdown` (r:1 w:0)
+	// Proof: `EmergencyShutdown::IsShutdown` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:5 w:0)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Incentives::IncentiveRewardAmounts` (r:8 w:0)
+	// Proof: `Incentives::IncentiveRewardAmounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:1 w:0)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 4]`.
 	fn on_initialize(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1196 + c * (141 ±0)`
-		//  Estimated: `14741 + c * (7653 ±0)`
-		// Minimum execution time: 10_077 nanoseconds.
-		Weight::from_parts(12_900_323, 14741)
-			// Standard Error: 89_872
-			.saturating_add(Weight::from_parts(16_202_001, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 7653).saturating_mul(c.into()))
+		//  Measured:  `1254 + c * (198 ±0)`
+		//  Estimated: `4747 + c * (5027 ±0)`
+		// Minimum execution time: 9_774 nanoseconds.
+		Weight::from_parts(13_822_109, 4747)
+			// Standard Error: 131_552
+			.saturating_add(Weight::from_parts(17_192_919, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(c.into())))
+			.saturating_add(Weight::from_parts(0, 5027).saturating_mul(c.into()))
 	}
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn deposit_dex_share() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1807`
-		//  Estimated: `23896`
-		// Minimum execution time: 70_213 nanoseconds.
-		Weight::from_parts(72_131_000, 23896)
+		//  Measured:  `1808`
+		//  Estimated: `6234`
+		// Minimum execution time: 69_777 nanoseconds.
+		Weight::from_parts(70_933_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:0)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:0)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn withdraw_dex_share() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1847`
-		//  Estimated: `20451`
-		// Minimum execution time: 70_283 nanoseconds.
-		Weight::from_parts(72_002_000, 20451)
+		//  Measured:  `1848`
+		//  Estimated: `6234`
+		// Minimum execution time: 68_246 nanoseconds.
+		Weight::from_parts(69_154_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: Rewards SharesAndWithdrawnRewards (r:1 w:1)
-	// Proof Skipped: Rewards SharesAndWithdrawnRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Rewards PoolInfos (r:1 w:1)
-	// Proof Skipped: Rewards PoolInfos (max_values: None, max_size: None, mode: Measured)
-	// Storage: Incentives PendingMultiRewards (r:1 w:1)
-	// Proof Skipped: Incentives PendingMultiRewards (max_values: None, max_size: None, mode: Measured)
-	// Storage: Incentives ClaimRewardDeductionRates (r:1 w:0)
-	// Proof Skipped: Incentives ClaimRewardDeductionRates (max_values: None, 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: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
+	// Storage: `Rewards::SharesAndWithdrawnRewards` (r:1 w:1)
+	// Proof: `Rewards::SharesAndWithdrawnRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Rewards::PoolInfos` (r:1 w:1)
+	// Proof: `Rewards::PoolInfos` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Incentives::PendingMultiRewards` (r:1 w:1)
+	// Proof: `Incentives::PendingMultiRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Incentives::ClaimRewardDeductionRates` (r:1 w:0)
+	// Proof: `Incentives::ClaimRewardDeductionRates` (`max_values`: None, `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: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn claim_rewards() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1815`
-		//  Estimated: `28238`
-		// Minimum execution time: 74_953 nanoseconds.
-		Weight::from_parts(76_529_000, 28238)
+		//  Measured:  `1860`
+		//  Estimated: `5325`
+		// Minimum execution time: 97_474 nanoseconds.
+		Weight::from_parts(99_456_000, 5325)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	// Storage: Incentives IncentiveRewardAmounts (r:4 w:4)
-	// Proof Skipped: Incentives IncentiveRewardAmounts (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Incentives::IncentiveRewardAmounts` (r:4 w:4)
+	// Proof: `Incentives::IncentiveRewardAmounts` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 4]`.
 	fn update_incentive_rewards(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `751 + c * (85 ±0)`
-		//  Estimated: `1996 + c * (2475 ±0)`
-		// Minimum execution time: 5_855 nanoseconds.
-		Weight::from_parts(9_043_758, 1996)
-			// Standard Error: 101_907
-			.saturating_add(Weight::from_parts(8_742_209, 0).saturating_mul(c.into()))
+		//  Estimated: `1997 + c * (2475 ±0)`
+		// Minimum execution time: 6_087 nanoseconds.
+		Weight::from_parts(9_144_336, 1997)
+			// Standard Error: 98_707
+			.saturating_add(Weight::from_parts(8_623_945, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(c.into()))
 	}
-	// Storage: Incentives ClaimRewardDeductionRates (r:4 w:4)
-	// Proof Skipped: Incentives ClaimRewardDeductionRates (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Incentives::ClaimRewardDeductionRates` (r:4 w:4)
+	// Proof: `Incentives::ClaimRewardDeductionRates` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 4]`.
 	fn update_claim_reward_deduction_rates(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `676 + c * (10 ±0)`
 		//  Estimated: `1698 + c * (2475 ±0)`
-		// Minimum execution time: 5_808 nanoseconds.
-		Weight::from_parts(6_710_060, 1698)
-			// Standard Error: 19_806
-			.saturating_add(Weight::from_parts(2_164_520, 0).saturating_mul(c.into()))
+		// Minimum execution time: 5_892 nanoseconds.
+		Weight::from_parts(6_706_753, 1698)
+			// Standard Error: 18_072
+			.saturating_add(Weight::from_parts(2_130_283, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(c.into()))
diff --git a/runtime/karura/src/weights/module_nft.rs b/runtime/karura/src/weights/module_nft.rs
index 5203aba3b1..48e4130547 100644
--- a/runtime/karura/src/weights/module_nft.rs
+++ b/runtime/karura/src/weights/module_nft.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_nft
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,141 +47,139 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_nft.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_nft::WeightInfo for WeightInfo<T> {
-	// Storage: OrmlNFT NextClassId (r:1 w:1)
-	// Proof Skipped: OrmlNFT NextClassId (max_values: Some(1), 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: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: Proxy Proxies (r:1 w:1)
-	// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	// Storage: OrmlNFT Classes (r:0 w:1)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::NextClassId` (r:1 w:1)
+	// Proof: `OrmlNFT::NextClassId` (`max_values`: Some(1), `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: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `Proxy::Proxies` (r:1 w:1)
+	// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::Classes` (r:0 w:1)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn create_class() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `385`
-		//  Estimated: `16790`
-		// Minimum execution time: 76_053 nanoseconds.
-		Weight::from_parts(78_089_000, 16790)
+		//  Estimated: `6196`
+		// Minimum execution time: 96_207 nanoseconds.
+		Weight::from_parts(97_317_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:1)
-	// Proof Skipped: OrmlNFT Classes (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: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: OrmlNFT NextTokenId (r:1 w:1)
-	// Proof Skipped: OrmlNFT NextTokenId (max_values: None, max_size: None, mode: Measured)
-	// Storage: OrmlNFT Tokens (r:0 w:999)
-	// Proof Skipped: OrmlNFT Tokens (max_values: None, max_size: None, mode: Measured)
-	// Storage: OrmlNFT TokensByOwner (r:0 w:999)
-	// Proof Skipped: OrmlNFT TokensByOwner (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:1)
+	// Proof: `OrmlNFT::Classes` (`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: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::NextTokenId` (r:1 w:1)
+	// Proof: `OrmlNFT::NextTokenId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `OrmlNFT::Tokens` (r:0 w:999)
+	// Proof: `OrmlNFT::Tokens` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `OrmlNFT::TokensByOwner` (r:0 w:999)
+	// Proof: `OrmlNFT::TokensByOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `i` is `[1, 1000]`.
 	fn mint(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2496`
-		//  Estimated: `26743`
-		// Minimum execution time: 94_277 nanoseconds.
-		Weight::from_parts(33_584_288, 26743)
-			// Standard Error: 13_865
-			.saturating_add(Weight::from_parts(23_939_789, 0).saturating_mul(i.into()))
+		//  Estimated: `6196`
+		// Minimum execution time: 114_564 nanoseconds.
+		Weight::from_parts(115_372_000, 6196)
+			// Standard Error: 10_207
+			.saturating_add(Weight::from_parts(24_037_540, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(5))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(i.into())))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:0)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
-	// Storage: OrmlNFT Tokens (r:1 w:1)
-	// Proof Skipped: OrmlNFT Tokens (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:2 w:2)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: OrmlNFT TokensByOwner (r:0 w:2)
-	// Proof Skipped: OrmlNFT TokensByOwner (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:0)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `OrmlNFT::Tokens` (r:1 w:1)
+	// Proof: `OrmlNFT::Tokens` (`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: `Balances::Reserves` (r:2 w:2)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::TokensByOwner` (r:0 w:2)
+	// Proof: `OrmlNFT::TokensByOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4849`
-		//  Estimated: `37474`
-		// Minimum execution time: 101_400 nanoseconds.
-		Weight::from_parts(103_495_000, 37474)
-			.saturating_add(T::DbWeight::get().reads(7))
+		//  Measured:  `4845`
+		//  Estimated: `8310`
+		// Minimum execution time: 116_724 nanoseconds.
+		Weight::from_parts(118_627_000, 8310)
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:1)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
-	// Storage: OrmlNFT Tokens (r:1 w:1)
-	// Proof Skipped: OrmlNFT Tokens (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: OrmlNFT TokensByOwner (r:0 w:1)
-	// Proof Skipped: OrmlNFT TokensByOwner (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:1)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `OrmlNFT::Tokens` (r:1 w:1)
+	// Proof: `OrmlNFT::Tokens` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::TokensByOwner` (r:0 w:1)
+	// Proof: `OrmlNFT::TokensByOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn burn() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4744`
-		//  Estimated: `28388`
-		// Minimum execution time: 75_749 nanoseconds.
-		Weight::from_parts(76_922_000, 28388)
+		//  Estimated: `8209`
+		// Minimum execution time: 77_956 nanoseconds.
+		Weight::from_parts(79_063_000, 8209)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:1)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
-	// Storage: OrmlNFT Tokens (r:1 w:1)
-	// Proof Skipped: OrmlNFT Tokens (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: OrmlNFT TokensByOwner (r:0 w:1)
-	// Proof Skipped: OrmlNFT TokensByOwner (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:1)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `OrmlNFT::Tokens` (r:1 w:1)
+	// Proof: `OrmlNFT::Tokens` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::TokensByOwner` (r:0 w:1)
+	// Proof: `OrmlNFT::TokensByOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `b` is `[0, 3670016]`.
 	fn burn_with_remark(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4744`
-		//  Estimated: `28388`
-		// Minimum execution time: 75_948 nanoseconds.
-		Weight::from_parts(9_494_053, 28388)
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(1_796, 0).saturating_mul(b.into()))
+		//  Estimated: `8209`
+		// Minimum execution time: 78_519 nanoseconds.
+		Weight::from_parts(79_047_000, 8209)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_807, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:1)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Proxy Proxies (r:1 w:1)
-	// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: OrmlNFT NextTokenId (r:0 w:1)
-	// Proof Skipped: OrmlNFT NextTokenId (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:1)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Proxy::Proxies` (r:1 w:1)
+	// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `OrmlNFT::NextTokenId` (r:0 w:1)
+	// Proof: `OrmlNFT::NextTokenId` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn destroy_class() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2831`
-		//  Estimated: `27187`
-		// Minimum execution time: 89_241 nanoseconds.
-		Weight::from_parts(90_746_000, 27187)
+		//  Estimated: `6296`
+		// Minimum execution time: 113_245 nanoseconds.
+		Weight::from_parts(114_484_000, 6296)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: OrmlNFT Classes (r:1 w:1)
-	// Proof Skipped: OrmlNFT Classes (max_values: None, max_size: None, mode: Measured)
+	// Storage: `OrmlNFT::Classes` (r:1 w:1)
+	// Proof: `OrmlNFT::Classes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn update_class_properties() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2339`
 		//  Estimated: `5804`
-		// Minimum execution time: 21_076 nanoseconds.
-		Weight::from_parts(21_670_000, 5804)
+		// Minimum execution time: 20_453 nanoseconds.
+		Weight::from_parts(20_923_000, 5804)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/karura/src/weights/module_prices.rs b/runtime/karura/src/weights/module_prices.rs
index 8ab3e42a16..15216e96a9 100644
--- a/runtime/karura/src/weights/module_prices.rs
+++ b/runtime/karura/src/weights/module_prices.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_prices
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,29 +47,29 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_prices.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_prices::WeightInfo for WeightInfo<T> {
-	// Storage: AcalaOracle Values (r:1 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
-	// Storage: Prices LockedPrice (r:0 w:1)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `AcalaOracle::Values` (r:1 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Prices::LockedPrice` (r:0 w:1)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn lock_price() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1387`
-		//  Estimated: `8392`
-		// Minimum execution time: 29_169 nanoseconds.
-		Weight::from_parts(30_011_000, 8392)
+		//  Measured:  `1388`
+		//  Estimated: `4853`
+		// Minimum execution time: 28_257 nanoseconds.
+		Weight::from_parts(28_901_000, 4853)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Prices LockedPrice (r:1 w:1)
-	// Proof: Prices LockedPrice (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `Prices::LockedPrice` (r:1 w:1)
+	// Proof: `Prices::LockedPrice` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn unlock_price() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1056`
+		//  Measured:  `1057`
 		//  Estimated: `3532`
-		// Minimum execution time: 22_451 nanoseconds.
-		Weight::from_parts(23_251_000, 3532)
+		// Minimum execution time: 22_185 nanoseconds.
+		Weight::from_parts(22_845_000, 3532)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/karura/src/weights/module_session_manager.rs b/runtime/karura/src/weights/module_session_manager.rs
index 5933b6920a..e609cc0bc5 100644
--- a/runtime/karura/src/weights/module_session_manager.rs
+++ b/runtime/karura/src/weights/module_session_manager.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_session_manager
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,71 +47,71 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_session_manager.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_session_manager::WeightInfo for WeightInfo<T> {
-	// Storage: Session CurrentIndex (r:1 w:0)
-	// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: SessionManager SessionDuration (r:1 w:0)
-	// Proof: SessionManager SessionDuration (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: SessionManager DurationOffset (r:1 w:0)
-	// Proof: SessionManager DurationOffset (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: SessionManager SessionDurationChanges (r:0 w:1)
-	// Proof: SessionManager SessionDurationChanges (max_values: None, max_size: Some(20), added: 2495, mode: MaxEncodedLen)
+	// Storage: `Session::CurrentIndex` (r:1 w:0)
+	// Proof: `Session::CurrentIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `SessionManager::SessionDuration` (r:1 w:0)
+	// Proof: `SessionManager::SessionDuration` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::DurationOffset` (r:1 w:0)
+	// Proof: `SessionManager::DurationOffset` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::SessionDurationChanges` (r:0 w:1)
+	// Proof: `SessionManager::SessionDurationChanges` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	fn schedule_session_duration() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1490`
-		//  Estimated: `5953`
-		// Minimum execution time: 25_166 nanoseconds.
-		Weight::from_parts(25_535_000, 5953)
+		//  Measured:  `1491`
+		//  Estimated: `2976`
+		// Minimum execution time: 24_137 nanoseconds.
+		Weight::from_parts(24_717_000, 2976)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: SessionManager SessionDurationChanges (r:1 w:1)
-	// Proof: SessionManager SessionDurationChanges (max_values: None, max_size: Some(20), added: 2495, mode: MaxEncodedLen)
+	// Storage: `SessionManager::SessionDurationChanges` (r:1 w:1)
+	// Proof: `SessionManager::SessionDurationChanges` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	fn on_initialize_skip() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `809`
 		//  Estimated: `3485`
-		// Minimum execution time: 5_944 nanoseconds.
-		Weight::from_parts(6_129_000, 3485)
+		// Minimum execution time: 5_923 nanoseconds.
+		Weight::from_parts(6_170_000, 3485)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: SessionManager SessionDurationChanges (r:1 w:1)
-	// Proof: SessionManager SessionDurationChanges (max_values: None, max_size: Some(20), added: 2495, mode: MaxEncodedLen)
-	// Storage: SessionManager DurationOffset (r:0 w:1)
-	// Proof: SessionManager DurationOffset (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: SessionManager SessionDuration (r:0 w:1)
-	// Proof: SessionManager SessionDuration (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	// Storage: `SessionManager::SessionDurationChanges` (r:1 w:1)
+	// Proof: `SessionManager::SessionDurationChanges` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::DurationOffset` (r:0 w:1)
+	// Proof: `SessionManager::DurationOffset` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::SessionDuration` (r:0 w:1)
+	// Proof: `SessionManager::SessionDuration` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn on_initialize() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `809`
 		//  Estimated: `3485`
-		// Minimum execution time: 7_135 nanoseconds.
-		Weight::from_parts(7_416_000, 3485)
+		// Minimum execution time: 7_005 nanoseconds.
+		Weight::from_parts(7_155_000, 3485)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: SessionManager DurationOffset (r:1 w:0)
-	// Proof: SessionManager DurationOffset (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: SessionManager SessionDuration (r:1 w:0)
-	// Proof: SessionManager SessionDuration (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	// Storage: `SessionManager::DurationOffset` (r:1 w:0)
+	// Proof: `SessionManager::DurationOffset` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::SessionDuration` (r:1 w:0)
+	// Proof: `SessionManager::SessionDuration` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn estimate_current_session_progress() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `769`
-		//  Estimated: `2978`
-		// Minimum execution time: 5_042 nanoseconds.
-		Weight::from_parts(5_101_000, 2978)
+		//  Estimated: `1489`
+		// Minimum execution time: 4_774 nanoseconds.
+		Weight::from_parts(4_896_000, 1489)
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
-	// Storage: SessionManager DurationOffset (r:1 w:0)
-	// Proof: SessionManager DurationOffset (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: SessionManager SessionDuration (r:1 w:0)
-	// Proof: SessionManager SessionDuration (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	// Storage: `SessionManager::DurationOffset` (r:1 w:0)
+	// Proof: `SessionManager::DurationOffset` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `SessionManager::SessionDuration` (r:1 w:0)
+	// Proof: `SessionManager::SessionDuration` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn estimate_next_session_rotation() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `769`
-		//  Estimated: `2978`
-		// Minimum execution time: 5_034 nanoseconds.
-		Weight::from_parts(5_153_000, 2978)
+		//  Estimated: `1489`
+		// Minimum execution time: 4_835 nanoseconds.
+		Weight::from_parts(4_895_000, 1489)
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
 }
diff --git a/runtime/karura/src/weights/module_transaction_pause.rs b/runtime/karura/src/weights/module_transaction_pause.rs
index f8f4377fe2..0e5a05031f 100644
--- a/runtime/karura/src/weights/module_transaction_pause.rs
+++ b/runtime/karura/src/weights/module_transaction_pause.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_transaction_pause
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,47 +47,47 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_transaction_pause.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_transaction_pause::WeightInfo for WeightInfo<T> {
-	// Storage: TransactionPause PausedTransactions (r:1 w:1)
-	// Proof Skipped: TransactionPause PausedTransactions (max_values: None, max_size: None, mode: Measured)
+	// Storage: `TransactionPause::PausedTransactions` (r:1 w:1)
+	// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn pause_transaction() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1139`
-		//  Estimated: `4604`
-		// Minimum execution time: 20_587 nanoseconds.
-		Weight::from_parts(21_005_000, 4604)
+		//  Measured:  `1140`
+		//  Estimated: `4605`
+		// Minimum execution time: 20_127 nanoseconds.
+		Weight::from_parts(20_606_000, 4605)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: TransactionPause PausedTransactions (r:1 w:1)
-	// Proof Skipped: TransactionPause PausedTransactions (max_values: None, max_size: None, mode: Measured)
+	// Storage: `TransactionPause::PausedTransactions` (r:1 w:1)
+	// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn unpause_transaction() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1190`
-		//  Estimated: `4655`
-		// Minimum execution time: 22_095 nanoseconds.
-		Weight::from_parts(22_737_000, 4655)
+		//  Measured:  `1191`
+		//  Estimated: `4656`
+		// Minimum execution time: 21_595 nanoseconds.
+		Weight::from_parts(22_208_000, 4656)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: TransactionPause PausedEvmPrecompiles (r:1 w:1)
-	// Proof Skipped: TransactionPause PausedEvmPrecompiles (max_values: None, max_size: None, mode: Measured)
+	// Storage: `TransactionPause::PausedEvmPrecompiles` (r:1 w:1)
+	// Proof: `TransactionPause::PausedEvmPrecompiles` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn pause_evm_precompile() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1139`
-		//  Estimated: `4604`
-		// Minimum execution time: 20_152 nanoseconds.
-		Weight::from_parts(20_742_000, 4604)
+		//  Measured:  `1140`
+		//  Estimated: `4605`
+		// Minimum execution time: 19_999 nanoseconds.
+		Weight::from_parts(20_346_000, 4605)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: TransactionPause PausedEvmPrecompiles (r:1 w:1)
-	// Proof Skipped: TransactionPause PausedEvmPrecompiles (max_values: None, max_size: None, mode: Measured)
+	// Storage: `TransactionPause::PausedEvmPrecompiles` (r:1 w:1)
+	// Proof: `TransactionPause::PausedEvmPrecompiles` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn unpause_evm_precompile() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1200`
-		//  Estimated: `4665`
-		// Minimum execution time: 21_802 nanoseconds.
-		Weight::from_parts(22_372_000, 4665)
+		//  Measured:  `1201`
+		//  Estimated: `4666`
+		// Minimum execution time: 21_669 nanoseconds.
+		Weight::from_parts(22_185_000, 4666)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/karura/src/weights/module_transaction_payment.rs b/runtime/karura/src/weights/module_transaction_payment.rs
index 60556f4fdd..ec086b05b8 100644
--- a/runtime/karura/src/weights/module_transaction_payment.rs
+++ b/runtime/karura/src/weights/module_transaction_payment.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for module_transaction_payment
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,66 +47,66 @@ use sp_std::marker::PhantomData;
 /// Weight functions for module_transaction_payment.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> module_transaction_payment::WeightInfo for WeightInfo<T> {
-	// Storage: Balances Reserves (r:1 w:1)
-	// Proof: Balances Reserves (max_values: None, max_size: Some(168), added: 2643, mode: MaxEncodedLen)
-	// Storage: TransactionPayment AlternativeFeeSwapPath (r:0 w:1)
-	// Proof: TransactionPayment AlternativeFeeSwapPath (max_values: None, max_size: Some(213), added: 2688, mode: MaxEncodedLen)
+	// Storage: `Balances::Reserves` (r:1 w:1)
+	// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(168), added: 2643, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::AlternativeFeeSwapPath` (r:0 w:1)
+	// Proof: `TransactionPayment::AlternativeFeeSwapPath` (`max_values`: None, `max_size`: Some(213), added: 2688, mode: `MaxEncodedLen`)
 	fn set_alternative_fee_swap_path() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1372`
+		//  Measured:  `1373`
 		//  Estimated: `3633`
-		// Minimum execution time: 32_317 nanoseconds.
-		Weight::from_parts(33_349_000, 3633)
+		// Minimum execution time: 35_746 nanoseconds.
+		Weight::from_parts(36_451_000, 3633)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: TransactionPayment PoolSize (r:1 w:1)
-	// Proof: TransactionPayment PoolSize (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:3 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: Dex LiquidityPool (r:1 w:0)
-	// Proof: Dex LiquidityPool (max_values: None, max_size: Some(126), added: 2601, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:1 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: TransactionPayment TokenExchangeRate (r:0 w:1)
-	// Proof: TransactionPayment TokenExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: TransactionPayment SwapBalanceThreshold (r:0 w:1)
-	// Proof: TransactionPayment SwapBalanceThreshold (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `TransactionPayment::PoolSize` (r:1 w:1)
+	// Proof: `TransactionPayment::PoolSize` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:3 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `Dex::LiquidityPool` (r:1 w:0)
+	// Proof: `Dex::LiquidityPool` (`max_values`: None, `max_size`: Some(126), added: 2601, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:1 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::TokenExchangeRate` (r:0 w:1)
+	// Proof: `TransactionPayment::TokenExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::SwapBalanceThreshold` (r:0 w:1)
+	// Proof: `TransactionPayment::SwapBalanceThreshold` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn enable_charge_fee_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2038`
-		//  Estimated: `36956`
-		// Minimum execution time: 104_608 nanoseconds.
-		Weight::from_parts(107_512_000, 36956)
+		//  Measured:  `2188`
+		//  Estimated: `9000`
+		// Minimum execution time: 115_823 nanoseconds.
+		Weight::from_parts(118_721_000, 9000)
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	// Storage: TransactionPayment TokenExchangeRate (r:1 w:1)
-	// Proof: TransactionPayment TokenExchangeRate (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: TransactionPayment SwapBalanceThreshold (r:0 w:1)
-	// Proof: TransactionPayment SwapBalanceThreshold (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: TransactionPayment GlobalFeeSwapPath (r:0 w:1)
-	// Proof: TransactionPayment GlobalFeeSwapPath (max_values: None, max_size: Some(224), added: 2699, mode: MaxEncodedLen)
-	// Storage: TransactionPayment PoolSize (r:0 w:1)
-	// Proof: TransactionPayment PoolSize (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
+	// Storage: `TransactionPayment::TokenExchangeRate` (r:1 w:1)
+	// Proof: `TransactionPayment::TokenExchangeRate` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::SwapBalanceThreshold` (r:0 w:1)
+	// Proof: `TransactionPayment::SwapBalanceThreshold` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::GlobalFeeSwapPath` (r:0 w:1)
+	// Proof: `TransactionPayment::GlobalFeeSwapPath` (`max_values`: None, `max_size`: Some(224), added: 2699, mode: `MaxEncodedLen`)
+	// Storage: `TransactionPayment::PoolSize` (r:0 w:1)
+	// Proof: `TransactionPayment::PoolSize` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	fn disable_charge_fee_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1700`
-		//  Estimated: `16884`
-		// Minimum execution time: 83_182 nanoseconds.
-		Weight::from_parts(85_060_000, 16884)
+		//  Measured:  `1745`
+		//  Estimated: `6234`
+		// Minimum execution time: 102_014 nanoseconds.
+		Weight::from_parts(103_554_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
@@ -115,38 +114,38 @@ impl<T: frame_system::Config> module_transaction_payment::WeightInfo for WeightI
 		// Proof Size summary in bytes:
 		//  Measured:  `666`
 		//  Estimated: `0`
-		// Minimum execution time: 8_964 nanoseconds.
-		Weight::from_parts(9_251_000, 0)
+		// Minimum execution time: 8_884 nanoseconds.
+		Weight::from_parts(9_155_000, 0)
 	}
 	fn with_fee_currency() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `666`
 		//  Estimated: `0`
-		// Minimum execution time: 9_877 nanoseconds.
-		Weight::from_parts(10_373_000, 0)
+		// Minimum execution time: 9_834 nanoseconds.
+		Weight::from_parts(10_448_000, 0)
 	}
 	fn with_fee_aggregated_path() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `666`
 		//  Estimated: `0`
-		// Minimum execution time: 10_444 nanoseconds.
-		Weight::from_parts(10_921_000, 0)
+		// Minimum execution time: 10_071 nanoseconds.
+		Weight::from_parts(10_425_000, 0)
 	}
 	fn with_fee_paid_by() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `666`
 		//  Estimated: `0`
-		// Minimum execution time: 6_841 nanoseconds.
-		Weight::from_parts(7_195_000, 0)
+		// Minimum execution time: 6_880 nanoseconds.
+		Weight::from_parts(7_067_000, 0)
 	}
-	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:1)
-	// Proof: TransactionPayment NextFeeMultiplier (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	// Storage: `TransactionPayment::NextFeeMultiplier` (r:1 w:1)
+	// Proof: `TransactionPayment::NextFeeMultiplier` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn on_finalize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `922`
+		//  Measured:  `923`
 		//  Estimated: `1501`
-		// Minimum execution time: 10_262 nanoseconds.
-		Weight::from_parts(10_551_000, 1501)
+		// Minimum execution time: 9_994 nanoseconds.
+		Weight::from_parts(10_381_000, 1501)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/karura/src/weights/nutsfinance_stable_asset.rs b/runtime/karura/src/weights/nutsfinance_stable_asset.rs
index e80a2a4469..7ea8a2bea6 100644
--- a/runtime/karura/src/weights/nutsfinance_stable_asset.rs
+++ b/runtime/karura/src/weights/nutsfinance_stable_asset.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for nutsfinance_stable_asset
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,202 +47,202 @@ use sp_std::marker::PhantomData;
 /// Weight functions for nutsfinance_stable_asset.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> nutsfinance_stable_asset::WeightInfo for WeightInfo<T> {
-	// Storage: StableAsset PoolCount (r:1 w:1)
-	// Proof Skipped: StableAsset PoolCount (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, 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: `StableAsset::PoolCount` (r:1 w:1)
+	// Proof: `StableAsset::PoolCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `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 create_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1312`
-		//  Estimated: `11167`
-		// Minimum execution time: 33_490 nanoseconds.
-		Weight::from_parts(34_416_000, 11167)
+		//  Measured:  `1313`
+		//  Estimated: `4778`
+		// Minimum execution time: 31_119 nanoseconds.
+		Weight::from_parts(32_009_000, 4778)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn modify_a() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1505`
-		//  Estimated: `4970`
-		// Minimum execution time: 26_479 nanoseconds.
-		Weight::from_parts(27_333_000, 4970)
+		//  Measured:  `1506`
+		//  Estimated: `4971`
+		// Minimum execution time: 25_208 nanoseconds.
+		Weight::from_parts(25_884_000, 4971)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn modify_fees() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1505`
-		//  Estimated: `4970`
-		// Minimum execution time: 25_592 nanoseconds.
-		Weight::from_parts(26_214_000, 4970)
+		//  Measured:  `1506`
+		//  Estimated: `4971`
+		// Minimum execution time: 24_255 nanoseconds.
+		Weight::from_parts(24_954_000, 4971)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn modify_recipients() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1505`
-		//  Estimated: `4970`
-		// Minimum execution time: 25_205 nanoseconds.
-		Weight::from_parts(25_924_000, 4970)
+		//  Measured:  `1506`
+		//  Estimated: `4971`
+		// Minimum execution time: 24_205 nanoseconds.
+		Weight::from_parts(24_700_000, 4971)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (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: Tokens Accounts (r:10 w:10)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`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: `Tokens::Accounts` (r:10 w:10)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `u` is `[2, 5]`.
 	fn mint(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2010 + u * (238 ±0)`
-		//  Estimated: `31290 + u * (7371 ±0)`
-		// Minimum execution time: 153_643 nanoseconds.
-		Weight::from_parts(83_710_313, 31290)
-			// Standard Error: 255_432
-			.saturating_add(Weight::from_parts(39_018_822, 0).saturating_mul(u.into()))
+		//  Measured:  `2265 + u * (186 ±0)`
+		//  Estimated: `6196 + u * (5244 ±0)`
+		// Minimum execution time: 175_632 nanoseconds.
+		Weight::from_parts(102_958_058, 6196)
+			// Standard Error: 253_492
+			.saturating_add(Weight::from_parts(40_295_598, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(4))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 7371).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 5244).saturating_mul(u.into()))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, 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: Tokens Accounts (r:6 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `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: `Tokens::Accounts` (r:6 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `u` is `[2, 5]`.
 	fn swap(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2202 + u * (236 ±0)`
-		//  Estimated: `32182 + u * (4761 ±32)`
-		// Minimum execution time: 1_499_866 nanoseconds.
-		Weight::from_parts(143_703_049, 32182)
-			// Standard Error: 4_316_544
-			.saturating_add(Weight::from_parts(716_003_841, 0).saturating_mul(u.into()))
+		//  Measured:  `2457 + u * (183 ±0)`
+		//  Estimated: `5932 + u * (2622 ±0)`
+		// Minimum execution time: 2_288_669 nanoseconds.
+		Weight::from_parts(471_550_267, 5932)
+			// Standard Error: 2_900_292
+			.saturating_add(Weight::from_parts(950_828_055, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(6))
-			.saturating_add(Weight::from_parts(0, 4761).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 2622).saturating_mul(u.into()))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, 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: Tokens Accounts (r:10 w:10)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `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: `Tokens::Accounts` (r:10 w:10)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `u` is `[2, 5]`.
 	fn redeem_proportion(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2179 + u * (300 ±0)`
-		//  Estimated: `29495 + u * (7687 ±0)`
-		// Minimum execution time: 172_495 nanoseconds.
-		Weight::from_parts(105_118_606, 29495)
-			// Standard Error: 216_530
-			.saturating_add(Weight::from_parts(37_613_057, 0).saturating_mul(u.into()))
+		//  Measured:  `2434 + u * (247 ±0)`
+		//  Estimated: `5913 + u * (5244 ±0)`
+		// Minimum execution time: 202_762 nanoseconds.
+		Weight::from_parts(127_796_917, 5913)
+			// Standard Error: 221_687
+			.saturating_add(Weight::from_parts(41_493_579, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 7687).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 5244).saturating_mul(u.into()))
 	}
-	// Storage: StableAsset Pools (r:1 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: System Account (r:1 w:0)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:4 w:0)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:1 w:0)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:1 w:0)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:4 w:0)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:0)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// The range of component `u` is `[2, 5]`.
 	fn redeem_single(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1592 + u * (227 ±0)`
-		//  Estimated: `26267 + u * (1622 ±0)`
-		// Minimum execution time: 983_391 nanoseconds.
-		Weight::from_parts(464_129_247, 26267)
-			// Standard Error: 942_806
-			.saturating_add(Weight::from_parts(261_402_253, 0).saturating_mul(u.into()))
+		//  Measured:  `1593 + u * (227 ±0)`
+		//  Estimated: `5106 + u * (1016 ±0)`
+		// Minimum execution time: 1_795_236 nanoseconds.
+		Weight::from_parts(799_762_400, 5106)
+			// Standard Error: 2_449_575
+			.saturating_add(Weight::from_parts(498_746_604, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 1622).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 1016).saturating_mul(u.into()))
 	}
-	// Storage: StableAsset Pools (r:1 w:1)
-	// Proof Skipped: StableAsset Pools (max_values: None, 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: Tokens Accounts (r:10 w:10)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Homa TotalStakingBonded (r:1 w:0)
-	// Proof Skipped: Homa TotalStakingBonded (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Homa ToBondPool (r:1 w:0)
-	// Proof Skipped: Homa ToBondPool (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Tokens TotalIssuance (r:2 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Homa TotalVoidLiquid (r:1 w:0)
-	// Proof Skipped: Homa TotalVoidLiquid (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: AssetRegistry AssetMetadatas (r:1 w:0)
-	// Proof Skipped: AssetRegistry AssetMetadatas (max_values: None, max_size: None, mode: Measured)
+	// Storage: `StableAsset::Pools` (r:1 w:1)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `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: `Tokens::Accounts` (r:10 w:10)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalStakingBonded` (r:1 w:0)
+	// Proof: `Homa::TotalStakingBonded` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Homa::ToBondPool` (r:1 w:0)
+	// Proof: `Homa::ToBondPool` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Tokens::TotalIssuance` (r:2 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Homa::TotalVoidLiquid` (r:1 w:0)
+	// Proof: `Homa::TotalVoidLiquid` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `AssetRegistry::AssetMetadatas` (r:1 w:0)
+	// Proof: `AssetRegistry::AssetMetadatas` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `u` is `[2, 5]`.
 	fn redeem_multi(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2179 + u * (300 ±0)`
-		//  Estimated: `29495 + u * (7687 ±2)`
-		// Minimum execution time: 151_266 nanoseconds.
-		Weight::from_parts(90_953_279, 29495)
-			// Standard Error: 231_772
-			.saturating_add(Weight::from_parts(33_895_450, 0).saturating_mul(u.into()))
+		//  Measured:  `2434 + u * (247 ±0)`
+		//  Estimated: `5913 + u * (5244 ±0)`
+		// Minimum execution time: 174_039 nanoseconds.
+		Weight::from_parts(108_619_747, 5913)
+			// Standard Error: 250_687
+			.saturating_add(Weight::from_parts(36_507_531, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 7687).saturating_mul(u.into()))
+			.saturating_add(Weight::from_parts(0, 5244).saturating_mul(u.into()))
 	}
 }
diff --git a/runtime/karura/src/weights/orml_auction.rs b/runtime/karura/src/weights/orml_auction.rs
index 1cceb083b4..5c5472d960 100644
--- a/runtime/karura/src/weights/orml_auction.rs
+++ b/runtime/karura/src/weights/orml_auction.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for orml_auction
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,64 +47,64 @@ use sp_std::marker::PhantomData;
 /// Weight functions for orml_auction.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_auction::WeightInfo for WeightInfo<T> {
-	// Storage: Auction Auctions (r:1 w:1)
-	// Proof: Auction Auctions (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	// Storage: AuctionManager CollateralAuctions (r:1 w:1)
-	// Proof: AuctionManager CollateralAuctions (max_values: None, max_size: Some(139), added: 2614, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:3 w:3)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	// Storage: Auction AuctionEndTime (r:0 w:2)
-	// Proof: Auction AuctionEndTime (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen)
+	// Storage: `Auction::Auctions` (r:1 w:1)
+	// Proof: `Auction::Auctions` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::CollateralAuctions` (r:1 w:1)
+	// Proof: `AuctionManager::CollateralAuctions` (`max_values`: None, `max_size`: Some(139), added: 2614, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:3 w:3)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `Auction::AuctionEndTime` (r:0 w:2)
+	// Proof: `Auction::AuctionEndTime` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
 	fn bid_collateral_auction() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2436`
-		//  Estimated: `23113`
-		// Minimum execution time: 105_400 nanoseconds.
-		Weight::from_parts(108_931_000, 23113)
+		//  Measured:  `2437`
+		//  Estimated: `8856`
+		// Minimum execution time: 104_361 nanoseconds.
+		Weight::from_parts(106_553_000, 8856)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
-	// Storage: Auction AuctionEndTime (r:101 w:100)
-	// Proof: Auction AuctionEndTime (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen)
-	// Storage: Auction Auctions (r:100 w:100)
-	// Proof: Auction Auctions (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
-	// Storage: AuctionManager CollateralAuctions (r:100 w:100)
-	// Proof: AuctionManager CollateralAuctions (max_values: None, max_size: Some(139), added: 2614, mode: MaxEncodedLen)
-	// Storage: Tokens Accounts (r:2 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalCollateralInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalCollateralInAuction (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: Dex TradingPairStatuses (r:2 w:0)
-	// Proof: Dex TradingPairStatuses (max_values: None, max_size: Some(195), added: 2670, mode: MaxEncodedLen)
-	// Storage: StableAsset Pools (r:1 w:0)
-	// Proof Skipped: StableAsset Pools (max_values: None, max_size: None, mode: Measured)
-	// Storage: AggregatedDex AggregatedSwapPaths (r:1 w:0)
-	// Proof Skipped: AggregatedDex AggregatedSwapPaths (max_values: None, max_size: None, mode: Measured)
-	// Storage: CdpTreasury DebitPool (r:1 w:1)
-	// Proof: CdpTreasury DebitPool (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: AuctionManager TotalTargetInAuction (r:1 w:1)
-	// Proof: AuctionManager TotalTargetInAuction (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	// Storage: `Auction::AuctionEndTime` (r:101 w:100)
+	// Proof: `Auction::AuctionEndTime` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
+	// Storage: `Auction::Auctions` (r:100 w:100)
+	// Proof: `Auction::Auctions` (`max_values`: None, `max_size`: Some(70), added: 2545, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::CollateralAuctions` (r:100 w:100)
+	// Proof: `AuctionManager::CollateralAuctions` (`max_values`: None, `max_size`: Some(139), added: 2614, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::Accounts` (r:2 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalCollateralInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalCollateralInAuction` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `Dex::TradingPairStatuses` (r:2 w:0)
+	// Proof: `Dex::TradingPairStatuses` (`max_values`: None, `max_size`: Some(195), added: 2670, mode: `MaxEncodedLen`)
+	// Storage: `StableAsset::Pools` (r:1 w:0)
+	// Proof: `StableAsset::Pools` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `AggregatedDex::AggregatedSwapPaths` (r:1 w:0)
+	// Proof: `AggregatedDex::AggregatedSwapPaths` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `CdpTreasury::DebitPool` (r:1 w:1)
+	// Proof: `CdpTreasury::DebitPool` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `AuctionManager::TotalTargetInAuction` (r:1 w:1)
+	// Proof: `AuctionManager::TotalTargetInAuction` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 100]`.
 	fn on_finalize(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2566 + c * (981 ±0)`
-		//  Estimated: `46369 + c * (9628 ±0)`
-		// Minimum execution time: 107_046 nanoseconds.
-		Weight::from_parts(61_452_358, 46369)
-			// Standard Error: 16_904
-			.saturating_add(Weight::from_parts(46_814_183, 0).saturating_mul(c.into()))
+		//  Measured:  `2600 + c * (981 ±0)`
+		//  Estimated: `6330 + c * (2614 ±0)`
+		// Minimum execution time: 103_676 nanoseconds.
+		Weight::from_parts(38_765_912, 6330)
+			// Standard Error: 36_545
+			.saturating_add(Weight::from_parts(46_294_289, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(13))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(7))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 9628).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(0, 2614).saturating_mul(c.into()))
 	}
 }
diff --git a/runtime/karura/src/weights/orml_authority.rs b/runtime/karura/src/weights/orml_authority.rs
index b1d5dfe981..55b96798dd 100644
--- a/runtime/karura/src/weights/orml_authority.rs
+++ b/runtime/karura/src/weights/orml_authority.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for orml_authority
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -50,109 +49,109 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_authority::WeightInfo for WeightInfo<T> {
 	fn dispatch_as() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `964`
+		//  Measured:  `965`
 		//  Estimated: `0`
-		// Minimum execution time: 16_750 nanoseconds.
-		Weight::from_parts(17_299_000, 0)
+		// Minimum execution time: 16_773 nanoseconds.
+		Weight::from_parts(17_403_000, 0)
 	}
-	// Storage: Authority NextTaskIndex (r:1 w:1)
-	// Proof Skipped: Authority NextTaskIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Scheduler Lookup (r:1 w:1)
-	// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	// Storage: Scheduler Agenda (r:1 w:1)
-	// Proof: Scheduler Agenda (max_values: None, max_size: Some(7853), added: 10328, mode: MaxEncodedLen)
+	// Storage: `Authority::NextTaskIndex` (r:1 w:1)
+	// Proof: `Authority::NextTaskIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Scheduler::Lookup` (r:1 w:1)
+	// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	// Storage: `Scheduler::Agenda` (r:1 w:1)
+	// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(7853), added: 10328, mode: `MaxEncodedLen`)
 	fn schedule_dispatch_without_delay() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1110`
-		//  Estimated: `17426`
-		// Minimum execution time: 31_600 nanoseconds.
-		Weight::from_parts(32_338_000, 17426)
+		//  Measured:  `1111`
+		//  Estimated: `11318`
+		// Minimum execution time: 32_051 nanoseconds.
+		Weight::from_parts(32_522_000, 11318)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Authority NextTaskIndex (r:1 w:1)
-	// Proof Skipped: Authority NextTaskIndex (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Scheduler Lookup (r:1 w:1)
-	// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	// Storage: Scheduler Agenda (r:1 w:1)
-	// Proof: Scheduler Agenda (max_values: None, max_size: Some(7853), added: 10328, mode: MaxEncodedLen)
+	// Storage: `Authority::NextTaskIndex` (r:1 w:1)
+	// Proof: `Authority::NextTaskIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Scheduler::Lookup` (r:1 w:1)
+	// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	// Storage: `Scheduler::Agenda` (r:1 w:1)
+	// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(7853), added: 10328, mode: `MaxEncodedLen`)
 	fn schedule_dispatch_with_delay() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1110`
-		//  Estimated: `17426`
-		// Minimum execution time: 32_590 nanoseconds.
-		Weight::from_parts(33_390_000, 17426)
+		//  Measured:  `1111`
+		//  Estimated: `11318`
+		// Minimum execution time: 32_919 nanoseconds.
+		Weight::from_parts(33_422_000, 11318)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Scheduler Lookup (r:1 w:1)
-	// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	// Storage: Scheduler Agenda (r:2 w:2)
-	// Proof: Scheduler Agenda (max_values: None, max_size: Some(7853), added: 10328, mode: MaxEncodedLen)
+	// Storage: `Scheduler::Lookup` (r:1 w:1)
+	// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	// Storage: `Scheduler::Agenda` (r:2 w:2)
+	// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(7853), added: 10328, mode: `MaxEncodedLen`)
 	fn fast_track_scheduled_dispatch() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1187`
-		//  Estimated: `25159`
-		// Minimum execution time: 42_063 nanoseconds.
-		Weight::from_parts(43_074_000, 25159)
+		//  Measured:  `1188`
+		//  Estimated: `21646`
+		// Minimum execution time: 41_907 nanoseconds.
+		Weight::from_parts(42_500_000, 21646)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Scheduler Lookup (r:1 w:1)
-	// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	// Storage: Scheduler Agenda (r:2 w:2)
-	// Proof: Scheduler Agenda (max_values: None, max_size: Some(7853), added: 10328, mode: MaxEncodedLen)
+	// Storage: `Scheduler::Lookup` (r:1 w:1)
+	// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	// Storage: `Scheduler::Agenda` (r:2 w:2)
+	// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(7853), added: 10328, mode: `MaxEncodedLen`)
 	fn delay_scheduled_dispatch() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1187`
-		//  Estimated: `25159`
-		// Minimum execution time: 41_887 nanoseconds.
-		Weight::from_parts(43_083_000, 25159)
+		//  Measured:  `1188`
+		//  Estimated: `21646`
+		// Minimum execution time: 42_083 nanoseconds.
+		Weight::from_parts(42_422_000, 21646)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Scheduler Lookup (r:1 w:1)
-	// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	// Storage: Scheduler Agenda (r:1 w:1)
-	// Proof: Scheduler Agenda (max_values: None, max_size: Some(7853), added: 10328, mode: MaxEncodedLen)
+	// Storage: `Scheduler::Lookup` (r:1 w:1)
+	// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	// Storage: `Scheduler::Agenda` (r:1 w:1)
+	// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(7853), added: 10328, mode: `MaxEncodedLen`)
 	fn cancel_scheduled_dispatch() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1187`
-		//  Estimated: `14831`
-		// Minimum execution time: 32_636 nanoseconds.
-		Weight::from_parts(33_658_000, 14831)
+		//  Measured:  `1188`
+		//  Estimated: `11318`
+		// Minimum execution time: 32_898 nanoseconds.
+		Weight::from_parts(33_329_000, 11318)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: Authority SavedCalls (r:0 w:1)
-	// Proof Skipped: Authority SavedCalls (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Authority::SavedCalls` (r:0 w:1)
+	// Proof: `Authority::SavedCalls` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn authorize_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `964`
-		//  Estimated: `964`
-		// Minimum execution time: 16_762 nanoseconds.
-		Weight::from_parts(17_288_000, 964)
+		//  Measured:  `965`
+		//  Estimated: `965`
+		// Minimum execution time: 16_695 nanoseconds.
+		Weight::from_parts(17_434_000, 965)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Authority SavedCalls (r:1 w:1)
-	// Proof Skipped: Authority SavedCalls (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Authority::SavedCalls` (r:1 w:1)
+	// Proof: `Authority::SavedCalls` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn remove_authorized_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1305`
-		//  Estimated: `4770`
-		// Minimum execution time: 21_937 nanoseconds.
-		Weight::from_parts(22_578_000, 4770)
+		//  Measured:  `1306`
+		//  Estimated: `4771`
+		// Minimum execution time: 22_242 nanoseconds.
+		Weight::from_parts(22_769_000, 4771)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Authority SavedCalls (r:1 w:1)
-	// Proof Skipped: Authority SavedCalls (max_values: None, max_size: None, mode: Measured)
+	// Storage: `Authority::SavedCalls` (r:1 w:1)
+	// Proof: `Authority::SavedCalls` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn trigger_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1305`
-		//  Estimated: `4770`
-		// Minimum execution time: 28_122 nanoseconds.
-		Weight::from_parts(28_545_000, 4770)
+		//  Measured:  `1306`
+		//  Estimated: `4771`
+		// Minimum execution time: 27_813 nanoseconds.
+		Weight::from_parts(28_300_000, 4771)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/karura/src/weights/orml_oracle.rs b/runtime/karura/src/weights/orml_oracle.rs
index fa5395409b..1ee0f6ea57 100644
--- a/runtime/karura/src/weights/orml_oracle.rs
+++ b/runtime/karura/src/weights/orml_oracle.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for orml_oracle
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,39 +47,39 @@ use sp_std::marker::PhantomData;
 /// Weight functions for orml_oracle.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_oracle::WeightInfo for WeightInfo<T> {
-	// Storage: AcalaOracle HasDispatched (r:1 w:1)
-	// Proof: AcalaOracle HasDispatched (max_values: Some(1), max_size: Some(641), added: 1136, mode: MaxEncodedLen)
-	// Storage: Timestamp Now (r:1 w:0)
-	// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	// Storage: OperatorMembershipAcala Members (r:1 w:0)
-	// Proof: OperatorMembershipAcala Members (max_values: Some(1), max_size: Some(1601), added: 2096, mode: MaxEncodedLen)
-	// Storage: AcalaOracle Values (r:4 w:0)
-	// Proof: AcalaOracle Values (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen)
-	// Storage: AcalaOracle RawValues (r:0 w:4)
-	// Proof: AcalaOracle RawValues (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen)
+	// Storage: `AcalaOracle::HasDispatched` (r:1 w:1)
+	// Proof: `AcalaOracle::HasDispatched` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
+	// Storage: `Timestamp::Now` (r:1 w:0)
+	// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	// Storage: `OperatorMembershipAcala::Members` (r:1 w:0)
+	// Proof: `OperatorMembershipAcala::Members` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::Values` (r:4 w:0)
+	// Proof: `AcalaOracle::Values` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	// Storage: `AcalaOracle::RawValues` (r:0 w:4)
+	// Proof: `AcalaOracle::RawValues` (`max_values`: None, `max_size`: Some(115), added: 2590, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 4]`.
 	fn feed_values(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1203 + c * (16 ±0)`
-		//  Estimated: `7695 + c * (2550 ±0)`
-		// Minimum execution time: 21_166 nanoseconds.
-		Weight::from_parts(23_173_269, 7695)
-			// Standard Error: 45_113
-			.saturating_add(Weight::from_parts(6_952_911, 0).saturating_mul(c.into()))
+		//  Measured:  `1204 + c * (16 ±0)`
+		//  Estimated: `3086 + c * (2550 ±0)`
+		// Minimum execution time: 20_690 nanoseconds.
+		Weight::from_parts(22_556_946, 3086)
+			// Standard Error: 45_402
+			.saturating_add(Weight::from_parts(6_571_444, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
 			.saturating_add(Weight::from_parts(0, 2550).saturating_mul(c.into()))
 	}
-	// Storage: AcalaOracle HasDispatched (r:0 w:1)
-	// Proof: AcalaOracle HasDispatched (max_values: Some(1), max_size: Some(641), added: 1136, mode: MaxEncodedLen)
+	// Storage: `AcalaOracle::HasDispatched` (r:0 w:1)
+	// Proof: `AcalaOracle::HasDispatched` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn on_finalize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `839`
+		//  Measured:  `840`
 		//  Estimated: `0`
-		// Minimum execution time: 7_213 nanoseconds.
-		Weight::from_parts(7_444_000, 0)
+		// Minimum execution time: 7_142 nanoseconds.
+		Weight::from_parts(7_268_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/runtime/karura/src/weights/orml_tokens.rs b/runtime/karura/src/weights/orml_tokens.rs
index e9f82f5773..92e23bfae1 100644
--- a/runtime/karura/src/weights/orml_tokens.rs
+++ b/runtime/karura/src/weights/orml_tokens.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for orml_tokens
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,74 +47,74 @@ use sp_std::marker::PhantomData;
 /// Weight functions for orml_tokens.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_tokens::WeightInfo for WeightInfo<T> {
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1544`
-		//  Estimated: `13352`
-		// Minimum execution time: 52_700 nanoseconds.
-		Weight::from_parts(53_621_000, 13352)
+		//  Measured:  `1545`
+		//  Estimated: `6234`
+		// Minimum execution time: 51_534 nanoseconds.
+		Weight::from_parts(52_581_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: EvmAccounts EvmAddresses (r:1 w:0)
-	// Proof: EvmAccounts EvmAddresses (max_values: None, max_size: Some(60), added: 2535, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `EvmAccounts::EvmAddresses` (r:1 w:0)
+	// Proof: `EvmAccounts::EvmAddresses` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_all() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1544`
-		//  Estimated: `13352`
-		// Minimum execution time: 55_524 nanoseconds.
-		Weight::from_parts(56_702_000, 13352)
+		//  Measured:  `1545`
+		//  Estimated: `6234`
+		// Minimum execution time: 54_232 nanoseconds.
+		Weight::from_parts(55_121_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, 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::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_keep_alive() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1295`
-		//  Estimated: `9827`
-		// Minimum execution time: 39_872 nanoseconds.
-		Weight::from_parts(41_257_000, 9827)
+		//  Measured:  `1296`
+		//  Estimated: `6234`
+		// Minimum execution time: 38_688 nanoseconds.
+		Weight::from_parts(39_179_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Tokens Accounts (r:2 w:2)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: `Tokens::Accounts` (r:2 w:2)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:2 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn force_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1431`
-		//  Estimated: `12430`
-		// Minimum execution time: 43_190 nanoseconds.
-		Weight::from_parts(43_834_000, 12430)
+		//  Measured:  `1432`
+		//  Estimated: `6234`
+		// Minimum execution time: 40_911 nanoseconds.
+		Weight::from_parts(41_997_000, 6234)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Tokens Accounts (r:1 w:1)
-	// Proof: Tokens Accounts (max_values: None, max_size: Some(147), added: 2622, mode: MaxEncodedLen)
-	// Storage: Tokens TotalIssuance (r:1 w:1)
-	// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(67), added: 2542, 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::Accounts` (r:1 w:1)
+	// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(147), added: 2622, mode: `MaxEncodedLen`)
+	// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn set_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1127`
-		//  Estimated: `10737`
-		// Minimum execution time: 32_981 nanoseconds.
-		Weight::from_parts(33_959_000, 10737)
+		//  Measured:  `1128`
+		//  Estimated: `3612`
+		// Minimum execution time: 31_717 nanoseconds.
+		Weight::from_parts(32_655_000, 3612)
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
diff --git a/runtime/karura/src/weights/orml_vesting.rs b/runtime/karura/src/weights/orml_vesting.rs
index 9bc5a37b3b..305ccf1ee9 100644
--- a/runtime/karura/src/weights/orml_vesting.rs
+++ b/runtime/karura/src/weights/orml_vesting.rs
@@ -19,9 +19,9 @@
 //! Autogenerated weights for orml_vesting
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-35-209`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
+//! DATE: 2023-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-46-22`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("karura-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/acala
@@ -32,7 +32,6 @@
 // --repeat=20
 // --pallet=*
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./templates/runtime-weight-template.hbs
@@ -48,51 +47,63 @@ use sp_std::marker::PhantomData;
 /// Weight functions for orml_vesting.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_vesting::WeightInfo for WeightInfo<T> {
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Vesting VestingSchedules (r:1 w:1)
-	// Proof: Vesting VestingSchedules (max_values: None, max_size: Some(2850), added: 5325, mode: MaxEncodedLen)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Vesting::VestingSchedules` (r:1 w:1)
+	// Proof: `Vesting::VestingSchedules` (`max_values`: None, `max_size`: Some(2850), added: 5325, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Locks` (r:1 w:1)
+	// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Freezes` (r:1 w:0)
+	// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn vested_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1319`
-		//  Estimated: `9119`
-		// Minimum execution time: 25_375 nanoseconds.
-		Weight::from_parts(25_886_000, 9119)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		//  Measured:  `1621`
+		//  Estimated: `6315`
+		// Minimum execution time: 43_876 nanoseconds.
+		Weight::from_parts(44_454_000, 6315)
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: ParachainSystem ValidationData (r:1 w:0)
-	// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Vesting VestingSchedules (r:1 w:1)
-	// Proof: Vesting VestingSchedules (max_values: None, max_size: Some(2850), added: 5325, mode: MaxEncodedLen)
-	// Storage: Balances Locks (r:1 w:1)
-	// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
+	// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `Vesting::VestingSchedules` (r:1 w:1)
+	// Proof: `Vesting::VestingSchedules` (`max_values`: None, `max_size`: Some(2850), added: 5325, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Locks` (r:1 w:1)
+	// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Freezes` (r:1 w:0)
+	// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	/// The range of component `i` is `[1, 100]`.
 	fn claim(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1760`
-		//  Estimated: `14324`
-		// Minimum execution time: 38_473 nanoseconds.
-		Weight::from_parts(39_695_377, 14324)
-			// Standard Error: 661
-			.saturating_add(Weight::from_parts(2_613, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+		//  Measured:  `1761`
+		//  Estimated: `6315`
+		// Minimum execution time: 44_985 nanoseconds.
+		Weight::from_parts(46_319_549, 6315)
+			// Standard Error: 550
+			.saturating_add(Weight::from_parts(2_331, 0).saturating_mul(i.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: System Account (r:1 w:0)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: Vesting VestingSchedules (r:0 w:1)
-	// Proof: Vesting VestingSchedules (max_values: None, max_size: Some(2850), added: 5325, mode: MaxEncodedLen)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Locks` (r:1 w:1)
+	// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	// Storage: `Balances::Freezes` (r:1 w:0)
+	// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	// Storage: `Vesting::VestingSchedules` (r:0 w:1)
+	// Proof: `Vesting::VestingSchedules` (`max_values`: None, `max_size`: Some(2850), added: 5325, mode: `MaxEncodedLen`)
 	/// The range of component `i` is `[1, 100]`.
 	fn update_vesting_schedules(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1085`
-		//  Estimated: `3593`
-		// Minimum execution time: 19_104 nanoseconds.
-		Weight::from_parts(19_875_375, 3593)
-			// Standard Error: 429
-			.saturating_add(Weight::from_parts(50_288, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		//  Measured:  `1233`
+		//  Estimated: `4764`
+		// Minimum execution time: 37_232 nanoseconds.
+		Weight::from_parts(37_952_004, 4764)
+			// Standard Error: 331
+			.saturating_add(Weight::from_parts(43_506, 0).saturating_mul(i.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 }
diff --git a/runtime/karura/src/weights/pallet_xcm.rs b/runtime/karura/src/weights/pallet_xcm.rs
index 2008b5bfc4..61011a3e0e 100644
--- a/runtime/karura/src/weights/pallet_xcm.rs
+++ b/runtime/karura/src/weights/pallet_xcm.rs
@@ -22,13 +22,13 @@
 //! DATE: 2023-02-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset_hub_polkadot-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./artifacts/polkadot-parachain
 // benchmark
 // pallet
-// --chain=statemint-dev
+// --chain=asset_hub_polkadot-dev
 // --execution=wasm
 // --wasm-execution=compiled
 // --pallet=pallet_xcm
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs
+// --output=./parachains/runtimes/assets/asset_hub_polkadot/src/weights/pallet_xcm.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
diff --git a/runtime/karura/src/xcm_config.rs b/runtime/karura/src/xcm_config.rs
index 21ac8d0117..e80a81f616 100644
--- a/runtime/karura/src/xcm_config.rs
+++ b/runtime/karura/src/xcm_config.rs
@@ -240,6 +240,7 @@ impl xcm_executor::Config for XcmConfig {
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
 	type SafeCallFilter = Everything;
+	type Aliasers = Nothing;
 }
 
 pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
@@ -290,6 +291,8 @@ impl pallet_xcm::Config for Runtime {
 	#[cfg(feature = "runtime-benchmarks")]
 	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRootOrThreeFourthsGeneralCouncil;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 }
 
 impl cumulus_pallet_xcm::Config for Runtime {
@@ -339,7 +342,7 @@ parameter_type_with_key! {
 	pub ParachainMinFee: |location: MultiLocation| -> Option<u128> {
 		#[allow(clippy::match_ref_pats)] // false positive
 		match (location.parents, location.first_interior()) {
-			(1, Some(Parachain(parachains::statemine::ID))) => Some(XcmInterface::get_parachain_fee(*location)),
+			(1, Some(Parachain(parachains::asset_hub_kusama::ID))) => Some(XcmInterface::get_parachain_fee(*location)),
 			_ => None,
 		}
 	};
diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml
index f613a7437d..054fd9428c 100644
--- a/runtime/mandala/Cargo.toml
+++ b/runtime/mandala/Cargo.toml
@@ -8,72 +8,72 @@ build = "build.rs"
 [dependencies]
 smallvec = "1.4.0"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.85", default-features = false, features = ["alloc"] }
 hex = { version = "0.4", default-features = false }
-hex-literal = { version = "0.3.1" }
+hex-literal = { version = "0.4.1" }
 
 # substrate
-frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", 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 }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-pallet-aura = { 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-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features =false }
-pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-root-testing = { 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, features = ["historical"] }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-pallet-preimage = { 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-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-consensus-aura = { 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-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-offchain = { 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-session = { 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 }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
+frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
+pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false}
+pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false}
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features =false }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-root-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["historical"] }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
 
 # cumulus
-cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
-parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
+parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
 
 # polkadot
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false }
 
 # orml
 orml-auction = { path = "../../orml/auction", default-features = false }
@@ -135,19 +135,18 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path =
 
 # benchmarking deps
 libsecp256k1 = { version = "0.7", default-features = false, optional = true }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
 
 [build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true }
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 
-cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
-cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
 
 acala-service = { path = "../../node/service", features = ["with-mandala-runtime"] }
 
@@ -163,7 +162,6 @@ std = [
 	"frame-benchmarking/std",
 	"frame-executive/std",
 	"frame-support/std",
-	"frame-system-benchmarking/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
 	"frame-try-runtime/std",
@@ -283,7 +281,6 @@ runtime-benchmarks = [
 
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-bounties/runtime-benchmarks",
diff --git a/runtime/mandala/src/benchmarking/utils.rs b/runtime/mandala/src/benchmarking/utils.rs
index fd8747c109..021bf7f69c 100644
--- a/runtime/mandala/src/benchmarking/utils.rs
+++ b/runtime/mandala/src/benchmarking/utils.rs
@@ -265,9 +265,11 @@ pub fn initialize_swap_pools(maker: AccountId) -> Result<(), &'static str> {
 
 #[cfg(test)]
 pub mod tests {
+	use sp_runtime::BuildStorage;
+
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		frame_system::GenesisConfig::default()
-			.build_storage::<crate::Runtime>()
+		frame_system::GenesisConfig::<crate::Runtime>::default()
+			.build_storage()
 			.unwrap()
 			.into()
 	}
diff --git a/runtime/mandala/src/constants.rs b/runtime/mandala/src/constants.rs
index a182a7e442..b8ca07e22d 100644
--- a/runtime/mandala/src/constants.rs
+++ b/runtime/mandala/src/constants.rs
@@ -102,6 +102,6 @@ mod tests {
 		let q = Balance::from(ExtrinsicBaseWeight::get().ref_time());
 
 		assert_eq!(p, 1_000_000_000);
-		assert_eq!(q, 113_638_000);
+		assert_eq!(q, 124_414_000);
 	}
 }
diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs
index ea8f2f0393..b5348e54ce 100644
--- a/runtime/mandala/src/lib.rs
+++ b/runtime/mandala/src/lib.rs
@@ -41,7 +41,7 @@ pub use frame_support::{
 		ConstBool, ConstU128, ConstU16, ConstU32, Contains, ContainsLengthBound, Currency as PalletCurrency,
 		EnsureOrigin, EqualPrivilegeOnly, Everything, Get, Imbalance, InstanceFilter, IsSubType, IsType,
 		KeyOwnerProofSystem, LockIdentifier, Nothing, OnRuntimeUpgrade, OnUnbalanced, Randomness, SortedMembers,
-		U128CurrencyToVote, WithdrawReasons,
+		WithdrawReasons,
 	},
 	weights::{
 		constants::{BlockExecutionWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND},
@@ -222,11 +222,10 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	type RuntimeCall = RuntimeCall;
 	type Lookup = (Indices, EvmAccounts);
-	type Index = Nonce;
-	type BlockNumber = BlockNumber;
+	type Nonce = Nonce;
 	type Hash = Hash;
 	type Hashing = BlakeTwo256;
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type BlockHashCount = BlockHashCount;
@@ -252,6 +251,7 @@ impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<32>;
+	type AllowMultipleBlocksPerSlot = ConstBool<false>;
 }
 
 impl pallet_authorship::Config for Runtime {
@@ -352,7 +352,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = ReserveIdentifier;
 	type WeightInfo = ();
-	type HoldIdentifier = ReserveIdentifier;
+	type RuntimeHoldReason = ReserveIdentifier;
 	type FreezeIdentifier = ();
 	type MaxHolds = MaxReserves;
 	type MaxFreezes = ();
@@ -369,6 +369,7 @@ parameter_types! {
 impl pallet_sudo::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -761,7 +762,7 @@ impl pallet_elections_phragmen::Config for Runtime {
 	type PalletId = PhragmenElectionPalletId;
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = CurrencyAdapter<Runtime, GetLiquidCurrencyId>;
-	type CurrencyToVote = U128CurrencyToVote;
+	type CurrencyToVote = sp_staking::currency_to_vote::U128CurrencyToVote;
 	type ChangeMembers = HomaCouncil;
 	type InitializeMembers = HomaCouncil;
 	type CandidacyBond = CandidacyBond;
@@ -1997,11 +1998,7 @@ pub type Executive = frame_executive::Executive<
 >;
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = primitives::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
+	pub enum Runtime {
 		// Core
 		System: frame_system = 0,
 		Timestamp: pallet_timestamp = 1,
@@ -2090,7 +2087,7 @@ construct_runtime!(
 		CumulusXcm: cumulus_pallet_xcm exclude_parts { Call } = 172,
 		DmpQueue: cumulus_pallet_dmp_queue = 173,
 		XTokens: orml_xtokens = 174,
-		UnknownTokens: orml_unknown_tokens exclude_parts { Call } = 175,
+		UnknownTokens: orml_unknown_tokens = 175,
 		OrmlXcm: orml_xcm = 176,
 
 		// Smart contracts
@@ -2687,8 +2684,8 @@ mod tests {
 	}
 
 	fn new_test_ext() -> sp_io::TestExternalities {
-		let t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let t = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap();
 		let mut ext = sp_io::TestExternalities::new(t);
 		ext.execute_with(|| System::set_block_number(1));
diff --git a/runtime/mandala/src/weights/pallet_xcm.rs b/runtime/mandala/src/weights/pallet_xcm.rs
index 6fee58ea6f..5c9af9ea07 100644
--- a/runtime/mandala/src/weights/pallet_xcm.rs
+++ b/runtime/mandala/src/weights/pallet_xcm.rs
@@ -22,13 +22,13 @@
 //! DATE: 2023-02-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset_hub_polkadot-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./artifacts/polkadot-parachain
 // benchmark
 // pallet
-// --chain=statemint-dev
+// --chain=asset_hub_polkadot-dev
 // --execution=wasm
 // --wasm-execution=compiled
 // --pallet=pallet_xcm
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs
+// --output=./parachains/runtimes/assets/asset_hub_polkadot/src/weights/pallet_xcm.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -300,4 +300,4 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-}
\ No newline at end of file
+}
diff --git a/runtime/mandala/src/xcm_config.rs b/runtime/mandala/src/xcm_config.rs
index 95f1536dbc..4041a81e0e 100644
--- a/runtime/mandala/src/xcm_config.rs
+++ b/runtime/mandala/src/xcm_config.rs
@@ -179,6 +179,7 @@ impl xcm_executor::Config for XcmConfig {
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
 	type SafeCallFilter = Everything;
+	type Aliasers = Nothing;
 }
 
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.
@@ -230,6 +231,8 @@ impl pallet_xcm::Config for Runtime {
 	#[cfg(feature = "runtime-benchmarks")]
 	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRootOrThreeFourthsGeneralCouncil;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 }
 
 impl cumulus_pallet_xcm::Config for Runtime {
diff --git a/templates/module-weight-template.hbs b/templates/module-weight-template.hbs
index 7351ccee20..4ebda1ef52 100644
--- a/templates/module-weight-template.hbs
+++ b/templates/module-weight-template.hbs
@@ -21,7 +21,7 @@
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
 //! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
 //! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
-//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
+//! WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
 
 // Executed Command:
 {{#each args as |arg|}}
diff --git a/templates/orml-weight-template.hbs b/templates/orml-weight-template.hbs
index 9a7892a110..607f988435 100644
--- a/templates/orml-weight-template.hbs
+++ b/templates/orml-weight-template.hbs
@@ -3,7 +3,7 @@
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
 //! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
 //! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
-//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
+//! WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
 
 // Executed Command:
 {{#each args as |arg|}}
diff --git a/templates/runtime-weight-template.hbs b/templates/runtime-weight-template.hbs
index 6df2433a79..81739f75e9 100644
--- a/templates/runtime-weight-template.hbs
+++ b/templates/runtime-weight-template.hbs
@@ -21,7 +21,7 @@
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
 //! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
 //! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
-//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
+//! WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
 
 // Executed Command:
 {{#each args as |arg|}}
diff --git a/ts-tests/tests/test-balance.ts b/ts-tests/tests/test-balance.ts
index 797ebb8a92..7b9d52f97a 100644
--- a/ts-tests/tests/test-balance.ts
+++ b/ts-tests/tests/test-balance.ts
@@ -12,8 +12,8 @@ describeWithAcala("Acala RPC (Balance)", (context) => {
     });
 
     step("genesis balance is setup correctly", async function () {
-        expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999995748476214000000");
-        expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999995748476214000000");
+        expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999995937426817000000");
+        expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999995937426817000000");
 
         expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString())
             .to.equal((await context.provider.api.query.system.account(alice.substrateAddress)).data.free.toString() + "000000");
@@ -22,13 +22,13 @@ describeWithAcala("Acala RPC (Balance)", (context) => {
     step("balance to be updated after transfer", async function () {
         this.timeout(15000);
 
-        expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999995748476214000000");
-        expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000995748481646000000");
+        expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999995937426817000000");
+        expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000995937431778000000");
 
         await transfer(context, alice.substrateAddress, alice_stash.substrateAddress, 1000);
-        expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999991697813336000000");
-        expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000995748482646000000");
-        expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999991697813336000000");
+        expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999992033958023000000");
+        expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000995937432778000000");
+        expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999992033958023000000");
         expect((await context.provider.getBalance(alice_stash.getAddress(), "earliest")).toString()).to.equal("0");
     });
 });
diff --git a/ts-tests/tests/util.ts b/ts-tests/tests/util.ts
index 7678fc87de..035108b8d7 100644
--- a/ts-tests/tests/util.ts
+++ b/ts-tests/tests/util.ts
@@ -23,7 +23,6 @@ export const SPAWNING_TIME = 120000;
 export async function startAcalaNode(autoClaim = true): Promise<{ binary: ChildProcess; } & TestContext> {
 	const P2P_PORT = await getPort({ port: getPort.makeRange(19931, 22000) });
 	const RPC_PORT = await getPort({ port: getPort.makeRange(19931, 22000) });
-	const WS_PORT = await getPort({ port: getPort.makeRange(19931, 22000) });
 
 	const cmd = BINARY_PATH;
 	const args = [
@@ -31,14 +30,11 @@ export async function startAcalaNode(autoClaim = true): Promise<{ binary: ChildP
 		`-lruntime=debug`,
 		`-levm=debug`,
 		`--instant-sealing`,
-		`--execution=native`, // Faster execution using native
 		`--no-telemetry`,
 		`--no-prometheus`,
 		`--port=${P2P_PORT}`,
 		`--rpc-port=${RPC_PORT}`,
 		`--rpc-external`,
-		`--ws-port=${WS_PORT}`,
-		`--ws-external`,
 		`--rpc-cors=all`,
 		`--rpc-methods=unsafe`,
 		`--pruning=archive`,
@@ -75,7 +71,7 @@ export async function startAcalaNode(autoClaim = true): Promise<{ binary: ChildP
 			binaryLogs.push(chunk);
 			if (chunk.toString().match(/best: #0/)) {
 				try {
-					const { provider, wallets } = await getTestUtils(`ws://localhost:${WS_PORT}`, autoClaim);
+					const { provider, wallets } = await getTestUtils(`ws://localhost:${RPC_PORT}`, autoClaim);
 
 					clearTimeout(timer);
 					if (!DISPLAY_LOG) {