From f3529b61065e77805490e5098a319d94617dcdf1 Mon Sep 17 00:00:00 2001
From: Ermal Kaleci <ermalkaleci@gmail.com>
Date: Sun, 23 Jun 2024 10:50:43 +0200
Subject: [PATCH 01/10] zepter integration

---
 .github/workflows/zepter.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/zepter.yml

diff --git a/.github/workflows/zepter.yml b/.github/workflows/zepter.yml
new file mode 100644
index 0000000000..a5076948f6
--- /dev/null
+++ b/.github/workflows/zepter.yml
@@ -0,0 +1,33 @@
+name: Zepter
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - '**/README.md'
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**/README.md'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@v4
+
+    - name: Install & display rust toolchain
+      run: rustup show
+
+    - name: Install Zepter
+      run: cargo install zepter -f --locked && zepter --version
+
+    - name: Check Rust features
+      run: zepter run check

From 66d386ac3b57f2950b7501de7c47d49ea7a60f97 Mon Sep 17 00:00:00 2001
From: Ermal Kaleci <ermalkaleci@gmail.com>
Date: Sun, 23 Jun 2024 10:58:44 +0200
Subject: [PATCH 02/10] add zepter config file

---
 .config/zepter.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 .config/zepter.yml

diff --git a/.config/zepter.yml b/.config/zepter.yml
new file mode 100644
index 0000000000..3abeccb49d
--- /dev/null
+++ b/.config/zepter.yml
@@ -0,0 +1,49 @@
+# Configuration for the Zepter CLI to ensure correct feature configuration in the Rust workspace.
+# <https://crates.io/crates/zepter>
+
+version:
+  # File format for parsing it:
+  format: 1
+  # Minimum version of the binary that is expected to work. This is just for printing a nice error
+  # message when someone tries to use an older version.
+  binary: 1.5.0
+
+# The examples in this file assume crate `A` to have a dependency on crate `B`.
+workflows:
+  # Check that everything is good without modifying anything:
+  check:
+    - [
+        'lint',
+        # Check that `A` activates the features of `B`.
+        'propagate-feature',
+        # These are the features to check:
+        '--features=try-runtime,runtime-benchmarks,evm-tracing,std',
+        # Ignore the features of dependencies that are exclusively used as dev or build.
+        '--dep-kinds=normal:check,dev:ignore,build:ignore',
+        # Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
+        '--left-side-feature-missing=ignore',
+        # Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
+        '--left-side-outside-workspace=ignore',
+        # Some features imply that they activate a specific dependency as non-optional. Otherwise the default behaviour with a `?` is used.
+        '--feature-enables-dep=try-runtime:frame-try-runtime,runtime-benchmarks:frame-benchmarking',
+        # Show the paths of failed crates to have them clickable in the terminal: 
+        '--show-path',
+        # Aux
+        '--offline',
+        '--locked',
+        '--quiet',
+      ]
+      # Format the features into canonical format:
+    - ['format', 'features', '--offline', '--locked', '--quiet']
+  # Same as `check`, but actually fix the issues instead of just reporting them:
+  default:
+    - [ $check.0, '--fix' ]
+    - [ $check.1, '--fix' ]
+
+# Will be displayed when any workflow fails:
+help:
+  text: |
+    Astar uses the Zepter CLI to detect abnormalities in the feature configuration.
+    It looks like at least one check failed; please see the console output. You can try to automatically address them by running `zepter`.
+  links:
+    - "https://github.com/ggwpez/zepter"

From 2252f9699fd13d6aa2f6f2c274e4ec6c7cc9aae4 Mon Sep 17 00:00:00 2001
From: Ermal Kaleci <ermalkaleci@gmail.com>
Date: Sun, 23 Jun 2024 11:03:32 +0200
Subject: [PATCH 03/10] update gha

---
 .github/workflows/zepter.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/zepter.yml b/.github/workflows/zepter.yml
index a5076948f6..5a18129100 100644
--- a/.github/workflows/zepter.yml
+++ b/.github/workflows/zepter.yml
@@ -23,6 +23,9 @@ jobs:
     - name: Checkout the source code
       uses: actions/checkout@v4
 
+    - name: Install deps
+      run: sudo apt -y install protobuf-compiler
+
     - name: Install & display rust toolchain
       run: rustup show
 

From 9bd3d219091c3e6aea5c986b4e36a02e508e604a Mon Sep 17 00:00:00 2001
From: Ermal Kaleci <ermalkaleci@gmail.com>
Date: Sun, 23 Jun 2024 11:06:59 +0200
Subject: [PATCH 04/10] bump rust version

---
 rust-toolchain.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index e850fef942..645529a5dd 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.73.0"
+channel = "1.74.0"
 components = ["rustfmt", "clippy"]
 targets = ["wasm32-unknown-unknown"]
 profile = "minimal"

From 7c334fb70de377187bb4c415e852d7e8971e5569 Mon Sep 17 00:00:00 2001
From: Ermal Kaleci <ermalkaleci@gmail.com>
Date: Sun, 23 Jun 2024 11:09:34 +0200
Subject: [PATCH 05/10] rename config

---
 .config/{zepter.yml => zepter.yaml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .config/{zepter.yml => zepter.yaml} (100%)

diff --git a/.config/zepter.yml b/.config/zepter.yaml
similarity index 100%
rename from .config/zepter.yml
rename to .config/zepter.yaml

From 83c56063910394096c3ba64b496b3bf746b90a0e Mon Sep 17 00:00:00 2001
From: Ermal Kaleci <ermalkaleci@gmail.com>
Date: Sun, 23 Jun 2024 11:34:47 +0200
Subject: [PATCH 06/10] remove taplo in favor of zepter

---
 .github/workflows/static-analysis.yml         |   9 -
 bin/collator/Cargo.toml                       |  52 +++-
 chain-extensions/pallet-assets/Cargo.toml     |  31 ++-
 chain-extensions/types/assets/Cargo.toml      |   4 +-
 .../types/unified-accounts/Cargo.toml         |   2 +-
 chain-extensions/types/xvm/Cargo.toml         |   4 +-
 chain-extensions/unified-accounts/Cargo.toml  |  15 +-
 chain-extensions/xvm/Cargo.toml               |  14 +-
 pallets/astar-xcm-benchmarks/Cargo.toml       |  24 +-
 pallets/collator-selection/Cargo.toml         |  32 ++-
 pallets/dapp-staking-migration/Cargo.toml     |  32 ++-
 pallets/dapp-staking-v3/Cargo.toml            |  32 ++-
 .../rpc/runtime-api/Cargo.toml                |   8 +-
 pallets/dynamic-evm-base-fee/Cargo.toml       |  22 +-
 pallets/ethereum-checked/Cargo.toml           |  40 +--
 pallets/inflation/Cargo.toml                  |  26 +-
 pallets/oracle-benchmarks/Cargo.toml          |  29 +-
 pallets/price-aggregator/Cargo.toml           |  30 +-
 pallets/static-price-provider/Cargo.toml      |  28 +-
 pallets/unified-accounts/Cargo.toml           |  38 ++-
 pallets/xc-asset-config/Cargo.toml            |  18 +-
 pallets/xvm/Cargo.toml                        |  22 +-
 precompiles/assets-erc20/Cargo.toml           |  17 +-
 precompiles/dapp-staking-v3/Cargo.toml        |  25 +-
 precompiles/dispatch-lockdrop/Cargo.toml      |  22 +-
 precompiles/sr25519/Cargo.toml                |   8 +-
 precompiles/substrate-ecdsa/Cargo.toml        |   9 +-
 precompiles/unified-accounts/Cargo.toml       |  13 +-
 precompiles/utils/Cargo.toml                  |  20 +-
 precompiles/utils/macro/Cargo.toml            |   3 +-
 precompiles/xcm/Cargo.toml                    |  36 ++-
 precompiles/xvm/Cargo.toml                    |  11 +-
 primitives/Cargo.toml                         |  51 ++--
 runtime/astar/Cargo.toml                      | 233 +++++++++-------
 runtime/local/Cargo.toml                      | 119 ++++----
 runtime/shibuya/Cargo.toml                    | 262 ++++++++++--------
 runtime/shiden/Cargo.toml                     | 232 +++++++++-------
 taplo.toml                                    |  37 ---
 tests/integration/Cargo.toml                  |  54 +++-
 tests/utils/Cargo.toml                        |   8 +-
 tests/xcm-simulator/Cargo.toml                |  52 ++--
 vendor/primitives/debug/Cargo.toml            |   6 +-
 .../primitives/evm-tracing-events/Cargo.toml  |   6 +-
 vendor/primitives/txpool/Cargo.toml           |   4 +-
 vendor/runtime/evm-tracer/Cargo.toml          |   5 +-
 vendor/runtime/ext/Cargo.toml                 |   4 +-
 46 files changed, 1045 insertions(+), 704 deletions(-)
 delete mode 100644 taplo.toml

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index e193a2a728..0f5dca7053 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -24,15 +24,6 @@ jobs:
       - name: Check fmt
         run: cargo fmt -- --check
 
-      - name: Check Cargo.toml format
-        run: |
-          if taplo --version &> /dev/null; then
-            echo "taplo-cli is already installed"
-          else
-            cargo install taplo-cli
-          fi
-          taplo fmt --check
-
   clippy:
     if: github.event.pull_request.draft == false
     runs-on: [self-hosted, Linux, X64]
diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
index 75a043b652..98a64e6814 100644
--- a/bin/collator/Cargo.toml
+++ b/bin/collator/Cargo.toml
@@ -154,28 +154,58 @@ sc-service = { workspace = true, optional = true }
 substrate-build-script-utils = { workspace = true }
 
 [features]
-default = ["sc-cli", "polkadot-cli", "sc-service", "sc-service/rocksdb"]
+default = [ "polkadot-cli", "sc-cli", "sc-service", "sc-service/rocksdb" ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
+	"astar-runtime/runtime-benchmarks",
 	"frame-benchmarking-cli",
+	"frame-benchmarking-cli?/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 	"local-runtime/runtime-benchmarks",
-	"shibuya-runtime/runtime-benchmarks",
-	"shiden-runtime/runtime-benchmarks",
-	"astar-runtime/runtime-benchmarks",
+	"pallet-ethereum/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
 	"polkadot-cli/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common",
 	"polkadot-runtime-common/std",
+	"polkadot-runtime-common?/runtime-benchmarks",
+	"polkadot-service/runtime-benchmarks",
+	"sc-client-db/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+	"shibuya-runtime/runtime-benchmarks",
+	"shiden-runtime/runtime-benchmarks",
 	"sp-keyring",
-	"polkadot-runtime-common",
-	"astar-primitives/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+cli = [ "try-runtime-cli" ]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"astar-runtime/try-runtime",
+	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"local-runtime/try-runtime",
+	"pallet-ethereum/try-runtime",
+	"pallet-evm/try-runtime",
+	"pallet-transaction-payment/try-runtime",
+	"polkadot-cli?/try-runtime",
+	"polkadot-runtime-common?/try-runtime",
+	"polkadot-service/try-runtime",
+	"shibuya-runtime/try-runtime",
+	"shiden-runtime/try-runtime",
+	"sp-runtime/try-runtime",
+	"try-runtime-cli/try-runtime",
 ]
-cli = ["try-runtime-cli"]
-try-runtime = ["local-runtime/try-runtime", "try-runtime-cli/try-runtime"]
 evm-tracing = [
+	"astar-runtime/evm-tracing",
+	"local-runtime/evm-tracing",
 	"moonbeam-rpc-debug",
 	"moonbeam-rpc-primitives-debug",
 	"moonbeam-rpc-primitives-txpool",
 	"moonbeam-rpc-trace",
 	"moonbeam-rpc-txpool",
+	"shibuya-runtime/evm-tracing",
+	"shiden-runtime/evm-tracing",
 ]
-manual-seal = [
-	"sc-consensus-manual-seal",
-]
+manual-seal = [ "sc-consensus-manual-seal" ]
diff --git a/chain-extensions/pallet-assets/Cargo.toml b/chain-extensions/pallet-assets/Cargo.toml
index 0bd86ecf95..93e3b76655 100644
--- a/chain-extensions/pallet-assets/Cargo.toml
+++ b/chain-extensions/pallet-assets/Cargo.toml
@@ -30,21 +30,34 @@ pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	"assets-chain-extension-types/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"num-traits/std",
-	"pallet-contracts/std",
+	"pallet-assets/std",
+	"pallet-balances/std",
 	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
+	"parity-scale-codec/std",
 	"scale-info/std",
-	"sp-std/std",
 	"sp-core/std",
 	"sp-runtime/std",
-	"pallet-assets/std",
-	"assets-chain-extension-types/std",
-	"pallet-balances/std",
+	"sp-std/std",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-contracts/try-runtime",
+	"sp-runtime/try-runtime",
+]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
-runtime-benchmarks = ["pallet-assets/runtime-benchmarks"]
diff --git a/chain-extensions/types/assets/Cargo.toml b/chain-extensions/types/assets/Cargo.toml
index ddb1119268..e7bf6aa0a5 100644
--- a/chain-extensions/types/assets/Cargo.toml
+++ b/chain-extensions/types/assets/Cargo.toml
@@ -15,10 +15,10 @@ scale-info = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"num_enum/std",
-	"scale-info/std",
 	"parity-scale-codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 ]
diff --git a/chain-extensions/types/unified-accounts/Cargo.toml b/chain-extensions/types/unified-accounts/Cargo.toml
index 340f7195ee..d16e282d82 100644
--- a/chain-extensions/types/unified-accounts/Cargo.toml
+++ b/chain-extensions/types/unified-accounts/Cargo.toml
@@ -17,7 +17,7 @@ sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"num_enum/std",
 	"parity-scale-codec/std",
diff --git a/chain-extensions/types/xvm/Cargo.toml b/chain-extensions/types/xvm/Cargo.toml
index e9888174c8..da09855f96 100644
--- a/chain-extensions/types/xvm/Cargo.toml
+++ b/chain-extensions/types/xvm/Cargo.toml
@@ -16,11 +16,11 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
+	"astar-primitives/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"astar-primitives/std",
 ]
diff --git a/chain-extensions/unified-accounts/Cargo.toml b/chain-extensions/unified-accounts/Cargo.toml
index 5f6e4e4b8f..ac5b1be27b 100644
--- a/chain-extensions/unified-accounts/Cargo.toml
+++ b/chain-extensions/unified-accounts/Cargo.toml
@@ -27,21 +27,22 @@ pallet-unified-accounts = { workspace = true }
 unified-accounts-chain-extension-types = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	# Astar
+	"astar-primitives/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"num-traits/std",
+	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
 	"pallet-evm/std",
-	"pallet-contracts-primitives/std",
+	"pallet-unified-accounts/std",
+	"parity-scale-codec/std",
 	"scale-info/std",
-	"sp-std/std",
 	"sp-core/std",
 	"sp-runtime/std",
-	# Astar
-	"astar-primitives/std",
-	"pallet-unified-accounts/std",
+	"sp-std/std",
 	"unified-accounts-chain-extension-types/std",
 ]
diff --git a/chain-extensions/xvm/Cargo.toml b/chain-extensions/xvm/Cargo.toml
index 11ac1ed5e1..a5463399e9 100644
--- a/chain-extensions/xvm/Cargo.toml
+++ b/chain-extensions/xvm/Cargo.toml
@@ -27,19 +27,21 @@ astar-primitives = { workspace = true }
 xvm-chain-extension-types = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	# Astar
+	"astar-primitives/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"num-traits/std",
-	"pallet-contracts/std",
 	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
 	"pallet-unified-accounts/std",
+	"parity-scale-codec/std",
 	"scale-info/std",
-	"sp-std/std",
 	"sp-core/std",
 	"sp-runtime/std",
-	# Astar
-	"astar-primitives/std",
+	"sp-std/std",
+	"xvm-chain-extension-types/std",
 ]
diff --git a/pallets/astar-xcm-benchmarks/Cargo.toml b/pallets/astar-xcm-benchmarks/Cargo.toml
index db29f90c9e..6dcaadac20 100644
--- a/pallets/astar-xcm-benchmarks/Cargo.toml
+++ b/pallets/astar-xcm-benchmarks/Cargo.toml
@@ -16,7 +16,9 @@ serde = { workspace = true, optional = true }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-parity-scale-codec = { workspace = true, optional = true, features = ["derive"] }
+parity-scale-codec = { workspace = true, optional = true, features = [
+    "derive",
+] }
 scale-info = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
@@ -40,28 +42,40 @@ sp-io = { workspace = true, features = ["std"] }
 xcm-builder = { workspace = true, features = ["std"] }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-xcm-benchmarks/std",
 	"parity-scale-codec/std",
+	"scale-info/std",
 	"serde",
-	"sp-std/std",
+	"serde?/std",
 	"sp-runtime/std",
+	"sp-std/std",
+	"xcm-executor/std",
 	"xcm/std",
 ]
 
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
 
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-system/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"parity-scale-codec",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
index a7807ed64c..ff71691cac 100644
--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -39,27 +39,37 @@ sp-io = { workspace = true }
 sp-tracing = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 ]
 std = [
-	"parity-scale-codec/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
 	"log/std",
-	"scale-info/std",
+	"pallet-aura/std",
+	"pallet-authorship/std",
+	"pallet-balances/std",
+	"pallet-session/std",
+	"parity-scale-codec/std",
 	"rand/std",
+	"scale-info/std",
+	"serde/std",
 	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-std/std",
-	"frame-support/std",
-	"frame-system/std",
-	"frame-benchmarking/std",
-	"pallet-authorship/std",
-	"pallet-session/std",
-	"pallet-aura/std",
-	"pallet-balances/std",
 ]
 
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-authorship/try-runtime",
+	"pallet-session/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/pallets/dapp-staking-migration/Cargo.toml b/pallets/dapp-staking-migration/Cargo.toml
index be2a13599a..d1064f852e 100644
--- a/pallets/dapp-staking-migration/Cargo.toml
+++ b/pallets/dapp-staking-migration/Cargo.toml
@@ -28,27 +28,35 @@ sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
-	"scale-info/std",
-	"sp-std/std",
-	"sp-io/std",
-	"log/std",
+	"astar-primitives/std",
+	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
+	"pallet-balances/std",
 	"pallet-dapp-staking-v3/std",
-	"frame-benchmarking/std",
-	"astar-primitives/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
 	"sp-core/std",
-	"pallet-balances/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 	"pallet-dapp-staking-v3/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-dapp-staking-v3/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/dapp-staking-v3/Cargo.toml b/pallets/dapp-staking-v3/Cargo.toml
index bd95087453..afeb0b4467 100644
--- a/pallets/dapp-staking-v3/Cargo.toml
+++ b/pallets/dapp-staking-v3/Cargo.toml
@@ -31,30 +31,36 @@ frame-benchmarking = { workspace = true, optional = true }
 pallet-balances = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"serde/std",
+	"astar-primitives/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
 	"log/std",
+	"num-traits/std",
+	"pallet-balances/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
-	"num-traits/std",
-	"sp-core/std",
-	"sp-runtime/std",
+	"serde/std",
 	"sp-arithmetic/std",
+	"sp-core/std",
 	"sp-io/std",
+	"sp-runtime/std",
 	"sp-std/std",
-	"frame-support/std",
-	"frame-system/std",
-	"pallet-balances/std",
-	"astar-primitives/std",
-	"frame-benchmarking/std",
 ]
 runtime-benchmarks = [
+	"assert_matches",
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
-	"assert_matches",
 ]
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml b/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml
index 37b20002ab..283a219a1c 100644
--- a/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml
+++ b/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml
@@ -17,9 +17,5 @@ sp-std = { workspace = true }
 astar-primitives = { workspace = true }
 
 [features]
-default = ["std"]
-std = [
-	"sp-api/std",
-	"sp-std/std",
-	"astar-primitives/std",
-]
+default = [ "std" ]
+std = [ "astar-primitives/std", "sp-api/std", "sp-std/std" ]
diff --git a/pallets/dynamic-evm-base-fee/Cargo.toml b/pallets/dynamic-evm-base-fee/Cargo.toml
index c6ecb9208e..8a056ccaef 100644
--- a/pallets/dynamic-evm-base-fee/Cargo.toml
+++ b/pallets/dynamic-evm-base-fee/Cargo.toml
@@ -31,26 +31,27 @@ pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
-	"scale-info/std",
-	"num-traits/std",
+	# Frontier
+	"fp-evm/std",
+	"frame-benchmarking/std",
 	# Substrate
 	"frame-support/std",
 	"frame-system/std",
+	"num-traits/std",
+	"pallet-balances/std",
+	"pallet-timestamp/std",
+	"pallet-transaction-payment/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-transaction-payment/std",
-	"pallet-balances/std",
-	"pallet-timestamp/std",
-	"frame-benchmarking/std",
-	# Frontier
-	"fp-evm/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
@@ -59,4 +60,5 @@ try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-transaction-payment/try-runtime",
+	"sp-runtime/try-runtime",
 ]
diff --git a/pallets/ethereum-checked/Cargo.toml b/pallets/ethereum-checked/Cargo.toml
index e2538195fe..199bb12b48 100644
--- a/pallets/ethereum-checked/Cargo.toml
+++ b/pallets/ethereum-checked/Cargo.toml
@@ -35,34 +35,42 @@ pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"hex/std",
-	"parity-scale-codec/std",
-	"scale-info/std",
-	"ethereum/std",
+	"astar-primitives/std",
 	"ethereum-types/std",
+	"ethereum/std",
 	"fp-ethereum/std",
 	"fp-evm/std",
-	"pallet-evm/std",
-	"sp-std/std",
-	"sp-runtime/std",
-	"sp-io/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"hex/std",
 	"pallet-balances/std",
-	"pallet-timestamp/std",
-	"pallet-evm/std",
 	"pallet-ethereum/std",
-	"astar-primitives/std",
+	"pallet-evm/std",
+	"pallet-timestamp/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
 runtime-benchmarks = [
-	"hex",
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
+	"hex",
 	"pallet-ethereum/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-evm/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/inflation/Cargo.toml b/pallets/inflation/Cargo.toml
index 0ba8a6fe92..64da1d660f 100644
--- a/pallets/inflation/Cargo.toml
+++ b/pallets/inflation/Cargo.toml
@@ -28,24 +28,32 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	"astar-primitives/std",
+	"frame-benchmarking?/std",
+	"frame-support/std",
+	"frame-system/std",
 	"log/std",
-	"sp-core/std",
+	"pallet-balances/std",
+	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde/std",
+	"sp-core/std",
+	"sp-runtime/std",
 	"sp-std/std",
-	"frame-support/std",
-	"frame-system/std",
-	"pallet-balances/std",
-	"astar-primitives/std",
 ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/pallets/oracle-benchmarks/Cargo.toml b/pallets/oracle-benchmarks/Cargo.toml
index 534c34a2de..aa9144b002 100644
--- a/pallets/oracle-benchmarks/Cargo.toml
+++ b/pallets/oracle-benchmarks/Cargo.toml
@@ -28,25 +28,34 @@ astar-primitives = { workspace = true }
 frame-benchmarking = { workspace = true, optional = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	"astar-primitives/std",
+	"frame-benchmarking?/std",
+	"frame-support/std",
+	"frame-system/std",
 	"log/std",
+	"orml-oracle/std",
+	"orml-traits/std",
+	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde/std",
-	"sp-std/std",
-	"frame-support/std",
-	"frame-system/std",
-	"astar-primitives/std",
 	"sp-arithmetic/std",
-	"orml-traits/std",
-	"orml-oracle/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"orml-oracle/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/pallets/price-aggregator/Cargo.toml b/pallets/price-aggregator/Cargo.toml
index c90324eac0..3abd8904c6 100644
--- a/pallets/price-aggregator/Cargo.toml
+++ b/pallets/price-aggregator/Cargo.toml
@@ -32,26 +32,34 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
-	"log/std",
-	"sp-core/std",
-	"scale-info/std",
-	"serde/std",
-	"sp-std/std",
+	"astar-primitives/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
+	"orml-traits/std",
 	"pallet-balances/std",
-	"astar-primitives/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
+	"serde/std",
 	"sp-arithmetic/std",
-	"orml-traits/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/pallets/static-price-provider/Cargo.toml b/pallets/static-price-provider/Cargo.toml
index 061aaa8e38..dfa0143db9 100644
--- a/pallets/static-price-provider/Cargo.toml
+++ b/pallets/static-price-provider/Cargo.toml
@@ -29,25 +29,33 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
-	"log/std",
-	"sp-core/std",
-	"scale-info/std",
-	"serde/std",
-	"sp-std/std",
+	"astar-primitives/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
-	"astar-primitives/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
+	"serde/std",
 	"sp-arithmetic/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/pallets/unified-accounts/Cargo.toml b/pallets/unified-accounts/Cargo.toml
index c74c5ac954..cd3e7ea9ff 100644
--- a/pallets/unified-accounts/Cargo.toml
+++ b/pallets/unified-accounts/Cargo.toml
@@ -42,35 +42,43 @@ pallet-evm = { workspace = true }
 pallet-timestamp = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
+	"astar-primitives/std",
+	"frame-benchmarking?/std",
+	"frame-support/std",
+	"frame-system/std",
 	"hex/std",
-	"log/std",
 	"libsecp256k1",
 	"libsecp256k1/std",
+	"log/std",
+	"pallet-balances/std",
+	"pallet-ethereum/std",
+	"pallet-evm/std",
+	"pallet-timestamp/std",
 	"parity-scale-codec/std",
+	"precompile-utils/std",
 	"scale-info/std",
-	"sp-std/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"frame-support/std",
-	"frame-system/std",
-	"astar-primitives/std",
-	"precompile-utils/std",
-	"pallet-evm/std",
-	"pallet-balances/std",
-	"pallet-timestamp/std",
-	"pallet-ethereum/std",
+	"sp-std/std",
 ]
 runtime-benchmarks = [
-	"libsecp256k1/hmac",
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
+	"libsecp256k1/hmac",
 	"pallet-ethereum/runtime-benchmarks",
 	"pallet-evm/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-evm/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime", "pallet-evm/try-runtime"]
diff --git a/pallets/xc-asset-config/Cargo.toml b/pallets/xc-asset-config/Cargo.toml
index 3295f1221d..90d69f06c5 100644
--- a/pallets/xc-asset-config/Cargo.toml
+++ b/pallets/xc-asset-config/Cargo.toml
@@ -31,22 +31,32 @@ pallet-timestamp = { workspace = true }
 sp-core = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
+	"pallet-balances/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
+	"serde?/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"xcm/std",
-	"pallet-balances/std",
-	"frame-benchmarking?/std",
 ]
 
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/xvm/Cargo.toml b/pallets/xvm/Cargo.toml
index 0160aeb125..60ee4cb4fd 100644
--- a/pallets/xvm/Cargo.toml
+++ b/pallets/xvm/Cargo.toml
@@ -42,31 +42,43 @@ pallet-timestamp = { workspace = true, features = ["std"] }
 sp-io = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
+	"astar-primitives/std",
 	"environmental/std",
-	"log/std",
-	"parity-scale-codec/std",
 	"fp-evm/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
-	"pallet-contracts/std",
+	"log/std",
 	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
 	"pallet-evm/std",
 	"pallet-insecure-randomness-collective-flip/std",
+	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
+	"serde?/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"astar-primitives/std",
 ]
 
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
+	"astar-primitives/try-runtime",
 	"frame-support/try-runtime",
+	"frame-system/try-runtime",
 	"pallet-contracts/try-runtime",
 	"pallet-evm/try-runtime",
+	"sp-runtime/try-runtime",
 ]
diff --git a/precompiles/assets-erc20/Cargo.toml b/precompiles/assets-erc20/Cargo.toml
index a9cc8a9d68..ad35e49b6f 100644
--- a/precompiles/assets-erc20/Cargo.toml
+++ b/precompiles/assets-erc20/Cargo.toml
@@ -40,19 +40,28 @@ pallet-timestamp = { workspace = true }
 scale-info = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
+	"num_enum/std",
 	"pallet-assets/std",
-	"pallet-evm/std",
 	"pallet-balances/std",
+	"pallet-evm/std",
+	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
-runtime-benchmarks = ["pallet-assets/runtime-benchmarks"]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
diff --git a/precompiles/dapp-staking-v3/Cargo.toml b/precompiles/dapp-staking-v3/Cargo.toml
index 5c40d95a5f..f7a2103139 100644
--- a/precompiles/dapp-staking-v3/Cargo.toml
+++ b/precompiles/dapp-staking-v3/Cargo.toml
@@ -42,21 +42,30 @@ sp-arithmetic = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
-	"scale-info/std",
 	"astar-primitives/std",
-	"sp-std/std",
-	"sp-core/std",
-	"sp-runtime/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
+	"num_enum/std",
+	"pallet-balances/std",
 	"pallet-dapp-staking-v3/std",
 	"pallet-evm/std",
+	"parity-scale-codec/std",
 	"precompile-utils/std",
-	"pallet-balances/std",
+	"scale-info/std",
 	"sp-arithmetic/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
+runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
-runtime-benchmarks = ["pallet-dapp-staking-v3/runtime-benchmarks"]
diff --git a/precompiles/dispatch-lockdrop/Cargo.toml b/precompiles/dispatch-lockdrop/Cargo.toml
index b2ca7f5e20..63f391f822 100644
--- a/precompiles/dispatch-lockdrop/Cargo.toml
+++ b/precompiles/dispatch-lockdrop/Cargo.toml
@@ -38,21 +38,23 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"log/std",
+	"astar-primitives/std",
+	"fp-evm/std",
+	"frame-support/std",
+	"frame-system/std",
 	"libsecp256k1/std",
+	"log/std",
+	"pallet-balances/std",
+	"pallet-evm-precompile-dispatch/std",
+	"pallet-evm/std",
+	"pallet-timestamp/std",
 	"parity-scale-codec/std",
+	"precompile-utils/std",
 	"scale-info/std",
-	"sp-std/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"frame-support/std",
-	"frame-system/std",
-	"astar-primitives/std",
-	"precompile-utils/std",
-	"pallet-evm/std",
-	"pallet-balances/std",
-	"pallet-timestamp/std",
+	"sp-std/std",
 ]
diff --git a/precompiles/sr25519/Cargo.toml b/precompiles/sr25519/Cargo.toml
index a5abe88ec7..36c916d3fe 100644
--- a/precompiles/sr25519/Cargo.toml
+++ b/precompiles/sr25519/Cargo.toml
@@ -37,13 +37,15 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
 	"fp-evm/std",
+	"log/std",
+	"num_enum/std",
 	"pallet-evm/std",
+	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-core/std",
-	"sp-std/std",
 	"sp-io/std",
+	"sp-std/std",
 ]
diff --git a/precompiles/substrate-ecdsa/Cargo.toml b/precompiles/substrate-ecdsa/Cargo.toml
index 388283b9e9..b9f60c63f4 100644
--- a/precompiles/substrate-ecdsa/Cargo.toml
+++ b/precompiles/substrate-ecdsa/Cargo.toml
@@ -38,14 +38,15 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"num_enum/std",
-	"parity-scale-codec/std",
 	"fp-evm/std",
+	"log/std",
+	"num_enum/std",
 	"pallet-evm/std",
+	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-core/std",
-	"sp-std/std",
 	"sp-io/std",
+	"sp-std/std",
 ]
diff --git a/precompiles/unified-accounts/Cargo.toml b/precompiles/unified-accounts/Cargo.toml
index 30842e0651..0a5bae85de 100644
--- a/precompiles/unified-accounts/Cargo.toml
+++ b/precompiles/unified-accounts/Cargo.toml
@@ -45,18 +45,21 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
-	"pallet-unified-accounts/std",
+	"astar-primitives/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
+	"hex/std",
+	"log/std",
+	"num_enum/std",
 	"pallet-evm/std",
+	"pallet-unified-accounts/std",
+	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-core/std",
-	"sp-std/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"astar-primitives/std",
+	"sp-std/std",
 ]
diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml
index 9e7b1dc67f..57dfdfb9d6 100644
--- a/precompiles/utils/Cargo.toml
+++ b/precompiles/utils/Cargo.toml
@@ -42,18 +42,32 @@ hex-literal = { workspace = true }
 xcm = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"environmental/std",
+	"evm/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
+	"hex/std",
+	"log/std",
+	"num_enum/std",
 	"pallet-evm/std",
 	"parity-scale-codec/std",
+	"scale-info?/std",
+	"serde?/std",
 	"sp-core/std",
 	"sp-io/std",
+	"sp-runtime/std",
 	"sp-std/std",
 	"xcm?/std",
 ]
-codec-xcm = ["xcm"]
-testing = ["derive_more", "hex-literal", "scale-info", "serde", "similar-asserts", "std"]
+codec-xcm = [ "xcm" ]
+testing = [
+	"derive_more",
+	"hex-literal",
+	"scale-info",
+	"serde",
+	"similar-asserts",
+	"std",
+]
diff --git a/precompiles/utils/macro/Cargo.toml b/precompiles/utils/macro/Cargo.toml
index c13219412a..3b8d85501b 100644
--- a/precompiles/utils/macro/Cargo.toml
+++ b/precompiles/utils/macro/Cargo.toml
@@ -33,10 +33,11 @@ sp-core-hashing = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"fp-evm/std",
 	"frame-support/std",
+	"num_enum/std",
 	"sp-core-hashing/std",
 	"sp-std/std",
 ]
diff --git a/precompiles/xcm/Cargo.toml b/precompiles/xcm/Cargo.toml
index a131fe9c52..9f8b054bb0 100644
--- a/precompiles/xcm/Cargo.toml
+++ b/precompiles/xcm/Cargo.toml
@@ -50,26 +50,40 @@ pallet-timestamp = { workspace = true }
 xcm-builder = { workspace = true, features = ["std"] }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	"astar-primitives/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
+	"num_enum/std",
+	"orml-traits/std",
+	"orml-xcm-support/std",
+	"orml-xtokens/std",
 	"pallet-assets/std",
+	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm/std",
 	"pallet-xcm/std",
-	"pallet-evm-precompile-assets-erc20/std",
+	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-core/std",
-	"sp-std/std",
-	"sp-runtime/std",
 	"sp-io/std",
-	"xcm/std",
+	"sp-runtime/std",
+	"sp-std/std",
 	"xcm-executor/std",
-	"orml-xtokens/std",
-	"orml-xcm-support/std",
-	"orml-traits/std",
-	"astar-primitives/std",
+	"xcm/std",
+]
+runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
-runtime-benchmarks = ["pallet-xcm/runtime-benchmarks", "pallet-assets/runtime-benchmarks", "xcm-builder/runtime-benchmarks"]
diff --git a/precompiles/xvm/Cargo.toml b/precompiles/xvm/Cargo.toml
index c64e26b3b2..ee55b001c3 100644
--- a/precompiles/xvm/Cargo.toml
+++ b/precompiles/xvm/Cargo.toml
@@ -42,17 +42,20 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	"astar-primitives/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
+	"hex/std",
+	"log/std",
+	"num_enum/std",
 	"pallet-evm/std",
+	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-core/std",
-	"sp-std/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"astar-primitives/std",
+	"sp-std/std",
 ]
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index c3379c04ca..ba1651e564 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -48,33 +48,52 @@ pallet-evm-precompile-dispatch = { workspace = true }
 pallet-xc-asset-config = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"log/std",
-	"parity-scale-codec/std",
-	"scale-info/std",
 	"ethereum-types/std",
 	"ethereum/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
-	"sp-std/std",
-	"sp-runtime/std",
-	"sp-core/std",
-	"sp-io/std",
-	"xcm/std",
-	"xcm-builder/std",
-	"xcm-executor/std",
+	"log/std",
 	"orml-oracle/std",
 	"orml-traits/std",
-	"pallet-xc-asset-config/std",
-	"fp-evm/std",
 	"pallet-assets/std",
-	"pallet-evm/std",
 	"pallet-contracts/std",
 	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm-precompile-dispatch/std",
+	"pallet-evm/std",
+	"pallet-xc-asset-config/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
 	"sp-arithmetic/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"xcm-builder/std",
+	"xcm-executor/std",
+	"xcm/std",
+]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-xc-asset-config/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"orml-oracle/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-contracts/try-runtime",
+	"pallet-evm/try-runtime",
+	"pallet-xc-asset-config/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-runtime-benchmarks = ["xcm-builder/runtime-benchmarks", "pallet-assets/runtime-benchmarks"]
-try-runtime = ["pallet-contracts/try-runtime"]
diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml
index 16ba21ef2e..98985dd559 100644
--- a/runtime/astar/Cargo.toml
+++ b/runtime/astar/Cargo.toml
@@ -136,167 +136,198 @@ pallet-chain-extension-assets = { workspace = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
-	"sp-genesis-builder/std",
+	"astar-primitives/std",
+	"astar-xcm-benchmarks?/std",
+	"cumulus-pallet-aura-ext/std",
+	"cumulus-pallet-dmp-queue/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-xcm/std",
+	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-primitives-core/std",
+	"cumulus-primitives-timestamp/std",
+	"cumulus-primitives-utility/std",
+	"dapp-staking-v3-runtime-api/std",
 	"fp-rpc/std",
 	"fp-self-contained/std",
-	"sp-std/std",
-	"sp-api/std",
-	"sp-core/std",
-	"oracle-benchmarks/std",
-	"pallet-membership/std",
-	"pallet-price-aggregator/std",
-	"orml-oracle/std",
-	"sp-consensus-aura/std",
-	"sp-arithmetic/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"sp-runtime-interface/std",
-	"sp-version/std",
-	"sp-block-builder/std",
-	"sp-transaction-pool/std",
-	"sp-inherents/std",
-	"frame-support/std",
+	"frame-benchmarking/std",
 	"frame-executive/std",
-	"frame-system/std",
+	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
+	"frame-system/std",
 	"frame-try-runtime/std",
+	"log?/std",
+	"moonbeam-evm-tracer/std",
+	"moonbeam-rpc-primitives-debug/std",
+	"moonbeam-rpc-primitives-txpool/std",
+	"num_enum/std",
+	"oracle-benchmarks/std",
+	"orml-oracle/std",
+	"orml-xcm-support/std",
+	"orml-xtokens/std",
 	"pallet-assets/std",
-	"pallet-authorship/std",
 	"pallet-aura/std",
+	"pallet-authorship/std",
 	"pallet-balances/std",
-	"pallet-proxy/std",
-	"pallet-dapp-staking-v3/std",
+	"pallet-chain-extension-assets/std",
+	"pallet-collator-selection/std",
+	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
 	"pallet-dapp-staking-migration/std",
-	"dapp-staking-v3-runtime-api/std",
-	"pallet-inflation/std",
-	"pallet-evm-precompile-dapp-staking-v3/std",
-	"pallet-evm-precompile-sr25519/std",
-	"pallet-evm-precompile-assets-erc20/std",
-	"pallet-evm-precompile-substrate-ecdsa/std",
-	"pallet-evm-precompile-xcm/std",
+	"pallet-dapp-staking-v3/std",
 	"pallet-dynamic-evm-base-fee/std",
 	"pallet-ethereum/std",
-	"pallet-evm/std",
+	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm-precompile-blake2/std",
-	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-bn128/std",
-	"pallet-evm-precompile-dispatch/std",
+	"pallet-evm-precompile-dapp-staking-v3/std",
 	"pallet-evm-precompile-dispatch-lockdrop/std",
+	"pallet-evm-precompile-dispatch/std",
 	"pallet-evm-precompile-ed25519/std",
 	"pallet-evm-precompile-modexp/std",
 	"pallet-evm-precompile-sha3fips/std",
+	"pallet-evm-precompile-simple/std",
+	"pallet-evm-precompile-sr25519/std",
+	"pallet-evm-precompile-substrate-ecdsa/std",
+	"pallet-evm-precompile-xcm/std",
+	"pallet-evm/std",
 	"pallet-identity/std",
+	"pallet-inflation/std",
+	"pallet-membership/std",
 	"pallet-multisig/std",
+	"pallet-price-aggregator/std",
+	"pallet-proxy/std",
 	"pallet-session/std",
-	"pallet-utility/std",
-	"pallet-timestamp/std",
-	"pallet-vesting/std",
-	"sp-offchain/std",
-	"sp-session/std",
 	"pallet-sudo/std",
-	"pallet-transaction-payment/std",
+	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
+	"pallet-transaction-payment/std",
+	"pallet-utility/std",
+	"pallet-vesting/std",
+	"pallet-xc-asset-config/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
+	"parity-scale-codec/std",
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
 	"polkadot-runtime-common/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-utility/std",
-	"cumulus-primitives-timestamp/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"pallet-contracts/std",
-	"pallet-contracts-primitives/std",
-	"cumulus-pallet-xcm/std",
-	"pallet-collator-selection/std",
-	"frame-benchmarking/std",
-	"moonbeam-evm-tracer/std",
-	"moonbeam-rpc-primitives-debug/std",
-	"moonbeam-rpc-primitives-txpool/std",
-	"xcm/std",
+	"precompile-utils/std",
+	"scale-info/std",
+	"sp-api/std",
+	"sp-arithmetic/std",
+	"sp-block-builder/std",
+	"sp-consensus-aura/std",
+	"sp-core/std",
+	"sp-genesis-builder/std",
+	"sp-inherents/std",
+	"sp-io/std",
+	"sp-offchain/std",
+	"sp-runtime-interface/std",
+	"sp-runtime/std",
+	"sp-session/std",
+	"sp-std/std",
+	"sp-transaction-pool/std",
+	"sp-version/std",
+	"substrate-wasm-builder",
 	"xcm-builder/std",
 	"xcm-executor/std",
-	"pallet-xc-asset-config/std",
-	"substrate-wasm-builder",
-	"pallet-chain-extension-assets/std",
-	"orml-xtokens/std",
-	"orml-xcm-support/std",
-	"astar-primitives/std",
+	"xcm/std",
 ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
+	"astar-xcm-benchmarks/runtime-benchmarks",
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	'frame-benchmarking',
+	"frame-benchmarking/runtime-benchmarks",
 	'frame-support/runtime-benchmarks',
 	'frame-system-benchmarking/runtime-benchmarks',
 	'frame-system/runtime-benchmarks',
-	'sp-runtime/runtime-benchmarks',
+	"oracle-benchmarks/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
 	'pallet-balances/runtime-benchmarks',
-	"pallet-proxy/runtime-benchmarks",
-	'pallet-timestamp/runtime-benchmarks',
-	"pallet-ethereum/runtime-benchmarks",
-	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"pallet-chain-extension-assets/runtime-benchmarks",
+	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
 	"pallet-dapp-staking-migration/runtime-benchmarks",
-	"pallet-price-aggregator/runtime-benchmarks",
+	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
+	"pallet-ethereum/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
+	"pallet-evm-precompile-xcm/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-identity/runtime-benchmarks",
 	"pallet-inflation/runtime-benchmarks",
 	"pallet-membership/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
+	"pallet-multisig/runtime-benchmarks",
+	"pallet-price-aggregator/runtime-benchmarks",
+	"pallet-proxy/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
+	'pallet-timestamp/runtime-benchmarks',
+	"pallet-utility/runtime-benchmarks",
+	"pallet-vesting/runtime-benchmarks",
 	"pallet-xc-asset-config/runtime-benchmarks",
-	"pallet-collator-selection/runtime-benchmarks",
-	"orml-xtokens/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
-	"cumulus-primitives-utility/runtime-benchmarks",
-	"astar-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	'sp-runtime/runtime-benchmarks',
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
+	"astar-primitives/try-runtime",
+	"astar-xcm-benchmarks?/try-runtime",
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-dmp-queue/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
+	"cumulus-pallet-xcmp-queue/try-runtime",
 	"fp-self-contained/try-runtime",
-	"log",
-	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"log",
+	"oracle-benchmarks/try-runtime",
+	"orml-oracle/try-runtime",
+	"orml-xtokens/try-runtime",
+	"pallet-assets/try-runtime",
 	"pallet-aura/try-runtime",
+	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-dapp-staking-v3/try-runtime",
+	"pallet-chain-extension-assets/try-runtime",
+	"pallet-collator-selection/try-runtime",
+	"pallet-contracts/try-runtime",
 	"pallet-dapp-staking-migration/try-runtime",
+	"pallet-dapp-staking-v3/try-runtime",
+	"pallet-dynamic-evm-base-fee/try-runtime",
+	"pallet-ethereum/try-runtime",
+	"pallet-evm/try-runtime",
+	"pallet-identity/try-runtime",
 	"pallet-inflation/try-runtime",
+	"pallet-membership/try-runtime",
+	"pallet-multisig/try-runtime",
+	"pallet-price-aggregator/try-runtime",
+	"pallet-proxy/try-runtime",
+	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
 	"pallet-xc-asset-config/try-runtime",
-	"pallet-ethereum/try-runtime",
-	"orml-oracle/try-runtime",
-	"pallet-price-aggregator/try-runtime",
-	"pallet-membership/try-runtime",
-	"oracle-benchmarks/try-runtime",
-	"pallet-assets/try-runtime",
-	"pallet-authorship/try-runtime",
-	"pallet-collator-selection/try-runtime",
-	"pallet-session/try-runtime",
 	"pallet-xcm/try-runtime",
-	"pallet-identity/try-runtime",
-	"pallet-multisig/try-runtime",
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
 	"parachain-info/try-runtime",
-	"pallet-dynamic-evm-base-fee/try-runtime",
-	"pallet-contracts/try-runtime",
-	"pallet-evm/try-runtime",
-	"orml-xtokens/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml
index da7d526e38..a8fdf7ac4e 100644
--- a/runtime/local/Cargo.toml
+++ b/runtime/local/Cargo.toml
@@ -105,127 +105,150 @@ frame-try-runtime = { workspace = true, optional = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	"astar-primitives/std",
+	"dapp-staking-v3-runtime-api/std",
 	"fp-rpc/std",
 	"fp-self-contained/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",
+	"log?/std",
+	"moonbeam-evm-tracer/std",
+	"moonbeam-rpc-primitives-debug/std",
+	"moonbeam-rpc-primitives-txpool/std",
+	"num_enum/std",
 	"pallet-assets/std",
 	"pallet-aura/std",
 	"pallet-balances/std",
-	"pallet-contracts/std",
-	"pallet-contracts-primitives/std",
-	"pallet-chain-extension-xvm/std",
+	"pallet-chain-extension-assets/std",
 	"pallet-chain-extension-unified-accounts/std",
+	"pallet-chain-extension-xvm/std",
+	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
 	"pallet-dapp-staking-v3/std",
-	"dapp-staking-v3-runtime-api/std",
-	"pallet-inflation/std",
-	"pallet-static-price-provider/std",
 	"pallet-dynamic-evm-base-fee/std",
+	"pallet-ethereum-checked/std",
 	"pallet-ethereum/std",
-	"pallet-evm/std",
-	"sp-genesis-builder/std",
+	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm-precompile-blake2/std",
-	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-bn128/std",
+	"pallet-evm-precompile-dapp-staking-v3/std",
+	"pallet-evm-precompile-dispatch-lockdrop/std",
 	"pallet-evm-precompile-dispatch/std",
 	"pallet-evm-precompile-ed25519/std",
 	"pallet-evm-precompile-modexp/std",
 	"pallet-evm-precompile-sha3fips/std",
-	"pallet-evm-precompile-dapp-staking-v3/std",
+	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-sr25519/std",
 	"pallet-evm-precompile-substrate-ecdsa/std",
 	"pallet-evm-precompile-unified-accounts/std",
 	"pallet-evm-precompile-xvm/std",
-	"pallet-evm-precompile-dispatch-lockdrop/std",
+	"pallet-evm/std",
 	"pallet-grandpa/std",
+	"pallet-inflation/std",
 	"pallet-insecure-randomness-collective-flip/std",
 	"pallet-preimage/std",
+	"pallet-proxy/std",
+	"pallet-scheduler/std",
+	"pallet-static-price-provider/std",
 	"pallet-sudo/std",
 	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
+	"pallet-unified-accounts/std",
 	"pallet-utility/std",
 	"pallet-vesting/std",
-	"pallet-proxy/std",
+	"pallet-xvm/std",
+	"parity-scale-codec/std",
+	"precompile-utils/std",
+	"scale-info/std",
 	"sp-api/std",
+	"sp-arithmetic/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
+	"sp-io/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
-	"sp-arithmetic/std",
 	"sp-std/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
-	"sp-io/std",
-	"frame-benchmarking/std",
-	"frame-try-runtime/std",
-	"pallet-scheduler/std",
-	"pallet-xvm/std",
-	"pallet-unified-accounts/std",
-	"pallet-ethereum-checked/std",
-	"moonbeam-evm-tracer/std",
-	"moonbeam-rpc-primitives-debug/std",
-	"moonbeam-rpc-primitives-txpool/std",
 	"substrate-wasm-builder",
-	"pallet-chain-extension-assets/std",
-	"astar-primitives/std",
 ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
+	"pallet-chain-extension-assets/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
+	"pallet-ethereum-checked/runtime-benchmarks",
 	"pallet-ethereum/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-grandpa/runtime-benchmarks",
+	"pallet-inflation/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
-	"pallet-ethereum-checked/runtime-benchmarks",
+	"pallet-proxy/runtime-benchmarks",
+	"pallet-scheduler/runtime-benchmarks",
+	"pallet-static-price-provider/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
 	"pallet-unified-accounts/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-dapp-staking-v3/runtime-benchmarks",
-	"pallet-inflation/runtime-benchmarks",
-	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
+	"pallet-vesting/runtime-benchmarks",
+	"pallet-xvm/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
+	"astar-primitives/try-runtime",
 	"fp-self-contained/try-runtime",
-	"log",
-	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"log",
+	"pallet-assets/try-runtime",
 	"pallet-aura/try-runtime",
 	"pallet-balances/try-runtime",
+	"pallet-chain-extension-assets/try-runtime",
 	"pallet-contracts/try-runtime",
 	"pallet-dapp-staking-v3/try-runtime",
-	"pallet-inflation/try-runtime",
+	"pallet-dynamic-evm-base-fee/try-runtime",
+	"pallet-ethereum-checked/try-runtime",
+	"pallet-ethereum/try-runtime",
+	"pallet-evm/try-runtime",
 	"pallet-grandpa/try-runtime",
+	"pallet-inflation/try-runtime",
 	"pallet-insecure-randomness-collective-flip/try-runtime",
+	"pallet-preimage/try-runtime",
+	"pallet-proxy/try-runtime",
+	"pallet-scheduler/try-runtime",
+	"pallet-static-price-provider/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
+	"pallet-unified-accounts/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
 	"pallet-xvm/try-runtime",
-	"pallet-unified-accounts/try-runtime",
-	"pallet-ethereum/try-runtime",
-	"pallet-assets/try-runtime",
-	"pallet-scheduler/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-preimage/try-runtime",
-	"pallet-dynamic-evm-base-fee/try-runtime",
-	"pallet-evm/try-runtime",
-	"pallet-ethereum-checked/try-runtime",
-	"pallet-static-price-provider/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml
index 7a90e95671..97a419266d 100644
--- a/runtime/shibuya/Cargo.toml
+++ b/runtime/shibuya/Cargo.toml
@@ -147,186 +147,218 @@ frame-try-runtime = { workspace = true, optional = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	"astar-primitives/std",
+	"astar-xcm-benchmarks?/std",
+	"cumulus-pallet-aura-ext/std",
+	"cumulus-pallet-dmp-queue/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-xcm/std",
+	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-primitives-core/std",
+	"cumulus-primitives-timestamp/std",
+	"cumulus-primitives-utility/std",
+	"dapp-staking-v3-runtime-api/std",
 	"fp-rpc/std",
 	"fp-self-contained/std",
-	"sp-std/std",
-	"sp-api/std",
-	"sp-core/std",
-	"sp-genesis-builder/std",
-	"sp-consensus-aura/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"sp-runtime-interface/std",
-	"oracle-benchmarks/std",
-	"pallet-membership/std",
-	"sp-version/std",
-	"sp-block-builder/std",
-	"sp-transaction-pool/std",
-	"sp-inherents/std",
-	"sp-arithmetic/std",
-	"frame-support/std",
+	"frame-benchmarking/std",
 	"frame-executive/std",
-	"frame-system/std",
+	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
-	"pallet-authorship/std",
-	"pallet-aura/std",
+	"frame-system/std",
+	"frame-try-runtime/std",
+	"log?/std",
+	"moonbeam-evm-tracer/std",
+	"moonbeam-rpc-primitives-debug/std",
+	"moonbeam-rpc-primitives-txpool/std",
+	"num_enum/std",
+	"oracle-benchmarks/std",
+	"orml-oracle/std",
+	"orml-xcm-support/std",
+	"orml-xtokens/std",
 	"pallet-assets/std",
+	"pallet-aura/std",
+	"pallet-authorship/std",
 	"pallet-balances/std",
-	"pallet-contracts/std",
-	"pallet-contracts-primitives/std",
-	"pallet-chain-extension-xvm/std",
+	"pallet-chain-extension-assets/std",
 	"pallet-chain-extension-unified-accounts/std",
+	"pallet-chain-extension-xvm/std",
+	"pallet-collator-selection/std",
+	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
+	"pallet-dapp-staking-v3/std",
 	"pallet-dynamic-evm-base-fee/std",
+	"pallet-ethereum-checked/std",
 	"pallet-ethereum/std",
-	"pallet-preimage/std",
-	"pallet-evm/std",
 	"pallet-evm-chain-id/std",
+	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm-precompile-blake2/std",
-	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-bn128/std",
+	"pallet-evm-precompile-dapp-staking-v3/std",
+	"pallet-evm-precompile-dispatch-lockdrop/std",
 	"pallet-evm-precompile-dispatch/std",
 	"pallet-evm-precompile-ed25519/std",
 	"pallet-evm-precompile-modexp/std",
 	"pallet-evm-precompile-sha3fips/std",
-	"pallet-evm-precompile-dapp-staking-v3/std",
+	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-sr25519/std",
 	"pallet-evm-precompile-substrate-ecdsa/std",
-	"pallet-evm-precompile-assets-erc20/std",
+	"pallet-evm-precompile-unified-accounts/std",
 	"pallet-evm-precompile-xcm/std",
 	"pallet-evm-precompile-xvm/std",
-	"pallet-evm-precompile-unified-accounts/std",
-	"pallet-evm-precompile-dispatch-lockdrop/std",
-	"pallet-dapp-staking-v3/std",
-	"orml-oracle/std",
-	"dapp-staking-v3-runtime-api/std",
-	"pallet-inflation/std",
-	"pallet-price-aggregator/std",
+	"pallet-evm/std",
 	"pallet-identity/std",
-	"pallet-multisig/std",
+	"pallet-inflation/std",
 	"pallet-insecure-randomness-collective-flip/std",
-	"pallet-session/std",
-	"pallet-utility/std",
-	"pallet-timestamp/std",
-	"pallet-vesting/std",
+	"pallet-membership/std",
+	"pallet-multisig/std",
+	"pallet-preimage/std",
+	"pallet-price-aggregator/std",
 	"pallet-proxy/std",
-	"sp-offchain/std",
-	"sp-session/std",
+	"pallet-scheduler/std",
+	"pallet-session/std",
 	"pallet-sudo/std",
-	"pallet-transaction-payment/std",
+	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
-	"pallet-xcm/std",
+	"pallet-transaction-payment/std",
+	"pallet-unified-accounts/std",
+	"pallet-utility/std",
+	"pallet-vesting/std",
 	"pallet-xc-asset-config/std",
+	"pallet-xcm-benchmarks?/std",
+	"pallet-xcm/std",
 	"pallet-xvm/std",
-	"pallet-unified-accounts/std",
-	"pallet-ethereum-checked/std",
-	"pallet-scheduler/std",
 	"parachain-info/std",
+	"parity-scale-codec/std",
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
 	"polkadot-runtime-common/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-utility/std",
-	"cumulus-primitives-timestamp/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-pallet-xcm/std",
-	"pallet-collator-selection/std",
-	"frame-benchmarking/std",
-	"frame-try-runtime/std",
-	"moonbeam-evm-tracer/std",
-	"moonbeam-rpc-primitives-debug/std",
-	"moonbeam-rpc-primitives-txpool/std",
-	"xcm/std",
+	"precompile-utils/std",
+	"scale-info/std",
+	"sp-api/std",
+	"sp-arithmetic/std",
+	"sp-block-builder/std",
+	"sp-consensus-aura/std",
+	"sp-core/std",
+	"sp-genesis-builder/std",
+	"sp-inherents/std",
+	"sp-io/std",
+	"sp-offchain/std",
+	"sp-runtime-interface/std",
+	"sp-runtime/std",
+	"sp-session/std",
+	"sp-std/std",
+	"sp-transaction-pool/std",
+	"sp-version/std",
+	"substrate-wasm-builder",
 	"xcm-builder/std",
 	"xcm-executor/std",
-	"substrate-wasm-builder",
-	"pallet-chain-extension-assets/std",
-	"orml-xtokens/std",
-	"orml-xcm-support/std",
-	"astar-primitives/std",
+	"xcm/std",
 ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"astar-xcm-benchmarks/runtime-benchmarks",
-	"oracle-benchmarks/runtime-benchmarks",
-	"pallet-xcm-benchmarks/runtime-benchmarks",
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
+	"oracle-benchmarks/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-chain-extension-assets/runtime-benchmarks",
+	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
 	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
+	"pallet-ethereum-checked/runtime-benchmarks",
+	"pallet-ethereum/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
+	"pallet-evm-precompile-xcm/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-identity/runtime-benchmarks",
 	"pallet-inflation/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
 	"pallet-membership/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
-	"pallet-ethereum/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"pallet-xc-asset-config/runtime-benchmarks",
-	"pallet-price-aggregator/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
+	"pallet-multisig/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
-	"pallet-collator-selection/runtime-benchmarks",
-	"pallet-ethereum-checked/runtime-benchmarks",
+	"pallet-price-aggregator/runtime-benchmarks",
+	"pallet-proxy/runtime-benchmarks",
+	"pallet-scheduler/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
 	"pallet-unified-accounts/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
+	"pallet-vesting/runtime-benchmarks",
+	"pallet-xc-asset-config/runtime-benchmarks",
+	"pallet-xcm-benchmarks/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
 	"pallet-xvm/runtime-benchmarks",
-	"orml-xtokens/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
-	"cumulus-primitives-utility/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
+	"astar-primitives/try-runtime",
+	"astar-xcm-benchmarks?/try-runtime",
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-dmp-queue/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
+	"cumulus-pallet-xcmp-queue/try-runtime",
 	"fp-self-contained/try-runtime",
-	"log",
-	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"log",
+	"oracle-benchmarks/try-runtime",
+	"orml-oracle/try-runtime",
+	"orml-xtokens/try-runtime",
+	"pallet-assets/try-runtime",
 	"pallet-aura/try-runtime",
+	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
+	"pallet-chain-extension-assets/try-runtime",
+	"pallet-collator-selection/try-runtime",
+	"pallet-contracts/try-runtime",
 	"pallet-dapp-staking-v3/try-runtime",
+	"pallet-dynamic-evm-base-fee/try-runtime",
+	"pallet-ethereum-checked/try-runtime",
+	"pallet-ethereum/try-runtime",
+	"pallet-evm-chain-id/try-runtime",
+	"pallet-evm/try-runtime",
+	"pallet-identity/try-runtime",
 	"pallet-inflation/try-runtime",
+	"pallet-insecure-randomness-collective-flip/try-runtime",
+	"pallet-membership/try-runtime",
+	"pallet-multisig/try-runtime",
+	"pallet-preimage/try-runtime",
+	"pallet-price-aggregator/try-runtime",
+	"pallet-proxy/try-runtime",
+	"pallet-scheduler/try-runtime",
+	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"orml-oracle/try-runtime",
+	"pallet-unified-accounts/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
-	"pallet-price-aggregator/try-runtime",
-	"pallet-ethereum/try-runtime",
-	"pallet-membership/try-runtime",
 	"pallet-xc-asset-config/try-runtime",
-	"pallet-assets/try-runtime",
-	"pallet-authorship/try-runtime",
-	"pallet-collator-selection/try-runtime",
-	"pallet-session/try-runtime",
 	"pallet-xcm/try-runtime",
-	"pallet-identity/try-runtime",
-	"pallet-multisig/try-runtime",
-	"pallet-insecure-randomness-collective-flip/try-runtime",
-	"pallet-scheduler/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-contracts/try-runtime",
-	"oracle-benchmarks/try-runtime",
-	"pallet-evm-chain-id/try-runtime",
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
-	"parachain-info/try-runtime",
 	"pallet-xvm/try-runtime",
-	"pallet-preimage/try-runtime",
-	"pallet-dynamic-evm-base-fee/try-runtime",
-	"pallet-evm/try-runtime",
-	"pallet-unified-accounts/try-runtime",
-	"pallet-ethereum-checked/try-runtime",
-	"orml-xtokens/try-runtime",
+	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml
index 486d8b00c8..6f125c658a 100644
--- a/runtime/shiden/Cargo.toml
+++ b/runtime/shiden/Cargo.toml
@@ -139,168 +139,200 @@ pallet-chain-extension-assets = { workspace = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	"astar-primitives/std",
+	"astar-xcm-benchmarks?/std",
+	"cumulus-pallet-aura-ext/std",
+	"cumulus-pallet-dmp-queue/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-xcm/std",
+	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-primitives-core/std",
+	"cumulus-primitives-timestamp/std",
+	"cumulus-primitives-utility/std",
+	"dapp-staking-v3-runtime-api/std",
 	"fp-rpc/std",
 	"fp-self-contained/std",
-	"sp-std/std",
-	"sp-api/std",
-	"sp-core/std",
-	"sp-consensus-aura/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"sp-arithmetic/std",
-	"sp-runtime-interface/std",
-	"sp-version/std",
-	"sp-block-builder/std",
-	"sp-transaction-pool/std",
-	"sp-inherents/std",
-	"frame-support/std",
+	"frame-benchmarking/std",
 	"frame-executive/std",
-	"frame-system/std",
+	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
-	"pallet-authorship/std",
-	"pallet-aura/std",
+	"frame-system/std",
+	"frame-try-runtime/std",
+	"log?/std",
+	"moonbeam-evm-tracer/std",
+	"moonbeam-rpc-primitives-debug/std",
+	"moonbeam-rpc-primitives-txpool/std",
+	"num_enum/std",
+	"oracle-benchmarks/std",
+	"orml-oracle/std",
+	"orml-xcm-support/std",
+	"orml-xtokens/std",
 	"pallet-assets/std",
+	"pallet-aura/std",
+	"pallet-authorship/std",
 	"pallet-balances/std",
-	"pallet-contracts/std",
-	"oracle-benchmarks/std",
+	"pallet-chain-extension-assets/std",
+	"pallet-collator-selection/std",
 	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
+	"pallet-dapp-staking-migration/std",
+	"pallet-dapp-staking-v3/std",
 	"pallet-dynamic-evm-base-fee/std",
 	"pallet-ethereum/std",
-	"pallet-evm/std",
+	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm-precompile-blake2/std",
-	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-bn128/std",
-	"sp-genesis-builder/std",
-	"pallet-evm-precompile-dispatch/std",
+	"pallet-evm-precompile-dapp-staking-v3/std",
 	"pallet-evm-precompile-dispatch-lockdrop/std",
+	"pallet-evm-precompile-dispatch/std",
 	"pallet-evm-precompile-ed25519/std",
 	"pallet-evm-precompile-modexp/std",
 	"pallet-evm-precompile-sha3fips/std",
-	"pallet-dapp-staking-v3/std",
-	"pallet-dapp-staking-migration/std",
-	"dapp-staking-v3-runtime-api/std",
-	"pallet-inflation/std",
-	"pallet-evm-precompile-dapp-staking-v3/std",
+	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-sr25519/std",
-	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm-precompile-substrate-ecdsa/std",
 	"pallet-evm-precompile-xcm/std",
+	"pallet-evm/std",
 	"pallet-identity/std",
-	"pallet-multisig/std",
-	"pallet-membership/std",
+	"pallet-inflation/std",
 	"pallet-insecure-randomness-collective-flip/std",
-	"pallet-session/std",
-	"pallet-utility/std",
+	"pallet-membership/std",
+	"pallet-multisig/std",
+	"pallet-price-aggregator/std",
 	"pallet-proxy/std",
-	"pallet-timestamp/std",
-	"pallet-vesting/std",
-	"orml-oracle/std",
-	"sp-offchain/std",
-	"sp-session/std",
+	"pallet-session/std",
 	"pallet-sudo/std",
-	"pallet-transaction-payment/std",
+	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
+	"pallet-transaction-payment/std",
+	"pallet-utility/std",
+	"pallet-vesting/std",
+	"pallet-xc-asset-config/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
-	"pallet-price-aggregator/std",
 	"parachain-info/std",
+	"parity-scale-codec/std",
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
 	"polkadot-runtime-common/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-utility/std",
-	"cumulus-primitives-timestamp/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-pallet-xcm/std",
-	"pallet-collator-selection/std",
-	"moonbeam-evm-tracer/std",
-	"moonbeam-rpc-primitives-debug/std",
-	"moonbeam-rpc-primitives-txpool/std",
-	"frame-benchmarking/std",
-	"frame-try-runtime/std",
-	"xcm/std",
+	"precompile-utils/std",
+	"scale-info/std",
+	"sp-api/std",
+	"sp-arithmetic/std",
+	"sp-block-builder/std",
+	"sp-consensus-aura/std",
+	"sp-core/std",
+	"sp-genesis-builder/std",
+	"sp-inherents/std",
+	"sp-io/std",
+	"sp-offchain/std",
+	"sp-runtime-interface/std",
+	"sp-runtime/std",
+	"sp-session/std",
+	"sp-std/std",
+	"sp-transaction-pool/std",
+	"sp-version/std",
+	"substrate-wasm-builder",
 	"xcm-builder/std",
 	"xcm-executor/std",
-	"pallet-xc-asset-config/std",
-	"substrate-wasm-builder",
-	"pallet-chain-extension-assets/std",
-	"orml-xtokens/std",
-	"orml-xcm-support/std",
-	"astar-primitives/std",
+	"xcm/std",
 ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
+	"astar-xcm-benchmarks/runtime-benchmarks",
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
+	"oracle-benchmarks/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"pallet-chain-extension-assets/runtime-benchmarks",
+	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
 	"pallet-dapp-staking-migration/runtime-benchmarks",
+	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
+	"pallet-ethereum/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
+	"pallet-evm-precompile-xcm/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-identity/runtime-benchmarks",
 	"pallet-inflation/runtime-benchmarks",
+	"pallet-membership/runtime-benchmarks",
+	"pallet-multisig/runtime-benchmarks",
+	"pallet-price-aggregator/runtime-benchmarks",
+	"pallet-proxy/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"pallet-ethereum/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
+	"pallet-vesting/runtime-benchmarks",
+	"pallet-xc-asset-config/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
-	"astar-xcm-benchmarks/runtime-benchmarks",
-	"pallet-membership/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
-	"pallet-xc-asset-config/runtime-benchmarks",
-	"pallet-collator-selection/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
-	"pallet-price-aggregator/runtime-benchmarks",
-	"cumulus-primitives-utility/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"astar-primitives/try-runtime",
+	"astar-xcm-benchmarks?/try-runtime",
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-dmp-queue/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
+	"cumulus-pallet-xcmp-queue/try-runtime",
 	"fp-self-contained/try-runtime",
-	"log",
-	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"log",
+	"oracle-benchmarks/try-runtime",
+	"orml-oracle/try-runtime",
+	"orml-xtokens/try-runtime",
+	"pallet-assets/try-runtime",
 	"pallet-aura/try-runtime",
+	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
-	"orml-oracle/try-runtime",
-	"pallet-price-aggregator/try-runtime",
-	"pallet-membership/try-runtime",
-	"pallet-dapp-staking-v3/try-runtime",
+	"pallet-chain-extension-assets/try-runtime",
+	"pallet-collator-selection/try-runtime",
+	"pallet-contracts/try-runtime",
 	"pallet-dapp-staking-migration/try-runtime",
+	"pallet-dapp-staking-v3/try-runtime",
+	"pallet-dynamic-evm-base-fee/try-runtime",
+	"pallet-ethereum/try-runtime",
+	"pallet-evm/try-runtime",
+	"pallet-identity/try-runtime",
 	"pallet-inflation/try-runtime",
+	"pallet-insecure-randomness-collective-flip/try-runtime",
+	"pallet-membership/try-runtime",
+	"pallet-multisig/try-runtime",
+	"pallet-price-aggregator/try-runtime",
+	"pallet-proxy/try-runtime",
+	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
-	"pallet-ethereum/try-runtime",
 	"pallet-xc-asset-config/try-runtime",
-	"pallet-assets/try-runtime",
-	"pallet-authorship/try-runtime",
-	"pallet-collator-selection/try-runtime",
-	"pallet-session/try-runtime",
 	"pallet-xcm/try-runtime",
-	"pallet-identity/try-runtime",
-	"pallet-multisig/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-insecure-randomness-collective-flip/try-runtime",
-	"pallet-contracts/try-runtime",
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
 	"parachain-info/try-runtime",
-	"pallet-dynamic-evm-base-fee/try-runtime",
-	"pallet-evm/try-runtime",
-	"orml-xtokens/try-runtime",
-	"oracle-benchmarks/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/taplo.toml b/taplo.toml
deleted file mode 100644
index 2a52dd783c..0000000000
--- a/taplo.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-## https://taplo.tamasfe.dev/configuration/file.html
-
-include = ["**/Cargo.toml"]
-exclude = [".maintain/**/Cargo.toml", "target/**/Cargo.toml"]
-
-[formatting]
-# Align consecutive entries vertically.
-align_entries = false
-# Append trailing commas for multi-line arrays.
-array_trailing_comma = true
-# Expand arrays to multiple lines that exceed the maximum column width.
-array_auto_expand = false
-# Collapse arrays that don't exceed the maximum column width and don't contain comments.
-array_auto_collapse = false
-# Omit white space padding from single-line arrays
-compact_arrays = true
-# Omit white space padding from the start and end of inline tables.
-compact_inline_tables = false
-# Maximum column width in characters, affects array expansion and collapse, this doesn't take whitespace into account.
-# Note that this is not set in stone, and works on a best-effort basis.
-column_width = 160
-# Indent based on tables and arrays of tables and their subtables, subtables out of order are not indented.
-indent_tables = false
-# The substring that is used for indentation, should be tabs or spaces (but technically can be anything).
-indent_string = '	'
-# Add trailing newline at the end of the file if not present.
-trailing_newline = true
-# Alphabetically reorder keys that are not separated by empty lines.
-reorder_keys = false
-# Maximum amount of allowed consecutive blank lines. This does not affect the whitespace at the end of the document, as it is always stripped.
-allowed_blank_lines = 1
-# Use CRLF for line endings.
-crlf = false
-
-[[rule]]
-keys = ["dependencies", "dev-dependencies", "build-dependencies"]
-formatting = { reorder_keys = true }
diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml
index 14c2c008e2..97f68f1fa4 100644
--- a/tests/integration/Cargo.toml
+++ b/tests/integration/Cargo.toml
@@ -59,24 +59,58 @@ moonbeam-rpc-primitives-debug = { workspace = true, optional = true }
 pallet-ethereum = { workspace = true, optional = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
+	"assets-chain-extension-types/std",
+	"astar-primitives/std",
 	"astar-runtime/std",
+	"astar-test-utils/std",
+	"ethereum?/std",
+	"fp-evm/std",
+	"fp-rpc?/std",
+	"frame-support/std",
+	"frame-system/std",
+	"hex/std",
+	"libsecp256k1/std",
+	"moonbeam-rpc-primitives-debug?/std",
+	"orml-oracle/std",
+	"pallet-assets/std",
+	"pallet-balances/std",
+	"pallet-collator-selection/std",
+	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
+	"pallet-dapp-staking-v3/std",
+	"pallet-ethereum-checked/std",
+	"pallet-ethereum?/std",
+	"pallet-evm-precompile-assets-erc20/std",
+	"pallet-evm-precompile-dispatch/std",
+	"pallet-evm/std",
+	"pallet-inflation/std",
+	"pallet-membership/std",
+	"pallet-price-aggregator/std",
+	"pallet-proxy/std",
+	"pallet-unified-accounts/std",
+	"pallet-utility/std",
+	"parity-scale-codec/std",
+	"precompile-utils/std",
+	"sha3/std",
 	"shibuya-runtime/std",
 	"shiden-runtime/std",
-	"astar-primitives/std",
-	"astar-test-utils/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"unified-accounts-chain-extension-types/std",
 ]
-shibuya = ["shibuya-runtime"]
-shiden = ["shiden-runtime"]
-astar = ["astar-runtime"]
+shibuya = [ "shibuya-runtime" ]
+shiden = [ "shiden-runtime" ]
+astar = [ "astar-runtime" ]
 
 evm-tracing = [
-	"shibuya-runtime?/evm-tracing",
-	"shiden-runtime?/evm-tracing",
 	"astar-runtime?/evm-tracing",
 	"ethereum",
-	"pallet-ethereum",
-	"moonbeam-rpc-primitives-debug",
 	"fp-rpc",
+	"moonbeam-rpc-primitives-debug",
+	"pallet-ethereum",
+	"shibuya-runtime?/evm-tracing",
+	"shiden-runtime?/evm-tracing",
 ]
diff --git a/tests/utils/Cargo.toml b/tests/utils/Cargo.toml
index 0421e99221..205adeafb7 100644
--- a/tests/utils/Cargo.toml
+++ b/tests/utils/Cargo.toml
@@ -19,11 +19,13 @@ pallet-contracts-primitives = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
 	"frame-support/std",
 	"frame-system/std",
-	"pallet-contracts/std",
 	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
+	"sp-runtime/std",
 ]
diff --git a/tests/xcm-simulator/Cargo.toml b/tests/xcm-simulator/Cargo.toml
index b8bed7b801..fb9eb3de31 100644
--- a/tests/xcm-simulator/Cargo.toml
+++ b/tests/xcm-simulator/Cargo.toml
@@ -58,46 +58,46 @@ orml-xcm-support = { workspace = true }
 orml-xtokens = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
-	"sp-std/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"sp-tracing/std",
+	"cumulus-pallet-xcm/std",
 	"frame-support/std",
 	"frame-system/std",
+	"orml-traits/std",
+	"orml-xcm-support/std",
+	"orml-xtokens/std",
+	"pallet-assets/std",
 	"pallet-balances/std",
-	"pallet-timestamp/std",
-	"pallet-contracts/std",
 	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
+	"pallet-dapp-staking-v3/std",
 	"pallet-insecure-randomness-collective-flip/std",
-	"pallet-xcm/std",
-	"cumulus-pallet-xcm/std",
-	"pallet-assets/std",
-	"polkadot-primitives/std",
+	"pallet-message-queue/std",
 	"pallet-proxy/std",
+	"pallet-timestamp/std",
 	"pallet-utility/std",
-	"pallet-message-queue/std",
-	"orml-xtokens/std",
-	"orml-traits/std",
-	"orml-xcm-support/std",
-	"pallet-dapp-staking-v3/std",
+	"pallet-xcm/std",
+	"parity-scale-codec/std",
+	"polkadot-primitives/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"sp-tracing/std",
 ]
 runtime-benchmarks = [
-	"frame-system/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
 	"pallet-contracts/runtime-benchmarks",
+	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
-	"polkadot-runtime-parachains/runtime-benchmarks",
-	"polkadot-parachain/runtime-benchmarks",
-	"orml-xtokens/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
-	"pallet-message-queue/runtime-benchmarks",
-	"pallet-dapp-staking-v3/runtime-benchmarks",
 ]
diff --git a/vendor/primitives/debug/Cargo.toml b/vendor/primitives/debug/Cargo.toml
index 291c2fc16b..1ee86fa06c 100644
--- a/vendor/primitives/debug/Cargo.toml
+++ b/vendor/primitives/debug/Cargo.toml
@@ -24,14 +24,16 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
 	"environmental/std",
 	"ethereum-types/std",
 	"ethereum/std",
 	"hex",
+	"hex?/std",
+	"parity-scale-codec/std",
 	"serde",
+	"serde?/std",
 	"serde_json",
 	"sp-api/std",
 	"sp-core/std",
diff --git a/vendor/primitives/evm-tracing-events/Cargo.toml b/vendor/primitives/evm-tracing-events/Cargo.toml
index b8b219c31a..e4f6549d44 100644
--- a/vendor/primitives/evm-tracing-events/Cargo.toml
+++ b/vendor/primitives/evm-tracing-events/Cargo.toml
@@ -22,15 +22,15 @@ evm-gasometer = { workspace = true }
 evm-runtime = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
 	"environmental/std",
 	"ethereum-types/std",
 	"ethereum/std",
 	"evm-gasometer/std",
 	"evm-runtime/std",
 	"evm/std",
+	"parity-scale-codec/std",
 	"sp-runtime-interface/std",
 ]
-evm-tracing = ["evm-gasometer/tracing", "evm-runtime/tracing", "evm/tracing"]
+evm-tracing = [ "evm-gasometer/tracing", "evm-runtime/tracing", "evm/tracing" ]
diff --git a/vendor/primitives/txpool/Cargo.toml b/vendor/primitives/txpool/Cargo.toml
index 9b4dcb0290..f54e9d5aa9 100644
--- a/vendor/primitives/txpool/Cargo.toml
+++ b/vendor/primitives/txpool/Cargo.toml
@@ -19,13 +19,13 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"ethereum/std",
+	"parity-scale-codec/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"parity-scale-codec/std",
 ]
diff --git a/vendor/runtime/evm-tracer/Cargo.toml b/vendor/runtime/evm-tracer/Cargo.toml
index 8c6a62159b..8f25dce08c 100644
--- a/vendor/runtime/evm-tracer/Cargo.toml
+++ b/vendor/runtime/evm-tracer/Cargo.toml
@@ -29,9 +29,8 @@ fp-evm = { workspace = true }
 pallet-evm = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
 	"ethereum-types/std",
 	"evm-gasometer/std",
 	"evm-runtime/std",
@@ -41,7 +40,9 @@ std = [
 	"fp-evm/std",
 	"moonbeam-primitives-ext/std",
 	"pallet-evm/std",
+	"parity-scale-codec/std",
 	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
diff --git a/vendor/runtime/ext/Cargo.toml b/vendor/runtime/ext/Cargo.toml
index 0a30218125..f769feddf9 100644
--- a/vendor/runtime/ext/Cargo.toml
+++ b/vendor/runtime/ext/Cargo.toml
@@ -20,11 +20,11 @@ sp-runtime-interface = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
 	"ethereum-types/std",
 	"evm-tracing-events/std",
+	"parity-scale-codec/std",
 	"sp-externalities/std",
 	"sp-runtime-interface/std",
 	"sp-std/std",

From c42b491a4406cc8341e0044924974f1bd16672b8 Mon Sep 17 00:00:00 2001
From: Ermal Kaleci <ermalkaleci@gmail.com>
Date: Sun, 23 Jun 2024 12:19:21 +0200
Subject: [PATCH 07/10] rename job

---
 .github/workflows/zepter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/zepter.yml b/.github/workflows/zepter.yml
index 5a18129100..8e66a16c06 100644
--- a/.github/workflows/zepter.yml
+++ b/.github/workflows/zepter.yml
@@ -17,7 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  check:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the source code

From ac509e1867f58fb8067e2a5e6e44c00942d27a91 Mon Sep 17 00:00:00 2001
From: Ermal Kaleci <ermalkaleci@gmail.com>
Date: Sun, 23 Jun 2024 16:26:04 +0200
Subject: [PATCH 08/10] make it work with taplo

---
 .config/zepter.yaml                           |  3 --
 .github/workflows/static-analysis.yml         |  9 +++++
 bin/collator/Cargo.toml                       |  6 +--
 chain-extensions/pallet-assets/Cargo.toml     |  2 +-
 chain-extensions/types/assets/Cargo.toml      |  2 +-
 .../types/unified-accounts/Cargo.toml         |  2 +-
 chain-extensions/types/xvm/Cargo.toml         |  2 +-
 chain-extensions/unified-accounts/Cargo.toml  |  2 +-
 chain-extensions/xvm/Cargo.toml               |  2 +-
 pallets/astar-xcm-benchmarks/Cargo.toml       |  4 +-
 pallets/collator-selection/Cargo.toml         |  2 +-
 pallets/dapp-staking-migration/Cargo.toml     |  2 +-
 pallets/dapp-staking-v3/Cargo.toml            |  2 +-
 .../rpc/runtime-api/Cargo.toml                |  4 +-
 pallets/dynamic-evm-base-fee/Cargo.toml       |  2 +-
 pallets/ethereum-checked/Cargo.toml           |  2 +-
 pallets/inflation/Cargo.toml                  |  2 +-
 pallets/oracle-benchmarks/Cargo.toml          |  2 +-
 pallets/price-aggregator/Cargo.toml           |  2 +-
 pallets/static-price-provider/Cargo.toml      |  2 +-
 pallets/unified-accounts/Cargo.toml           |  2 +-
 pallets/xc-asset-config/Cargo.toml            |  2 +-
 pallets/xvm/Cargo.toml                        |  2 +-
 precompiles/assets-erc20/Cargo.toml           |  2 +-
 precompiles/dapp-staking-v3/Cargo.toml        |  2 +-
 precompiles/dispatch-lockdrop/Cargo.toml      |  2 +-
 precompiles/sr25519/Cargo.toml                |  2 +-
 precompiles/substrate-ecdsa/Cargo.toml        |  2 +-
 precompiles/unified-accounts/Cargo.toml       |  2 +-
 precompiles/utils/Cargo.toml                  |  4 +-
 precompiles/utils/macro/Cargo.toml            |  2 +-
 precompiles/xcm/Cargo.toml                    |  2 +-
 precompiles/xvm/Cargo.toml                    |  2 +-
 primitives/Cargo.toml                         |  2 +-
 runtime/astar/Cargo.toml                      |  2 +-
 runtime/local/Cargo.toml                      |  2 +-
 runtime/shibuya/Cargo.toml                    |  2 +-
 runtime/shiden/Cargo.toml                     |  2 +-
 taplo.toml                                    | 37 +++++++++++++++++++
 tests/integration/Cargo.toml                  |  8 ++--
 tests/utils/Cargo.toml                        |  2 +-
 tests/xcm-simulator/Cargo.toml                |  2 +-
 vendor/primitives/debug/Cargo.toml            |  2 +-
 .../primitives/evm-tracing-events/Cargo.toml  |  4 +-
 vendor/primitives/txpool/Cargo.toml           |  2 +-
 vendor/runtime/evm-tracer/Cargo.toml          |  2 +-
 vendor/runtime/ext/Cargo.toml                 |  2 +-
 47 files changed, 99 insertions(+), 56 deletions(-)
 create mode 100644 taplo.toml

diff --git a/.config/zepter.yaml b/.config/zepter.yaml
index 3abeccb49d..291c3f0f3f 100644
--- a/.config/zepter.yaml
+++ b/.config/zepter.yaml
@@ -33,12 +33,9 @@ workflows:
         '--locked',
         '--quiet',
       ]
-      # Format the features into canonical format:
-    - ['format', 'features', '--offline', '--locked', '--quiet']
   # Same as `check`, but actually fix the issues instead of just reporting them:
   default:
     - [ $check.0, '--fix' ]
-    - [ $check.1, '--fix' ]
 
 # Will be displayed when any workflow fails:
 help:
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 0f5dca7053..e193a2a728 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -24,6 +24,15 @@ jobs:
       - name: Check fmt
         run: cargo fmt -- --check
 
+      - name: Check Cargo.toml format
+        run: |
+          if taplo --version &> /dev/null; then
+            echo "taplo-cli is already installed"
+          else
+            cargo install taplo-cli
+          fi
+          taplo fmt --check
+
   clippy:
     if: github.event.pull_request.draft == false
     runs-on: [self-hosted, Linux, X64]
diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
index 98a64e6814..f6d169440f 100644
--- a/bin/collator/Cargo.toml
+++ b/bin/collator/Cargo.toml
@@ -154,7 +154,7 @@ sc-service = { workspace = true, optional = true }
 substrate-build-script-utils = { workspace = true }
 
 [features]
-default = [ "polkadot-cli", "sc-cli", "sc-service", "sc-service/rocksdb" ]
+default = ["polkadot-cli", "sc-cli", "sc-service", "sc-service/rocksdb"]
 runtime-benchmarks = [
 	"astar-primitives/runtime-benchmarks",
 	"astar-runtime/runtime-benchmarks",
@@ -179,7 +179,7 @@ runtime-benchmarks = [
 	"sp-keyring",
 	"sp-runtime/runtime-benchmarks",
 ]
-cli = [ "try-runtime-cli" ]
+cli = ["try-runtime-cli"]
 try-runtime = [
 	"astar-primitives/try-runtime",
 	"astar-runtime/try-runtime",
@@ -208,4 +208,4 @@ evm-tracing = [
 	"shibuya-runtime/evm-tracing",
 	"shiden-runtime/evm-tracing",
 ]
-manual-seal = [ "sc-consensus-manual-seal" ]
+manual-seal = ["sc-consensus-manual-seal"]
diff --git a/chain-extensions/pallet-assets/Cargo.toml b/chain-extensions/pallet-assets/Cargo.toml
index 93e3b76655..415840b6ed 100644
--- a/chain-extensions/pallet-assets/Cargo.toml
+++ b/chain-extensions/pallet-assets/Cargo.toml
@@ -30,7 +30,7 @@ pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"assets-chain-extension-types/std",
 	"frame-support/std",
diff --git a/chain-extensions/types/assets/Cargo.toml b/chain-extensions/types/assets/Cargo.toml
index e7bf6aa0a5..962a24650e 100644
--- a/chain-extensions/types/assets/Cargo.toml
+++ b/chain-extensions/types/assets/Cargo.toml
@@ -15,7 +15,7 @@ scale-info = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"num_enum/std",
 	"parity-scale-codec/std",
diff --git a/chain-extensions/types/unified-accounts/Cargo.toml b/chain-extensions/types/unified-accounts/Cargo.toml
index d16e282d82..340f7195ee 100644
--- a/chain-extensions/types/unified-accounts/Cargo.toml
+++ b/chain-extensions/types/unified-accounts/Cargo.toml
@@ -17,7 +17,7 @@ sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"num_enum/std",
 	"parity-scale-codec/std",
diff --git a/chain-extensions/types/xvm/Cargo.toml b/chain-extensions/types/xvm/Cargo.toml
index da09855f96..e707d17318 100644
--- a/chain-extensions/types/xvm/Cargo.toml
+++ b/chain-extensions/types/xvm/Cargo.toml
@@ -16,7 +16,7 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"parity-scale-codec/std",
diff --git a/chain-extensions/unified-accounts/Cargo.toml b/chain-extensions/unified-accounts/Cargo.toml
index ac5b1be27b..59c4d49beb 100644
--- a/chain-extensions/unified-accounts/Cargo.toml
+++ b/chain-extensions/unified-accounts/Cargo.toml
@@ -27,7 +27,7 @@ pallet-unified-accounts = { workspace = true }
 unified-accounts-chain-extension-types = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	# Astar
 	"astar-primitives/std",
diff --git a/chain-extensions/xvm/Cargo.toml b/chain-extensions/xvm/Cargo.toml
index a5463399e9..7d285f7975 100644
--- a/chain-extensions/xvm/Cargo.toml
+++ b/chain-extensions/xvm/Cargo.toml
@@ -27,7 +27,7 @@ astar-primitives = { workspace = true }
 xvm-chain-extension-types = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	# Astar
 	"astar-primitives/std",
diff --git a/pallets/astar-xcm-benchmarks/Cargo.toml b/pallets/astar-xcm-benchmarks/Cargo.toml
index 6dcaadac20..682b7c0286 100644
--- a/pallets/astar-xcm-benchmarks/Cargo.toml
+++ b/pallets/astar-xcm-benchmarks/Cargo.toml
@@ -17,7 +17,7 @@ serde = { workspace = true, optional = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 parity-scale-codec = { workspace = true, optional = true, features = [
-    "derive",
+	"derive",
 ] }
 scale-info = { workspace = true }
 sp-runtime = { workspace = true }
@@ -42,7 +42,7 @@ sp-io = { workspace = true, features = ["std"] }
 xcm-builder = { workspace = true, features = ["std"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking/std",
diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
index ff71691cac..3a3c108063 100644
--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -39,7 +39,7 @@ sp-io = { workspace = true }
 sp-tracing = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-benchmarking/runtime-benchmarks",
diff --git a/pallets/dapp-staking-migration/Cargo.toml b/pallets/dapp-staking-migration/Cargo.toml
index d1064f852e..d1f244ddf2 100644
--- a/pallets/dapp-staking-migration/Cargo.toml
+++ b/pallets/dapp-staking-migration/Cargo.toml
@@ -28,7 +28,7 @@ sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking/std",
diff --git a/pallets/dapp-staking-v3/Cargo.toml b/pallets/dapp-staking-v3/Cargo.toml
index afeb0b4467..09beed8990 100644
--- a/pallets/dapp-staking-v3/Cargo.toml
+++ b/pallets/dapp-staking-v3/Cargo.toml
@@ -31,7 +31,7 @@ frame-benchmarking = { workspace = true, optional = true }
 pallet-balances = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking/std",
diff --git a/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml b/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml
index 283a219a1c..9f19d9c353 100644
--- a/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml
+++ b/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml
@@ -17,5 +17,5 @@ sp-std = { workspace = true }
 astar-primitives = { workspace = true }
 
 [features]
-default = [ "std" ]
-std = [ "astar-primitives/std", "sp-api/std", "sp-std/std" ]
+default = ["std"]
+std = ["astar-primitives/std", "sp-api/std", "sp-std/std"]
diff --git a/pallets/dynamic-evm-base-fee/Cargo.toml b/pallets/dynamic-evm-base-fee/Cargo.toml
index 8a056ccaef..bc68045fb2 100644
--- a/pallets/dynamic-evm-base-fee/Cargo.toml
+++ b/pallets/dynamic-evm-base-fee/Cargo.toml
@@ -31,7 +31,7 @@ pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	# Frontier
 	"fp-evm/std",
diff --git a/pallets/ethereum-checked/Cargo.toml b/pallets/ethereum-checked/Cargo.toml
index 199bb12b48..4788a0ee9f 100644
--- a/pallets/ethereum-checked/Cargo.toml
+++ b/pallets/ethereum-checked/Cargo.toml
@@ -35,7 +35,7 @@ pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"ethereum-types/std",
diff --git a/pallets/inflation/Cargo.toml b/pallets/inflation/Cargo.toml
index 64da1d660f..56314d9cd0 100644
--- a/pallets/inflation/Cargo.toml
+++ b/pallets/inflation/Cargo.toml
@@ -28,7 +28,7 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking?/std",
diff --git a/pallets/oracle-benchmarks/Cargo.toml b/pallets/oracle-benchmarks/Cargo.toml
index aa9144b002..4cd5232fad 100644
--- a/pallets/oracle-benchmarks/Cargo.toml
+++ b/pallets/oracle-benchmarks/Cargo.toml
@@ -28,7 +28,7 @@ astar-primitives = { workspace = true }
 frame-benchmarking = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking?/std",
diff --git a/pallets/price-aggregator/Cargo.toml b/pallets/price-aggregator/Cargo.toml
index 3abd8904c6..c3ee40f9ca 100644
--- a/pallets/price-aggregator/Cargo.toml
+++ b/pallets/price-aggregator/Cargo.toml
@@ -32,7 +32,7 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking?/std",
diff --git a/pallets/static-price-provider/Cargo.toml b/pallets/static-price-provider/Cargo.toml
index dfa0143db9..225ce4a4bc 100644
--- a/pallets/static-price-provider/Cargo.toml
+++ b/pallets/static-price-provider/Cargo.toml
@@ -29,7 +29,7 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking?/std",
diff --git a/pallets/unified-accounts/Cargo.toml b/pallets/unified-accounts/Cargo.toml
index cd3e7ea9ff..349e4f85c0 100644
--- a/pallets/unified-accounts/Cargo.toml
+++ b/pallets/unified-accounts/Cargo.toml
@@ -42,7 +42,7 @@ pallet-evm = { workspace = true }
 pallet-timestamp = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking?/std",
diff --git a/pallets/xc-asset-config/Cargo.toml b/pallets/xc-asset-config/Cargo.toml
index 90d69f06c5..3ad245284c 100644
--- a/pallets/xc-asset-config/Cargo.toml
+++ b/pallets/xc-asset-config/Cargo.toml
@@ -31,7 +31,7 @@ pallet-timestamp = { workspace = true }
 sp-core = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"frame-benchmarking?/std",
 	"frame-support/std",
diff --git a/pallets/xvm/Cargo.toml b/pallets/xvm/Cargo.toml
index 60ee4cb4fd..bc520255db 100644
--- a/pallets/xvm/Cargo.toml
+++ b/pallets/xvm/Cargo.toml
@@ -42,7 +42,7 @@ pallet-timestamp = { workspace = true, features = ["std"] }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"environmental/std",
diff --git a/precompiles/assets-erc20/Cargo.toml b/precompiles/assets-erc20/Cargo.toml
index ad35e49b6f..51a584e20a 100644
--- a/precompiles/assets-erc20/Cargo.toml
+++ b/precompiles/assets-erc20/Cargo.toml
@@ -40,7 +40,7 @@ pallet-timestamp = { workspace = true }
 scale-info = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"fp-evm/std",
 	"frame-support/std",
diff --git a/precompiles/dapp-staking-v3/Cargo.toml b/precompiles/dapp-staking-v3/Cargo.toml
index f7a2103139..a2ab49adbf 100644
--- a/precompiles/dapp-staking-v3/Cargo.toml
+++ b/precompiles/dapp-staking-v3/Cargo.toml
@@ -42,7 +42,7 @@ sp-arithmetic = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"fp-evm/std",
diff --git a/precompiles/dispatch-lockdrop/Cargo.toml b/precompiles/dispatch-lockdrop/Cargo.toml
index 63f391f822..43397de82f 100644
--- a/precompiles/dispatch-lockdrop/Cargo.toml
+++ b/precompiles/dispatch-lockdrop/Cargo.toml
@@ -38,7 +38,7 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"fp-evm/std",
diff --git a/precompiles/sr25519/Cargo.toml b/precompiles/sr25519/Cargo.toml
index 36c916d3fe..44054e79bf 100644
--- a/precompiles/sr25519/Cargo.toml
+++ b/precompiles/sr25519/Cargo.toml
@@ -37,7 +37,7 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"fp-evm/std",
 	"log/std",
diff --git a/precompiles/substrate-ecdsa/Cargo.toml b/precompiles/substrate-ecdsa/Cargo.toml
index b9f60c63f4..6a3b6602a2 100644
--- a/precompiles/substrate-ecdsa/Cargo.toml
+++ b/precompiles/substrate-ecdsa/Cargo.toml
@@ -38,7 +38,7 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"fp-evm/std",
 	"log/std",
diff --git a/precompiles/unified-accounts/Cargo.toml b/precompiles/unified-accounts/Cargo.toml
index 0a5bae85de..3cf2050ccd 100644
--- a/precompiles/unified-accounts/Cargo.toml
+++ b/precompiles/unified-accounts/Cargo.toml
@@ -45,7 +45,7 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"fp-evm/std",
diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml
index 57dfdfb9d6..7f4660e947 100644
--- a/precompiles/utils/Cargo.toml
+++ b/precompiles/utils/Cargo.toml
@@ -42,7 +42,7 @@ hex-literal = { workspace = true }
 xcm = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"environmental/std",
 	"evm/std",
@@ -62,7 +62,7 @@ std = [
 	"sp-std/std",
 	"xcm?/std",
 ]
-codec-xcm = [ "xcm" ]
+codec-xcm = ["xcm"]
 testing = [
 	"derive_more",
 	"hex-literal",
diff --git a/precompiles/utils/macro/Cargo.toml b/precompiles/utils/macro/Cargo.toml
index 3b8d85501b..91cc2e16de 100644
--- a/precompiles/utils/macro/Cargo.toml
+++ b/precompiles/utils/macro/Cargo.toml
@@ -33,7 +33,7 @@ sp-core-hashing = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"fp-evm/std",
 	"frame-support/std",
diff --git a/precompiles/xcm/Cargo.toml b/precompiles/xcm/Cargo.toml
index 9f8b054bb0..54ef4807d4 100644
--- a/precompiles/xcm/Cargo.toml
+++ b/precompiles/xcm/Cargo.toml
@@ -50,7 +50,7 @@ pallet-timestamp = { workspace = true }
 xcm-builder = { workspace = true, features = ["std"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"fp-evm/std",
diff --git a/precompiles/xvm/Cargo.toml b/precompiles/xvm/Cargo.toml
index ee55b001c3..b1e58519ae 100644
--- a/precompiles/xvm/Cargo.toml
+++ b/precompiles/xvm/Cargo.toml
@@ -42,7 +42,7 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"fp-evm/std",
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index ba1651e564..1b9a88a787 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -48,7 +48,7 @@ pallet-evm-precompile-dispatch = { workspace = true }
 pallet-xc-asset-config = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"ethereum-types/std",
 	"ethereum/std",
diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml
index 98985dd559..9bb4dbfdf7 100644
--- a/runtime/astar/Cargo.toml
+++ b/runtime/astar/Cargo.toml
@@ -136,7 +136,7 @@ pallet-chain-extension-assets = { workspace = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"astar-xcm-benchmarks?/std",
diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml
index a8fdf7ac4e..be5234b8b8 100644
--- a/runtime/local/Cargo.toml
+++ b/runtime/local/Cargo.toml
@@ -105,7 +105,7 @@ frame-try-runtime = { workspace = true, optional = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"dapp-staking-v3-runtime-api/std",
diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml
index 97a419266d..db2cd223d7 100644
--- a/runtime/shibuya/Cargo.toml
+++ b/runtime/shibuya/Cargo.toml
@@ -147,7 +147,7 @@ frame-try-runtime = { workspace = true, optional = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"astar-xcm-benchmarks?/std",
diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml
index 6f125c658a..bcbf56d935 100644
--- a/runtime/shiden/Cargo.toml
+++ b/runtime/shiden/Cargo.toml
@@ -139,7 +139,7 @@ pallet-chain-extension-assets = { workspace = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"astar-xcm-benchmarks?/std",
diff --git a/taplo.toml b/taplo.toml
new file mode 100644
index 0000000000..2a52dd783c
--- /dev/null
+++ b/taplo.toml
@@ -0,0 +1,37 @@
+## https://taplo.tamasfe.dev/configuration/file.html
+
+include = ["**/Cargo.toml"]
+exclude = [".maintain/**/Cargo.toml", "target/**/Cargo.toml"]
+
+[formatting]
+# Align consecutive entries vertically.
+align_entries = false
+# Append trailing commas for multi-line arrays.
+array_trailing_comma = true
+# Expand arrays to multiple lines that exceed the maximum column width.
+array_auto_expand = false
+# Collapse arrays that don't exceed the maximum column width and don't contain comments.
+array_auto_collapse = false
+# Omit white space padding from single-line arrays
+compact_arrays = true
+# Omit white space padding from the start and end of inline tables.
+compact_inline_tables = false
+# Maximum column width in characters, affects array expansion and collapse, this doesn't take whitespace into account.
+# Note that this is not set in stone, and works on a best-effort basis.
+column_width = 160
+# Indent based on tables and arrays of tables and their subtables, subtables out of order are not indented.
+indent_tables = false
+# The substring that is used for indentation, should be tabs or spaces (but technically can be anything).
+indent_string = '	'
+# Add trailing newline at the end of the file if not present.
+trailing_newline = true
+# Alphabetically reorder keys that are not separated by empty lines.
+reorder_keys = false
+# Maximum amount of allowed consecutive blank lines. This does not affect the whitespace at the end of the document, as it is always stripped.
+allowed_blank_lines = 1
+# Use CRLF for line endings.
+crlf = false
+
+[[rule]]
+keys = ["dependencies", "dev-dependencies", "build-dependencies"]
+formatting = { reorder_keys = true }
diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml
index 97f68f1fa4..4f80366e5c 100644
--- a/tests/integration/Cargo.toml
+++ b/tests/integration/Cargo.toml
@@ -59,7 +59,7 @@ moonbeam-rpc-primitives-debug = { workspace = true, optional = true }
 pallet-ethereum = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"assets-chain-extension-types/std",
 	"astar-primitives/std",
@@ -101,9 +101,9 @@ std = [
 	"sp-runtime/std",
 	"unified-accounts-chain-extension-types/std",
 ]
-shibuya = [ "shibuya-runtime" ]
-shiden = [ "shiden-runtime" ]
-astar = [ "astar-runtime" ]
+shibuya = ["shibuya-runtime"]
+shiden = ["shiden-runtime"]
+astar = ["astar-runtime"]
 
 evm-tracing = [
 	"astar-runtime?/evm-tracing",
diff --git a/tests/utils/Cargo.toml b/tests/utils/Cargo.toml
index 205adeafb7..66d4a2ae4c 100644
--- a/tests/utils/Cargo.toml
+++ b/tests/utils/Cargo.toml
@@ -19,7 +19,7 @@ pallet-contracts-primitives = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"frame-support/std",
 	"frame-system/std",
diff --git a/tests/xcm-simulator/Cargo.toml b/tests/xcm-simulator/Cargo.toml
index fb9eb3de31..7e359a8286 100644
--- a/tests/xcm-simulator/Cargo.toml
+++ b/tests/xcm-simulator/Cargo.toml
@@ -58,7 +58,7 @@ orml-xcm-support = { workspace = true }
 orml-xtokens = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"cumulus-pallet-xcm/std",
 	"frame-support/std",
diff --git a/vendor/primitives/debug/Cargo.toml b/vendor/primitives/debug/Cargo.toml
index 1ee86fa06c..031f1adc8b 100644
--- a/vendor/primitives/debug/Cargo.toml
+++ b/vendor/primitives/debug/Cargo.toml
@@ -24,7 +24,7 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"environmental/std",
 	"ethereum-types/std",
diff --git a/vendor/primitives/evm-tracing-events/Cargo.toml b/vendor/primitives/evm-tracing-events/Cargo.toml
index e4f6549d44..184a393504 100644
--- a/vendor/primitives/evm-tracing-events/Cargo.toml
+++ b/vendor/primitives/evm-tracing-events/Cargo.toml
@@ -22,7 +22,7 @@ evm-gasometer = { workspace = true }
 evm-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"environmental/std",
 	"ethereum-types/std",
@@ -33,4 +33,4 @@ std = [
 	"parity-scale-codec/std",
 	"sp-runtime-interface/std",
 ]
-evm-tracing = [ "evm-gasometer/tracing", "evm-runtime/tracing", "evm/tracing" ]
+evm-tracing = ["evm-gasometer/tracing", "evm-runtime/tracing", "evm/tracing"]
diff --git a/vendor/primitives/txpool/Cargo.toml b/vendor/primitives/txpool/Cargo.toml
index f54e9d5aa9..f0ac6b4b92 100644
--- a/vendor/primitives/txpool/Cargo.toml
+++ b/vendor/primitives/txpool/Cargo.toml
@@ -19,7 +19,7 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"ethereum/std",
 	"parity-scale-codec/std",
diff --git a/vendor/runtime/evm-tracer/Cargo.toml b/vendor/runtime/evm-tracer/Cargo.toml
index 8f25dce08c..9521a5f068 100644
--- a/vendor/runtime/evm-tracer/Cargo.toml
+++ b/vendor/runtime/evm-tracer/Cargo.toml
@@ -29,7 +29,7 @@ fp-evm = { workspace = true }
 pallet-evm = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"ethereum-types/std",
 	"evm-gasometer/std",
diff --git a/vendor/runtime/ext/Cargo.toml b/vendor/runtime/ext/Cargo.toml
index f769feddf9..cdbc2ce606 100644
--- a/vendor/runtime/ext/Cargo.toml
+++ b/vendor/runtime/ext/Cargo.toml
@@ -20,7 +20,7 @@ sp-runtime-interface = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"ethereum-types/std",
 	"evm-tracing-events/std",

From f13967ca358fd582f3f1462616b74562c95e9e8c Mon Sep 17 00:00:00 2001
From: Ermal Kaleci <ermalkaleci@gmail.com>
Date: Sun, 23 Jun 2024 16:42:46 +0200
Subject: [PATCH 09/10] Revert "remove taplo in favor of zepter"

This reverts commit 83c56063910394096c3ba64b496b3bf746b90a0e.
---
 bin/collator/Cargo.toml                       |  44 +--
 chain-extensions/pallet-assets/Cargo.toml     |  29 +-
 chain-extensions/types/assets/Cargo.toml      |   2 +-
 chain-extensions/types/xvm/Cargo.toml         |   2 +-
 chain-extensions/unified-accounts/Cargo.toml  |  13 +-
 chain-extensions/xvm/Cargo.toml               |  12 +-
 pallets/astar-xcm-benchmarks/Cargo.toml       |  22 +-
 pallets/collator-selection/Cargo.toml         |  30 +-
 pallets/dapp-staking-migration/Cargo.toml     |  30 +-
 pallets/dapp-staking-v3/Cargo.toml            |  30 +-
 .../rpc/runtime-api/Cargo.toml                |   6 +-
 pallets/dynamic-evm-base-fee/Cargo.toml       |  20 +-
 pallets/ethereum-checked/Cargo.toml           |  38 +--
 pallets/inflation/Cargo.toml                  |  24 +-
 pallets/oracle-benchmarks/Cargo.toml          |  27 +-
 pallets/price-aggregator/Cargo.toml           |  28 +-
 pallets/static-price-provider/Cargo.toml      |  26 +-
 pallets/unified-accounts/Cargo.toml           |  36 +--
 pallets/xc-asset-config/Cargo.toml            |  16 +-
 pallets/xvm/Cargo.toml                        |  20 +-
 precompiles/assets-erc20/Cargo.toml           |  15 +-
 precompiles/dapp-staking-v3/Cargo.toml        |  23 +-
 precompiles/dispatch-lockdrop/Cargo.toml      |  20 +-
 precompiles/sr25519/Cargo.toml                |   6 +-
 precompiles/substrate-ecdsa/Cargo.toml        |   7 +-
 precompiles/unified-accounts/Cargo.toml       |  11 +-
 precompiles/utils/Cargo.toml                  |  16 +-
 precompiles/utils/macro/Cargo.toml            |   1 -
 precompiles/xcm/Cargo.toml                    |  34 +--
 precompiles/xvm/Cargo.toml                    |   9 +-
 primitives/Cargo.toml                         |  49 +---
 runtime/astar/Cargo.toml                      | 231 +++++++---------
 runtime/local/Cargo.toml                      | 117 ++++----
 runtime/shibuya/Cargo.toml                    | 260 ++++++++----------
 runtime/shiden/Cargo.toml                     | 230 +++++++---------
 tests/integration/Cargo.toml                  |  46 +---
 tests/utils/Cargo.toml                        |   6 +-
 tests/xcm-simulator/Cargo.toml                |  50 ++--
 vendor/primitives/debug/Cargo.toml            |   4 +-
 .../primitives/evm-tracing-events/Cargo.toml  |   2 +-
 vendor/primitives/txpool/Cargo.toml           |   2 +-
 vendor/runtime/evm-tracer/Cargo.toml          |   3 +-
 vendor/runtime/ext/Cargo.toml                 |   2 +-
 43 files changed, 606 insertions(+), 993 deletions(-)

diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
index f6d169440f..09d6c53c35 100644
--- a/bin/collator/Cargo.toml
+++ b/bin/collator/Cargo.toml
@@ -154,52 +154,22 @@ sc-service = { workspace = true, optional = true }
 substrate-build-script-utils = { workspace = true }
 
 [features]
-default = ["polkadot-cli", "sc-cli", "sc-service", "sc-service/rocksdb"]
+default = ["sc-cli", "polkadot-cli", "sc-service", "sc-service/rocksdb"]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
-	"astar-runtime/runtime-benchmarks",
 	"frame-benchmarking-cli",
-	"frame-benchmarking-cli?/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
 	"local-runtime/runtime-benchmarks",
-	"pallet-ethereum/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
-	"polkadot-cli/runtime-benchmarks",
-	"polkadot-parachain/runtime-benchmarks",
-	"polkadot-primitives/runtime-benchmarks",
-	"polkadot-runtime-common",
-	"polkadot-runtime-common/std",
-	"polkadot-runtime-common?/runtime-benchmarks",
-	"polkadot-service/runtime-benchmarks",
-	"sc-client-db/runtime-benchmarks",
-	"sc-service/runtime-benchmarks",
 	"shibuya-runtime/runtime-benchmarks",
 	"shiden-runtime/runtime-benchmarks",
+	"astar-runtime/runtime-benchmarks",
+	"polkadot-cli/runtime-benchmarks",
+	"polkadot-runtime-common/std",
 	"sp-keyring",
-	"sp-runtime/runtime-benchmarks",
+	"polkadot-runtime-common",
+	"astar-primitives/runtime-benchmarks",
 ]
 cli = ["try-runtime-cli"]
-try-runtime = [
-	"astar-primitives/try-runtime",
-	"astar-runtime/try-runtime",
-	"frame-system/try-runtime",
-	"frame-try-runtime/try-runtime",
-	"local-runtime/try-runtime",
-	"pallet-ethereum/try-runtime",
-	"pallet-evm/try-runtime",
-	"pallet-transaction-payment/try-runtime",
-	"polkadot-cli?/try-runtime",
-	"polkadot-runtime-common?/try-runtime",
-	"polkadot-service/try-runtime",
-	"shibuya-runtime/try-runtime",
-	"shiden-runtime/try-runtime",
-	"sp-runtime/try-runtime",
-	"try-runtime-cli/try-runtime",
-]
+try-runtime = ["local-runtime/try-runtime", "try-runtime-cli/try-runtime"]
 evm-tracing = [
-	"astar-runtime/evm-tracing",
-	"local-runtime/evm-tracing",
 	"moonbeam-rpc-debug",
 	"moonbeam-rpc-primitives-debug",
 	"moonbeam-rpc-primitives-txpool",
diff --git a/chain-extensions/pallet-assets/Cargo.toml b/chain-extensions/pallet-assets/Cargo.toml
index 415840b6ed..0bd86ecf95 100644
--- a/chain-extensions/pallet-assets/Cargo.toml
+++ b/chain-extensions/pallet-assets/Cargo.toml
@@ -32,32 +32,19 @@ sp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"assets-chain-extension-types/std",
+	"parity-scale-codec/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
 	"num-traits/std",
-	"pallet-assets/std",
-	"pallet-balances/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
-	"parity-scale-codec/std",
+	"pallet-contracts-primitives/std",
 	"scale-info/std",
+	"sp-std/std",
 	"sp-core/std",
 	"sp-runtime/std",
-	"sp-std/std",
-]
-try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"pallet-assets/try-runtime",
-	"pallet-contracts/try-runtime",
-	"sp-runtime/try-runtime",
-]
-runtime-benchmarks = [
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-contracts/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
+	"pallet-assets/std",
+	"assets-chain-extension-types/std",
+	"pallet-balances/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
+runtime-benchmarks = ["pallet-assets/runtime-benchmarks"]
diff --git a/chain-extensions/types/assets/Cargo.toml b/chain-extensions/types/assets/Cargo.toml
index 962a24650e..ddb1119268 100644
--- a/chain-extensions/types/assets/Cargo.toml
+++ b/chain-extensions/types/assets/Cargo.toml
@@ -18,7 +18,7 @@ sp-runtime = { workspace = true }
 default = ["std"]
 std = [
 	"num_enum/std",
-	"parity-scale-codec/std",
 	"scale-info/std",
+	"parity-scale-codec/std",
 	"sp-runtime/std",
 ]
diff --git a/chain-extensions/types/xvm/Cargo.toml b/chain-extensions/types/xvm/Cargo.toml
index e707d17318..e9888174c8 100644
--- a/chain-extensions/types/xvm/Cargo.toml
+++ b/chain-extensions/types/xvm/Cargo.toml
@@ -18,9 +18,9 @@ sp-std = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"astar-primitives/std",
 ]
diff --git a/chain-extensions/unified-accounts/Cargo.toml b/chain-extensions/unified-accounts/Cargo.toml
index 59c4d49beb..5f6e4e4b8f 100644
--- a/chain-extensions/unified-accounts/Cargo.toml
+++ b/chain-extensions/unified-accounts/Cargo.toml
@@ -29,20 +29,19 @@ unified-accounts-chain-extension-types = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	# Astar
-	"astar-primitives/std",
+	"parity-scale-codec/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
 	"num-traits/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
 	"pallet-evm/std",
-	"pallet-unified-accounts/std",
-	"parity-scale-codec/std",
+	"pallet-contracts-primitives/std",
 	"scale-info/std",
+	"sp-std/std",
 	"sp-core/std",
 	"sp-runtime/std",
-	"sp-std/std",
+	# Astar
+	"astar-primitives/std",
+	"pallet-unified-accounts/std",
 	"unified-accounts-chain-extension-types/std",
 ]
diff --git a/chain-extensions/xvm/Cargo.toml b/chain-extensions/xvm/Cargo.toml
index 7d285f7975..11ac1ed5e1 100644
--- a/chain-extensions/xvm/Cargo.toml
+++ b/chain-extensions/xvm/Cargo.toml
@@ -29,19 +29,17 @@ xvm-chain-extension-types = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	# Astar
-	"astar-primitives/std",
+	"parity-scale-codec/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
 	"num-traits/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
+	"pallet-contracts-primitives/std",
 	"pallet-unified-accounts/std",
-	"parity-scale-codec/std",
 	"scale-info/std",
+	"sp-std/std",
 	"sp-core/std",
 	"sp-runtime/std",
-	"sp-std/std",
-	"xvm-chain-extension-types/std",
+	# Astar
+	"astar-primitives/std",
 ]
diff --git a/pallets/astar-xcm-benchmarks/Cargo.toml b/pallets/astar-xcm-benchmarks/Cargo.toml
index 682b7c0286..db29f90c9e 100644
--- a/pallets/astar-xcm-benchmarks/Cargo.toml
+++ b/pallets/astar-xcm-benchmarks/Cargo.toml
@@ -16,9 +16,7 @@ serde = { workspace = true, optional = true }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-parity-scale-codec = { workspace = true, optional = true, features = [
-	"derive",
-] }
+parity-scale-codec = { workspace = true, optional = true, features = ["derive"] }
 scale-info = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
@@ -48,34 +46,22 @@ std = [
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
 	"pallet-xcm-benchmarks/std",
 	"parity-scale-codec/std",
-	"scale-info/std",
 	"serde",
-	"serde?/std",
-	"sp-runtime/std",
 	"sp-std/std",
-	"xcm-executor/std",
+	"sp-runtime/std",
 	"xcm/std",
 ]
 
-try-runtime = [
-	"astar-primitives/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"sp-runtime/try-runtime",
-]
+try-runtime = ["frame-support/try-runtime"]
 
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"parity-scale-codec",
-	"sp-runtime/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
index 3a3c108063..a7807ed64c 100644
--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -42,34 +42,24 @@ sp-tracing = { workspace = true }
 default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks",
 ]
 std = [
-	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
-	"log/std",
-	"pallet-aura/std",
-	"pallet-authorship/std",
-	"pallet-balances/std",
-	"pallet-session/std",
 	"parity-scale-codec/std",
-	"rand/std",
+	"log/std",
 	"scale-info/std",
-	"serde/std",
+	"rand/std",
 	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-std/std",
+	"frame-support/std",
+	"frame-system/std",
+	"frame-benchmarking/std",
+	"pallet-authorship/std",
+	"pallet-session/std",
+	"pallet-aura/std",
+	"pallet-balances/std",
 ]
 
-try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"pallet-authorship/try-runtime",
-	"pallet-session/try-runtime",
-	"sp-runtime/try-runtime",
-]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/dapp-staking-migration/Cargo.toml b/pallets/dapp-staking-migration/Cargo.toml
index d1f244ddf2..be2a13599a 100644
--- a/pallets/dapp-staking-migration/Cargo.toml
+++ b/pallets/dapp-staking-migration/Cargo.toml
@@ -30,33 +30,25 @@ sp-core = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"frame-benchmarking/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
+	"sp-std/std",
+	"sp-io/std",
+	"log/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
-	"pallet-balances/std",
 	"pallet-dapp-staking-v3/std",
-	"parity-scale-codec/std",
-	"scale-info/std",
+	"frame-benchmarking/std",
+	"astar-primitives/std",
 	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"sp-std/std",
+	"pallet-balances/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"pallet-dapp-staking-v3/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 ]
-try-runtime = [
-	"astar-primitives/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"pallet-dapp-staking-v3/try-runtime",
-	"sp-runtime/try-runtime",
-]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/dapp-staking-v3/Cargo.toml b/pallets/dapp-staking-v3/Cargo.toml
index 09beed8990..bd95087453 100644
--- a/pallets/dapp-staking-v3/Cargo.toml
+++ b/pallets/dapp-staking-v3/Cargo.toml
@@ -33,34 +33,28 @@ pallet-balances = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
+	"serde/std",
 	"log/std",
-	"num-traits/std",
-	"pallet-balances/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
-	"serde/std",
-	"sp-arithmetic/std",
+	"num-traits/std",
 	"sp-core/std",
-	"sp-io/std",
 	"sp-runtime/std",
+	"sp-arithmetic/std",
+	"sp-io/std",
 	"sp-std/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-balances/std",
+	"astar-primitives/std",
+	"frame-benchmarking/std",
 ]
 runtime-benchmarks = [
-	"assert_matches",
-	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
+	"assert_matches",
 ]
-try-runtime = [
-	"astar-primitives/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"sp-runtime/try-runtime",
-]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml b/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml
index 9f19d9c353..37b20002ab 100644
--- a/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml
+++ b/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml
@@ -18,4 +18,8 @@ astar-primitives = { workspace = true }
 
 [features]
 default = ["std"]
-std = ["astar-primitives/std", "sp-api/std", "sp-std/std"]
+std = [
+	"sp-api/std",
+	"sp-std/std",
+	"astar-primitives/std",
+]
diff --git a/pallets/dynamic-evm-base-fee/Cargo.toml b/pallets/dynamic-evm-base-fee/Cargo.toml
index bc68045fb2..c6ecb9208e 100644
--- a/pallets/dynamic-evm-base-fee/Cargo.toml
+++ b/pallets/dynamic-evm-base-fee/Cargo.toml
@@ -33,25 +33,24 @@ sp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	# Frontier
-	"fp-evm/std",
-	"frame-benchmarking/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
+	"num-traits/std",
 	# Substrate
 	"frame-support/std",
 	"frame-system/std",
-	"num-traits/std",
-	"pallet-balances/std",
-	"pallet-timestamp/std",
-	"pallet-transaction-payment/std",
-	"parity-scale-codec/std",
-	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"pallet-transaction-payment/std",
+	"pallet-balances/std",
+	"pallet-timestamp/std",
+	"frame-benchmarking/std",
+	# Frontier
+	"fp-evm/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
@@ -60,5 +59,4 @@ try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"sp-runtime/try-runtime",
 ]
diff --git a/pallets/ethereum-checked/Cargo.toml b/pallets/ethereum-checked/Cargo.toml
index 4788a0ee9f..e2538195fe 100644
--- a/pallets/ethereum-checked/Cargo.toml
+++ b/pallets/ethereum-checked/Cargo.toml
@@ -37,40 +37,32 @@ sp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"ethereum-types/std",
+	"hex/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
 	"ethereum/std",
+	"ethereum-types/std",
 	"fp-ethereum/std",
 	"fp-evm/std",
-	"frame-benchmarking?/std",
+	"pallet-evm/std",
+	"sp-std/std",
+	"sp-runtime/std",
+	"sp-io/std",
 	"frame-support/std",
 	"frame-system/std",
-	"hex/std",
 	"pallet-balances/std",
-	"pallet-ethereum/std",
-	"pallet-evm/std",
 	"pallet-timestamp/std",
-	"parity-scale-codec/std",
-	"scale-info/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"sp-std/std",
+	"pallet-evm/std",
+	"pallet-ethereum/std",
+	"astar-primitives/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
+	"hex",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"hex",
-	"pallet-ethereum/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"pallet-ethereum/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 ]
-try-runtime = [
-	"astar-primitives/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"pallet-evm/try-runtime",
-	"sp-runtime/try-runtime",
-]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/inflation/Cargo.toml b/pallets/inflation/Cargo.toml
index 56314d9cd0..0ba8a6fe92 100644
--- a/pallets/inflation/Cargo.toml
+++ b/pallets/inflation/Cargo.toml
@@ -30,30 +30,22 @@ sp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"frame-benchmarking?/std",
-	"frame-support/std",
-	"frame-system/std",
-	"log/std",
-	"pallet-balances/std",
 	"parity-scale-codec/std",
+	"log/std",
+	"sp-core/std",
 	"scale-info/std",
 	"serde/std",
-	"sp-core/std",
-	"sp-runtime/std",
 	"sp-std/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-balances/std",
+	"astar-primitives/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 ]
-try-runtime = [
-	"astar-primitives/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"sp-runtime/try-runtime",
-]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/oracle-benchmarks/Cargo.toml b/pallets/oracle-benchmarks/Cargo.toml
index 4cd5232fad..534c34a2de 100644
--- a/pallets/oracle-benchmarks/Cargo.toml
+++ b/pallets/oracle-benchmarks/Cargo.toml
@@ -30,32 +30,23 @@ frame-benchmarking = { workspace = true, optional = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"frame-benchmarking?/std",
-	"frame-support/std",
-	"frame-system/std",
-	"log/std",
-	"orml-oracle/std",
-	"orml-traits/std",
 	"parity-scale-codec/std",
+	"log/std",
 	"scale-info/std",
 	"serde/std",
-	"sp-arithmetic/std",
-	"sp-runtime/std",
 	"sp-std/std",
+	"frame-support/std",
+	"frame-system/std",
+	"astar-primitives/std",
+	"sp-arithmetic/std",
+	"orml-traits/std",
+	"orml-oracle/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 ]
-try-runtime = [
-	"astar-primitives/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"orml-oracle/try-runtime",
-	"sp-runtime/try-runtime",
-]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/price-aggregator/Cargo.toml b/pallets/price-aggregator/Cargo.toml
index c3ee40f9ca..c90324eac0 100644
--- a/pallets/price-aggregator/Cargo.toml
+++ b/pallets/price-aggregator/Cargo.toml
@@ -34,32 +34,24 @@ sp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"frame-benchmarking?/std",
-	"frame-support/std",
-	"frame-system/std",
-	"log/std",
-	"orml-traits/std",
-	"pallet-balances/std",
 	"parity-scale-codec/std",
+	"log/std",
+	"sp-core/std",
 	"scale-info/std",
 	"serde/std",
-	"sp-arithmetic/std",
-	"sp-core/std",
-	"sp-runtime/std",
 	"sp-std/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-balances/std",
+	"astar-primitives/std",
+	"sp-arithmetic/std",
+	"orml-traits/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 ]
-try-runtime = [
-	"astar-primitives/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"sp-runtime/try-runtime",
-]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/static-price-provider/Cargo.toml b/pallets/static-price-provider/Cargo.toml
index 225ce4a4bc..061aaa8e38 100644
--- a/pallets/static-price-provider/Cargo.toml
+++ b/pallets/static-price-provider/Cargo.toml
@@ -31,31 +31,23 @@ sp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"frame-benchmarking?/std",
-	"frame-support/std",
-	"frame-system/std",
-	"log/std",
-	"pallet-balances/std",
 	"parity-scale-codec/std",
+	"log/std",
+	"sp-core/std",
 	"scale-info/std",
 	"serde/std",
-	"sp-arithmetic/std",
-	"sp-core/std",
-	"sp-runtime/std",
 	"sp-std/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-balances/std",
+	"astar-primitives/std",
+	"sp-arithmetic/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 ]
-try-runtime = [
-	"astar-primitives/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"sp-runtime/try-runtime",
-]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/unified-accounts/Cargo.toml b/pallets/unified-accounts/Cargo.toml
index 349e4f85c0..c74c5ac954 100644
--- a/pallets/unified-accounts/Cargo.toml
+++ b/pallets/unified-accounts/Cargo.toml
@@ -44,41 +44,33 @@ pallet-timestamp = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"frame-benchmarking?/std",
-	"frame-support/std",
-	"frame-system/std",
 	"hex/std",
+	"log/std",
 	"libsecp256k1",
 	"libsecp256k1/std",
-	"log/std",
-	"pallet-balances/std",
-	"pallet-ethereum/std",
-	"pallet-evm/std",
-	"pallet-timestamp/std",
 	"parity-scale-codec/std",
-	"precompile-utils/std",
 	"scale-info/std",
+	"sp-std/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"sp-std/std",
+	"frame-support/std",
+	"frame-system/std",
+	"astar-primitives/std",
+	"precompile-utils/std",
+	"pallet-evm/std",
+	"pallet-balances/std",
+	"pallet-timestamp/std",
+	"pallet-ethereum/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
+	"libsecp256k1/hmac",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"libsecp256k1/hmac",
+	"sp-runtime/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 	"pallet-ethereum/runtime-benchmarks",
 	"pallet-evm/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-]
-try-runtime = [
-	"astar-primitives/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"pallet-evm/try-runtime",
-	"sp-runtime/try-runtime",
 ]
+try-runtime = ["frame-support/try-runtime", "pallet-evm/try-runtime"]
diff --git a/pallets/xc-asset-config/Cargo.toml b/pallets/xc-asset-config/Cargo.toml
index 3ad245284c..3295f1221d 100644
--- a/pallets/xc-asset-config/Cargo.toml
+++ b/pallets/xc-asset-config/Cargo.toml
@@ -33,30 +33,20 @@ sp-core = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
-	"pallet-balances/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
-	"serde?/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"xcm/std",
+	"pallet-balances/std",
+	"frame-benchmarking?/std",
 ]
 
 runtime-benchmarks = [
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-]
-try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"sp-runtime/try-runtime",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/xvm/Cargo.toml b/pallets/xvm/Cargo.toml
index bc520255db..0160aeb125 100644
--- a/pallets/xvm/Cargo.toml
+++ b/pallets/xvm/Cargo.toml
@@ -44,41 +44,29 @@ sp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
 	"environmental/std",
+	"log/std",
+	"parity-scale-codec/std",
 	"fp-evm/std",
-	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
+	"pallet-contracts-primitives/std",
 	"pallet-evm/std",
 	"pallet-insecure-randomness-collective-flip/std",
-	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
-	"serde?/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"astar-primitives/std",
 ]
 
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"pallet-contracts/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"astar-primitives/try-runtime",
 	"frame-support/try-runtime",
-	"frame-system/try-runtime",
 	"pallet-contracts/try-runtime",
 	"pallet-evm/try-runtime",
-	"sp-runtime/try-runtime",
 ]
diff --git a/precompiles/assets-erc20/Cargo.toml b/precompiles/assets-erc20/Cargo.toml
index 51a584e20a..a9cc8a9d68 100644
--- a/precompiles/assets-erc20/Cargo.toml
+++ b/precompiles/assets-erc20/Cargo.toml
@@ -42,26 +42,17 @@ scale-info = { workspace = true }
 [features]
 default = ["std"]
 std = [
+	"parity-scale-codec/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
-	"num_enum/std",
 	"pallet-assets/std",
-	"pallet-balances/std",
 	"pallet-evm/std",
-	"parity-scale-codec/std",
+	"pallet-balances/std",
 	"precompile-utils/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
-runtime-benchmarks = [
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-]
+runtime-benchmarks = ["pallet-assets/runtime-benchmarks"]
diff --git a/precompiles/dapp-staking-v3/Cargo.toml b/precompiles/dapp-staking-v3/Cargo.toml
index a2ab49adbf..5c40d95a5f 100644
--- a/precompiles/dapp-staking-v3/Cargo.toml
+++ b/precompiles/dapp-staking-v3/Cargo.toml
@@ -44,28 +44,19 @@ sp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
+	"parity-scale-codec/std",
+	"scale-info/std",
 	"astar-primitives/std",
+	"sp-std/std",
+	"sp-core/std",
+	"sp-runtime/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
-	"num_enum/std",
-	"pallet-balances/std",
 	"pallet-dapp-staking-v3/std",
 	"pallet-evm/std",
-	"parity-scale-codec/std",
 	"precompile-utils/std",
-	"scale-info/std",
+	"pallet-balances/std",
 	"sp-arithmetic/std",
-	"sp-core/std",
-	"sp-runtime/std",
-	"sp-std/std",
-]
-runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"pallet-dapp-staking-v3/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 ]
+runtime-benchmarks = ["pallet-dapp-staking-v3/runtime-benchmarks"]
diff --git a/precompiles/dispatch-lockdrop/Cargo.toml b/precompiles/dispatch-lockdrop/Cargo.toml
index 43397de82f..b2ca7f5e20 100644
--- a/precompiles/dispatch-lockdrop/Cargo.toml
+++ b/precompiles/dispatch-lockdrop/Cargo.toml
@@ -40,21 +40,19 @@ sp-std = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"fp-evm/std",
-	"frame-support/std",
-	"frame-system/std",
-	"libsecp256k1/std",
 	"log/std",
-	"pallet-balances/std",
-	"pallet-evm-precompile-dispatch/std",
-	"pallet-evm/std",
-	"pallet-timestamp/std",
+	"libsecp256k1/std",
 	"parity-scale-codec/std",
-	"precompile-utils/std",
 	"scale-info/std",
+	"sp-std/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"sp-std/std",
+	"frame-support/std",
+	"frame-system/std",
+	"astar-primitives/std",
+	"precompile-utils/std",
+	"pallet-evm/std",
+	"pallet-balances/std",
+	"pallet-timestamp/std",
 ]
diff --git a/precompiles/sr25519/Cargo.toml b/precompiles/sr25519/Cargo.toml
index 44054e79bf..a5abe88ec7 100644
--- a/precompiles/sr25519/Cargo.toml
+++ b/precompiles/sr25519/Cargo.toml
@@ -39,13 +39,11 @@ sp-runtime = { workspace = true }
 [features]
 default = ["std"]
 std = [
+	"parity-scale-codec/std",
 	"fp-evm/std",
-	"log/std",
-	"num_enum/std",
 	"pallet-evm/std",
-	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-core/std",
-	"sp-io/std",
 	"sp-std/std",
+	"sp-io/std",
 ]
diff --git a/precompiles/substrate-ecdsa/Cargo.toml b/precompiles/substrate-ecdsa/Cargo.toml
index 6a3b6602a2..388283b9e9 100644
--- a/precompiles/substrate-ecdsa/Cargo.toml
+++ b/precompiles/substrate-ecdsa/Cargo.toml
@@ -40,13 +40,12 @@ sp-runtime = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"fp-evm/std",
-	"log/std",
 	"num_enum/std",
-	"pallet-evm/std",
 	"parity-scale-codec/std",
+	"fp-evm/std",
+	"pallet-evm/std",
 	"precompile-utils/std",
 	"sp-core/std",
-	"sp-io/std",
 	"sp-std/std",
+	"sp-io/std",
 ]
diff --git a/precompiles/unified-accounts/Cargo.toml b/precompiles/unified-accounts/Cargo.toml
index 3cf2050ccd..30842e0651 100644
--- a/precompiles/unified-accounts/Cargo.toml
+++ b/precompiles/unified-accounts/Cargo.toml
@@ -47,19 +47,16 @@ sp-runtime = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
+	"parity-scale-codec/std",
+	"pallet-unified-accounts/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
-	"hex/std",
-	"log/std",
-	"num_enum/std",
 	"pallet-evm/std",
-	"pallet-unified-accounts/std",
-	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-core/std",
+	"sp-std/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"sp-std/std",
+	"astar-primitives/std",
 ]
diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml
index 7f4660e947..9e7b1dc67f 100644
--- a/precompiles/utils/Cargo.toml
+++ b/precompiles/utils/Cargo.toml
@@ -45,29 +45,15 @@ xcm = { workspace = true }
 default = ["std"]
 std = [
 	"environmental/std",
-	"evm/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
-	"hex/std",
-	"log/std",
-	"num_enum/std",
 	"pallet-evm/std",
 	"parity-scale-codec/std",
-	"scale-info?/std",
-	"serde?/std",
 	"sp-core/std",
 	"sp-io/std",
-	"sp-runtime/std",
 	"sp-std/std",
 	"xcm?/std",
 ]
 codec-xcm = ["xcm"]
-testing = [
-	"derive_more",
-	"hex-literal",
-	"scale-info",
-	"serde",
-	"similar-asserts",
-	"std",
-]
+testing = ["derive_more", "hex-literal", "scale-info", "serde", "similar-asserts", "std"]
diff --git a/precompiles/utils/macro/Cargo.toml b/precompiles/utils/macro/Cargo.toml
index 91cc2e16de..c13219412a 100644
--- a/precompiles/utils/macro/Cargo.toml
+++ b/precompiles/utils/macro/Cargo.toml
@@ -37,7 +37,6 @@ default = ["std"]
 std = [
 	"fp-evm/std",
 	"frame-support/std",
-	"num_enum/std",
 	"sp-core-hashing/std",
 	"sp-std/std",
 ]
diff --git a/precompiles/xcm/Cargo.toml b/precompiles/xcm/Cargo.toml
index 54ef4807d4..a131fe9c52 100644
--- a/precompiles/xcm/Cargo.toml
+++ b/precompiles/xcm/Cargo.toml
@@ -52,38 +52,24 @@ xcm-builder = { workspace = true, features = ["std"] }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
+	"parity-scale-codec/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
-	"num_enum/std",
-	"orml-traits/std",
-	"orml-xcm-support/std",
-	"orml-xtokens/std",
 	"pallet-assets/std",
-	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm/std",
 	"pallet-xcm/std",
-	"parity-scale-codec/std",
+	"pallet-evm-precompile-assets-erc20/std",
 	"precompile-utils/std",
 	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
 	"sp-std/std",
-	"xcm-executor/std",
+	"sp-runtime/std",
+	"sp-io/std",
 	"xcm/std",
+	"xcm-executor/std",
+	"orml-xtokens/std",
+	"orml-xcm-support/std",
+	"orml-traits/std",
+	"astar-primitives/std",
 ]
-runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"orml-xtokens/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
-]
+runtime-benchmarks = ["pallet-xcm/runtime-benchmarks", "pallet-assets/runtime-benchmarks", "xcm-builder/runtime-benchmarks"]
diff --git a/precompiles/xvm/Cargo.toml b/precompiles/xvm/Cargo.toml
index b1e58519ae..c64e26b3b2 100644
--- a/precompiles/xvm/Cargo.toml
+++ b/precompiles/xvm/Cargo.toml
@@ -44,18 +44,15 @@ sp-runtime = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
+	"parity-scale-codec/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
-	"hex/std",
-	"log/std",
-	"num_enum/std",
 	"pallet-evm/std",
-	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-core/std",
+	"sp-std/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"sp-std/std",
+	"astar-primitives/std",
 ]
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 1b9a88a787..c3379c04ca 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -50,50 +50,31 @@ pallet-xc-asset-config = { workspace = true }
 [features]
 default = ["std"]
 std = [
+	"log/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
 	"ethereum-types/std",
 	"ethereum/std",
 	"fp-evm/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
+	"sp-std/std",
+	"sp-runtime/std",
+	"sp-core/std",
+	"sp-io/std",
+	"xcm/std",
+	"xcm-builder/std",
+	"xcm-executor/std",
 	"orml-oracle/std",
 	"orml-traits/std",
+	"pallet-xc-asset-config/std",
+	"fp-evm/std",
 	"pallet-assets/std",
+	"pallet-evm/std",
 	"pallet-contracts/std",
 	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm-precompile-dispatch/std",
-	"pallet-evm/std",
-	"pallet-xc-asset-config/std",
-	"parity-scale-codec/std",
-	"scale-info/std",
 	"sp-arithmetic/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"sp-std/std",
-	"xcm-builder/std",
-	"xcm-executor/std",
-	"xcm/std",
-]
-runtime-benchmarks = [
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-contracts/runtime-benchmarks",
-	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
-	"pallet-xc-asset-config/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
-]
-try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"orml-oracle/try-runtime",
-	"pallet-assets/try-runtime",
-	"pallet-contracts/try-runtime",
-	"pallet-evm/try-runtime",
-	"pallet-xc-asset-config/try-runtime",
-	"sp-runtime/try-runtime",
 ]
+runtime-benchmarks = ["xcm-builder/runtime-benchmarks", "pallet-assets/runtime-benchmarks"]
+try-runtime = ["pallet-contracts/try-runtime"]
diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml
index 9bb4dbfdf7..16ba21ef2e 100644
--- a/runtime/astar/Cargo.toml
+++ b/runtime/astar/Cargo.toml
@@ -138,196 +138,165 @@ substrate-wasm-builder = { workspace = true, optional = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"astar-xcm-benchmarks?/std",
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
-	"cumulus-primitives-utility/std",
-	"dapp-staking-v3-runtime-api/std",
+	"parity-scale-codec/std",
+	"sp-genesis-builder/std",
 	"fp-rpc/std",
 	"fp-self-contained/std",
-	"frame-benchmarking/std",
-	"frame-executive/std",
+	"sp-std/std",
+	"sp-api/std",
+	"sp-core/std",
+	"oracle-benchmarks/std",
+	"pallet-membership/std",
+	"pallet-price-aggregator/std",
+	"orml-oracle/std",
+	"sp-consensus-aura/std",
+	"sp-arithmetic/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-runtime-interface/std",
+	"sp-version/std",
+	"sp-block-builder/std",
+	"sp-transaction-pool/std",
+	"sp-inherents/std",
 	"frame-support/std",
-	"frame-system-benchmarking?/std",
-	"frame-system-rpc-runtime-api/std",
+	"frame-executive/std",
 	"frame-system/std",
+	"frame-system-rpc-runtime-api/std",
 	"frame-try-runtime/std",
-	"log?/std",
-	"moonbeam-evm-tracer/std",
-	"moonbeam-rpc-primitives-debug/std",
-	"moonbeam-rpc-primitives-txpool/std",
-	"num_enum/std",
-	"oracle-benchmarks/std",
-	"orml-oracle/std",
-	"orml-xcm-support/std",
-	"orml-xtokens/std",
 	"pallet-assets/std",
-	"pallet-aura/std",
 	"pallet-authorship/std",
+	"pallet-aura/std",
 	"pallet-balances/std",
-	"pallet-chain-extension-assets/std",
-	"pallet-collator-selection/std",
-	"pallet-contracts-primitives/std",
-	"pallet-contracts/std",
-	"pallet-dapp-staking-migration/std",
+	"pallet-proxy/std",
 	"pallet-dapp-staking-v3/std",
+	"pallet-dapp-staking-migration/std",
+	"dapp-staking-v3-runtime-api/std",
+	"pallet-inflation/std",
+	"pallet-evm-precompile-dapp-staking-v3/std",
+	"pallet-evm-precompile-sr25519/std",
+	"pallet-evm-precompile-assets-erc20/std",
+	"pallet-evm-precompile-substrate-ecdsa/std",
+	"pallet-evm-precompile-xcm/std",
 	"pallet-dynamic-evm-base-fee/std",
 	"pallet-ethereum/std",
-	"pallet-evm-precompile-assets-erc20/std",
+	"pallet-evm/std",
 	"pallet-evm-precompile-blake2/std",
+	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-bn128/std",
-	"pallet-evm-precompile-dapp-staking-v3/std",
-	"pallet-evm-precompile-dispatch-lockdrop/std",
 	"pallet-evm-precompile-dispatch/std",
+	"pallet-evm-precompile-dispatch-lockdrop/std",
 	"pallet-evm-precompile-ed25519/std",
 	"pallet-evm-precompile-modexp/std",
 	"pallet-evm-precompile-sha3fips/std",
-	"pallet-evm-precompile-simple/std",
-	"pallet-evm-precompile-sr25519/std",
-	"pallet-evm-precompile-substrate-ecdsa/std",
-	"pallet-evm-precompile-xcm/std",
-	"pallet-evm/std",
 	"pallet-identity/std",
-	"pallet-inflation/std",
-	"pallet-membership/std",
 	"pallet-multisig/std",
-	"pallet-price-aggregator/std",
-	"pallet-proxy/std",
 	"pallet-session/std",
-	"pallet-sudo/std",
-	"pallet-timestamp/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
-	"pallet-transaction-payment/std",
 	"pallet-utility/std",
+	"pallet-timestamp/std",
 	"pallet-vesting/std",
-	"pallet-xc-asset-config/std",
-	"pallet-xcm-benchmarks?/std",
+	"sp-offchain/std",
+	"sp-session/std",
+	"pallet-sudo/std",
+	"pallet-transaction-payment/std",
+	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
-	"parity-scale-codec/std",
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
 	"polkadot-runtime-common/std",
-	"precompile-utils/std",
-	"scale-info/std",
-	"sp-api/std",
-	"sp-arithmetic/std",
-	"sp-block-builder/std",
-	"sp-consensus-aura/std",
-	"sp-core/std",
-	"sp-genesis-builder/std",
-	"sp-inherents/std",
-	"sp-io/std",
-	"sp-offchain/std",
-	"sp-runtime-interface/std",
-	"sp-runtime/std",
-	"sp-session/std",
-	"sp-std/std",
-	"sp-transaction-pool/std",
-	"sp-version/std",
-	"substrate-wasm-builder",
+	"cumulus-primitives-core/std",
+	"cumulus-primitives-utility/std",
+	"cumulus-primitives-timestamp/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-aura-ext/std",
+	"cumulus-pallet-dmp-queue/std",
+	"cumulus-pallet-xcmp-queue/std",
+	"pallet-contracts/std",
+	"pallet-contracts-primitives/std",
+	"cumulus-pallet-xcm/std",
+	"pallet-collator-selection/std",
+	"frame-benchmarking/std",
+	"moonbeam-evm-tracer/std",
+	"moonbeam-rpc-primitives-debug/std",
+	"moonbeam-rpc-primitives-txpool/std",
+	"xcm/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
-	"xcm/std",
+	"pallet-xc-asset-config/std",
+	"substrate-wasm-builder",
+	"pallet-chain-extension-assets/std",
+	"orml-xtokens/std",
+	"orml-xcm-support/std",
+	"astar-primitives/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
-	"astar-xcm-benchmarks/runtime-benchmarks",
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	"cumulus-primitives-utility/runtime-benchmarks",
 	'frame-benchmarking',
-	"frame-benchmarking/runtime-benchmarks",
 	'frame-support/runtime-benchmarks',
 	'frame-system-benchmarking/runtime-benchmarks',
 	'frame-system/runtime-benchmarks',
-	"oracle-benchmarks/runtime-benchmarks",
-	"orml-xtokens/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
+	'sp-runtime/runtime-benchmarks',
 	'pallet-balances/runtime-benchmarks',
-	"pallet-chain-extension-assets/runtime-benchmarks",
-	"pallet-collator-selection/runtime-benchmarks",
-	"pallet-contracts/runtime-benchmarks",
-	"pallet-dapp-staking-migration/runtime-benchmarks",
-	"pallet-dapp-staking-v3/runtime-benchmarks",
-	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
+	"pallet-proxy/runtime-benchmarks",
+	'pallet-timestamp/runtime-benchmarks',
 	"pallet-ethereum/runtime-benchmarks",
-	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
-	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
-	"pallet-evm-precompile-xcm/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
-	"pallet-identity/runtime-benchmarks",
+	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"pallet-dapp-staking-migration/runtime-benchmarks",
+	"pallet-price-aggregator/runtime-benchmarks",
 	"pallet-inflation/runtime-benchmarks",
 	"pallet-membership/runtime-benchmarks",
-	"pallet-multisig/runtime-benchmarks",
-	"pallet-price-aggregator/runtime-benchmarks",
-	"pallet-proxy/runtime-benchmarks",
-	"pallet-sudo/runtime-benchmarks",
-	'pallet-timestamp/runtime-benchmarks',
-	"pallet-utility/runtime-benchmarks",
-	"pallet-vesting/runtime-benchmarks",
-	"pallet-xc-asset-config/runtime-benchmarks",
-	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-parachain/runtime-benchmarks",
-	"polkadot-primitives/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	'sp-runtime/runtime-benchmarks',
 	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
+	"pallet-xc-asset-config/runtime-benchmarks",
+	"pallet-collator-selection/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
+	"astar-xcm-benchmarks/runtime-benchmarks",
+	"pallet-xcm-benchmarks/runtime-benchmarks",
 ]
 try-runtime = [
-	"astar-primitives/try-runtime",
-	"astar-xcm-benchmarks?/try-runtime",
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
 	"fp-self-contained/try-runtime",
+	"log",
+	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"frame-try-runtime/try-runtime",
-	"log",
-	"oracle-benchmarks/try-runtime",
-	"orml-oracle/try-runtime",
-	"orml-xtokens/try-runtime",
-	"pallet-assets/try-runtime",
 	"pallet-aura/try-runtime",
-	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
-	"pallet-chain-extension-assets/try-runtime",
-	"pallet-collator-selection/try-runtime",
-	"pallet-contracts/try-runtime",
-	"pallet-dapp-staking-migration/try-runtime",
+	"pallet-proxy/try-runtime",
 	"pallet-dapp-staking-v3/try-runtime",
-	"pallet-dynamic-evm-base-fee/try-runtime",
-	"pallet-ethereum/try-runtime",
-	"pallet-evm/try-runtime",
-	"pallet-identity/try-runtime",
+	"pallet-dapp-staking-migration/try-runtime",
 	"pallet-inflation/try-runtime",
-	"pallet-membership/try-runtime",
-	"pallet-multisig/try-runtime",
-	"pallet-price-aggregator/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
 	"pallet-xc-asset-config/try-runtime",
+	"pallet-ethereum/try-runtime",
+	"orml-oracle/try-runtime",
+	"pallet-price-aggregator/try-runtime",
+	"pallet-membership/try-runtime",
+	"oracle-benchmarks/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-authorship/try-runtime",
+	"pallet-collator-selection/try-runtime",
+	"pallet-session/try-runtime",
 	"pallet-xcm/try-runtime",
+	"pallet-identity/try-runtime",
+	"pallet-multisig/try-runtime",
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-dmp-queue/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
+	"cumulus-pallet-xcmp-queue/try-runtime",
 	"parachain-info/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-	"sp-runtime/try-runtime",
+	"pallet-dynamic-evm-base-fee/try-runtime",
+	"pallet-contracts/try-runtime",
+	"pallet-evm/try-runtime",
+	"orml-xtokens/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml
index be5234b8b8..da7d526e38 100644
--- a/runtime/local/Cargo.toml
+++ b/runtime/local/Cargo.toml
@@ -107,148 +107,125 @@ substrate-wasm-builder = { workspace = true, optional = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"dapp-staking-v3-runtime-api/std",
+	"parity-scale-codec/std",
 	"fp-rpc/std",
 	"fp-self-contained/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",
-	"log?/std",
-	"moonbeam-evm-tracer/std",
-	"moonbeam-rpc-primitives-debug/std",
-	"moonbeam-rpc-primitives-txpool/std",
-	"num_enum/std",
 	"pallet-assets/std",
 	"pallet-aura/std",
 	"pallet-balances/std",
-	"pallet-chain-extension-assets/std",
-	"pallet-chain-extension-unified-accounts/std",
-	"pallet-chain-extension-xvm/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
+	"pallet-contracts-primitives/std",
+	"pallet-chain-extension-xvm/std",
+	"pallet-chain-extension-unified-accounts/std",
 	"pallet-dapp-staking-v3/std",
+	"dapp-staking-v3-runtime-api/std",
+	"pallet-inflation/std",
+	"pallet-static-price-provider/std",
 	"pallet-dynamic-evm-base-fee/std",
-	"pallet-ethereum-checked/std",
 	"pallet-ethereum/std",
-	"pallet-evm-precompile-assets-erc20/std",
+	"pallet-evm/std",
+	"sp-genesis-builder/std",
 	"pallet-evm-precompile-blake2/std",
+	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-bn128/std",
-	"pallet-evm-precompile-dapp-staking-v3/std",
-	"pallet-evm-precompile-dispatch-lockdrop/std",
 	"pallet-evm-precompile-dispatch/std",
 	"pallet-evm-precompile-ed25519/std",
 	"pallet-evm-precompile-modexp/std",
 	"pallet-evm-precompile-sha3fips/std",
-	"pallet-evm-precompile-simple/std",
+	"pallet-evm-precompile-dapp-staking-v3/std",
 	"pallet-evm-precompile-sr25519/std",
 	"pallet-evm-precompile-substrate-ecdsa/std",
 	"pallet-evm-precompile-unified-accounts/std",
 	"pallet-evm-precompile-xvm/std",
-	"pallet-evm/std",
+	"pallet-evm-precompile-dispatch-lockdrop/std",
 	"pallet-grandpa/std",
-	"pallet-inflation/std",
 	"pallet-insecure-randomness-collective-flip/std",
 	"pallet-preimage/std",
-	"pallet-proxy/std",
-	"pallet-scheduler/std",
-	"pallet-static-price-provider/std",
 	"pallet-sudo/std",
 	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
-	"pallet-unified-accounts/std",
 	"pallet-utility/std",
 	"pallet-vesting/std",
-	"pallet-xvm/std",
-	"parity-scale-codec/std",
-	"precompile-utils/std",
-	"scale-info/std",
+	"pallet-proxy/std",
 	"sp-api/std",
-	"sp-arithmetic/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
-	"sp-genesis-builder/std",
 	"sp-inherents/std",
-	"sp-io/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
+	"sp-arithmetic/std",
 	"sp-std/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
+	"sp-io/std",
+	"frame-benchmarking/std",
+	"frame-try-runtime/std",
+	"pallet-scheduler/std",
+	"pallet-xvm/std",
+	"pallet-unified-accounts/std",
+	"pallet-ethereum-checked/std",
+	"moonbeam-evm-tracer/std",
+	"moonbeam-rpc-primitives-debug/std",
+	"moonbeam-rpc-primitives-txpool/std",
 	"substrate-wasm-builder",
+	"pallet-chain-extension-assets/std",
+	"astar-primitives/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-chain-extension-assets/runtime-benchmarks",
-	"pallet-contracts/runtime-benchmarks",
-	"pallet-dapp-staking-v3/runtime-benchmarks",
-	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
-	"pallet-ethereum-checked/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
 	"pallet-ethereum/runtime-benchmarks",
-	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
-	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
-	"pallet-grandpa/runtime-benchmarks",
-	"pallet-inflation/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
-	"pallet-proxy/runtime-benchmarks",
-	"pallet-scheduler/runtime-benchmarks",
-	"pallet-static-price-provider/runtime-benchmarks",
-	"pallet-sudo/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
+	"pallet-ethereum-checked/runtime-benchmarks",
 	"pallet-unified-accounts/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
-	"pallet-vesting/runtime-benchmarks",
-	"pallet-xvm/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"pallet-inflation/runtime-benchmarks",
+	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
 ]
 try-runtime = [
-	"astar-primitives/try-runtime",
 	"fp-self-contained/try-runtime",
+	"log",
+	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"frame-try-runtime/try-runtime",
-	"log",
-	"pallet-assets/try-runtime",
 	"pallet-aura/try-runtime",
 	"pallet-balances/try-runtime",
-	"pallet-chain-extension-assets/try-runtime",
 	"pallet-contracts/try-runtime",
 	"pallet-dapp-staking-v3/try-runtime",
-	"pallet-dynamic-evm-base-fee/try-runtime",
-	"pallet-ethereum-checked/try-runtime",
-	"pallet-ethereum/try-runtime",
-	"pallet-evm/try-runtime",
-	"pallet-grandpa/try-runtime",
 	"pallet-inflation/try-runtime",
+	"pallet-grandpa/try-runtime",
 	"pallet-insecure-randomness-collective-flip/try-runtime",
-	"pallet-preimage/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-scheduler/try-runtime",
-	"pallet-static-price-provider/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"pallet-unified-accounts/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
 	"pallet-xvm/try-runtime",
-	"sp-runtime/try-runtime",
+	"pallet-unified-accounts/try-runtime",
+	"pallet-ethereum/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-scheduler/try-runtime",
+	"pallet-proxy/try-runtime",
+	"pallet-preimage/try-runtime",
+	"pallet-dynamic-evm-base-fee/try-runtime",
+	"pallet-evm/try-runtime",
+	"pallet-ethereum-checked/try-runtime",
+	"pallet-static-price-provider/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml
index db2cd223d7..7a90e95671 100644
--- a/runtime/shibuya/Cargo.toml
+++ b/runtime/shibuya/Cargo.toml
@@ -149,216 +149,184 @@ substrate-wasm-builder = { workspace = true, optional = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"astar-xcm-benchmarks?/std",
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
-	"cumulus-primitives-utility/std",
-	"dapp-staking-v3-runtime-api/std",
+	"parity-scale-codec/std",
 	"fp-rpc/std",
 	"fp-self-contained/std",
-	"frame-benchmarking/std",
-	"frame-executive/std",
+	"sp-std/std",
+	"sp-api/std",
+	"sp-core/std",
+	"sp-genesis-builder/std",
+	"sp-consensus-aura/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-runtime-interface/std",
+	"oracle-benchmarks/std",
+	"pallet-membership/std",
+	"sp-version/std",
+	"sp-block-builder/std",
+	"sp-transaction-pool/std",
+	"sp-inherents/std",
+	"sp-arithmetic/std",
 	"frame-support/std",
-	"frame-system-benchmarking?/std",
-	"frame-system-rpc-runtime-api/std",
+	"frame-executive/std",
 	"frame-system/std",
-	"frame-try-runtime/std",
-	"log?/std",
-	"moonbeam-evm-tracer/std",
-	"moonbeam-rpc-primitives-debug/std",
-	"moonbeam-rpc-primitives-txpool/std",
-	"num_enum/std",
-	"oracle-benchmarks/std",
-	"orml-oracle/std",
-	"orml-xcm-support/std",
-	"orml-xtokens/std",
-	"pallet-assets/std",
-	"pallet-aura/std",
+	"frame-system-rpc-runtime-api/std",
 	"pallet-authorship/std",
+	"pallet-aura/std",
+	"pallet-assets/std",
 	"pallet-balances/std",
-	"pallet-chain-extension-assets/std",
-	"pallet-chain-extension-unified-accounts/std",
-	"pallet-chain-extension-xvm/std",
-	"pallet-collator-selection/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
-	"pallet-dapp-staking-v3/std",
+	"pallet-contracts-primitives/std",
+	"pallet-chain-extension-xvm/std",
+	"pallet-chain-extension-unified-accounts/std",
 	"pallet-dynamic-evm-base-fee/std",
-	"pallet-ethereum-checked/std",
 	"pallet-ethereum/std",
+	"pallet-preimage/std",
+	"pallet-evm/std",
 	"pallet-evm-chain-id/std",
-	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm-precompile-blake2/std",
+	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-bn128/std",
-	"pallet-evm-precompile-dapp-staking-v3/std",
-	"pallet-evm-precompile-dispatch-lockdrop/std",
 	"pallet-evm-precompile-dispatch/std",
 	"pallet-evm-precompile-ed25519/std",
 	"pallet-evm-precompile-modexp/std",
 	"pallet-evm-precompile-sha3fips/std",
-	"pallet-evm-precompile-simple/std",
+	"pallet-evm-precompile-dapp-staking-v3/std",
 	"pallet-evm-precompile-sr25519/std",
 	"pallet-evm-precompile-substrate-ecdsa/std",
-	"pallet-evm-precompile-unified-accounts/std",
+	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm-precompile-xcm/std",
 	"pallet-evm-precompile-xvm/std",
-	"pallet-evm/std",
-	"pallet-identity/std",
+	"pallet-evm-precompile-unified-accounts/std",
+	"pallet-evm-precompile-dispatch-lockdrop/std",
+	"pallet-dapp-staking-v3/std",
+	"orml-oracle/std",
+	"dapp-staking-v3-runtime-api/std",
 	"pallet-inflation/std",
-	"pallet-insecure-randomness-collective-flip/std",
-	"pallet-membership/std",
-	"pallet-multisig/std",
-	"pallet-preimage/std",
 	"pallet-price-aggregator/std",
-	"pallet-proxy/std",
-	"pallet-scheduler/std",
+	"pallet-identity/std",
+	"pallet-multisig/std",
+	"pallet-insecure-randomness-collective-flip/std",
 	"pallet-session/std",
-	"pallet-sudo/std",
-	"pallet-timestamp/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
-	"pallet-transaction-payment/std",
-	"pallet-unified-accounts/std",
 	"pallet-utility/std",
+	"pallet-timestamp/std",
 	"pallet-vesting/std",
-	"pallet-xc-asset-config/std",
-	"pallet-xcm-benchmarks?/std",
+	"pallet-proxy/std",
+	"sp-offchain/std",
+	"sp-session/std",
+	"pallet-sudo/std",
+	"pallet-transaction-payment/std",
+	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-xcm/std",
+	"pallet-xc-asset-config/std",
 	"pallet-xvm/std",
+	"pallet-unified-accounts/std",
+	"pallet-ethereum-checked/std",
+	"pallet-scheduler/std",
 	"parachain-info/std",
-	"parity-scale-codec/std",
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
 	"polkadot-runtime-common/std",
-	"precompile-utils/std",
-	"scale-info/std",
-	"sp-api/std",
-	"sp-arithmetic/std",
-	"sp-block-builder/std",
-	"sp-consensus-aura/std",
-	"sp-core/std",
-	"sp-genesis-builder/std",
-	"sp-inherents/std",
-	"sp-io/std",
-	"sp-offchain/std",
-	"sp-runtime-interface/std",
-	"sp-runtime/std",
-	"sp-session/std",
-	"sp-std/std",
-	"sp-transaction-pool/std",
-	"sp-version/std",
-	"substrate-wasm-builder",
+	"cumulus-primitives-core/std",
+	"cumulus-primitives-utility/std",
+	"cumulus-primitives-timestamp/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-aura-ext/std",
+	"cumulus-pallet-dmp-queue/std",
+	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-pallet-xcm/std",
+	"pallet-collator-selection/std",
+	"frame-benchmarking/std",
+	"frame-try-runtime/std",
+	"moonbeam-evm-tracer/std",
+	"moonbeam-rpc-primitives-debug/std",
+	"moonbeam-rpc-primitives-txpool/std",
+	"xcm/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
-	"xcm/std",
+	"substrate-wasm-builder",
+	"pallet-chain-extension-assets/std",
+	"orml-xtokens/std",
+	"orml-xcm-support/std",
+	"astar-primitives/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
 	"astar-xcm-benchmarks/runtime-benchmarks",
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	"cumulus-primitives-utility/runtime-benchmarks",
+	"oracle-benchmarks/runtime-benchmarks",
+	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"oracle-benchmarks/runtime-benchmarks",
-	"orml-xtokens/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-chain-extension-assets/runtime-benchmarks",
-	"pallet-collator-selection/runtime-benchmarks",
-	"pallet-contracts/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"pallet-dapp-staking-v3/runtime-benchmarks",
-	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
-	"pallet-ethereum-checked/runtime-benchmarks",
-	"pallet-ethereum/runtime-benchmarks",
-	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
-	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
-	"pallet-evm-precompile-xcm/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
-	"pallet-identity/runtime-benchmarks",
 	"pallet-inflation/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
 	"pallet-membership/runtime-benchmarks",
-	"pallet-multisig/runtime-benchmarks",
-	"pallet-preimage/runtime-benchmarks",
-	"pallet-price-aggregator/runtime-benchmarks",
-	"pallet-proxy/runtime-benchmarks",
-	"pallet-scheduler/runtime-benchmarks",
-	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"pallet-unified-accounts/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
-	"pallet-vesting/runtime-benchmarks",
-	"pallet-xc-asset-config/runtime-benchmarks",
-	"pallet-xcm-benchmarks/runtime-benchmarks",
+	"pallet-ethereum/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"pallet-xvm/runtime-benchmarks",
-	"polkadot-parachain/runtime-benchmarks",
-	"polkadot-primitives/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
+	"pallet-xc-asset-config/runtime-benchmarks",
+	"pallet-price-aggregator/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
+	"pallet-preimage/runtime-benchmarks",
+	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-ethereum-checked/runtime-benchmarks",
+	"pallet-unified-accounts/runtime-benchmarks",
+	"pallet-xvm/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 ]
 try-runtime = [
-	"astar-primitives/try-runtime",
-	"astar-xcm-benchmarks?/try-runtime",
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
 	"fp-self-contained/try-runtime",
+	"log",
+	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"frame-try-runtime/try-runtime",
-	"log",
-	"oracle-benchmarks/try-runtime",
-	"orml-oracle/try-runtime",
-	"orml-xtokens/try-runtime",
-	"pallet-assets/try-runtime",
 	"pallet-aura/try-runtime",
-	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
-	"pallet-chain-extension-assets/try-runtime",
-	"pallet-collator-selection/try-runtime",
-	"pallet-contracts/try-runtime",
 	"pallet-dapp-staking-v3/try-runtime",
-	"pallet-dynamic-evm-base-fee/try-runtime",
-	"pallet-ethereum-checked/try-runtime",
-	"pallet-ethereum/try-runtime",
-	"pallet-evm-chain-id/try-runtime",
-	"pallet-evm/try-runtime",
-	"pallet-identity/try-runtime",
 	"pallet-inflation/try-runtime",
-	"pallet-insecure-randomness-collective-flip/try-runtime",
-	"pallet-membership/try-runtime",
-	"pallet-multisig/try-runtime",
-	"pallet-preimage/try-runtime",
-	"pallet-price-aggregator/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-scheduler/try-runtime",
-	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"pallet-unified-accounts/try-runtime",
+	"orml-oracle/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
+	"pallet-price-aggregator/try-runtime",
+	"pallet-ethereum/try-runtime",
+	"pallet-membership/try-runtime",
 	"pallet-xc-asset-config/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-authorship/try-runtime",
+	"pallet-collator-selection/try-runtime",
+	"pallet-session/try-runtime",
 	"pallet-xcm/try-runtime",
-	"pallet-xvm/try-runtime",
+	"pallet-identity/try-runtime",
+	"pallet-multisig/try-runtime",
+	"pallet-insecure-randomness-collective-flip/try-runtime",
+	"pallet-scheduler/try-runtime",
+	"pallet-proxy/try-runtime",
+	"pallet-contracts/try-runtime",
+	"oracle-benchmarks/try-runtime",
+	"pallet-evm-chain-id/try-runtime",
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-dmp-queue/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
+	"cumulus-pallet-xcmp-queue/try-runtime",
 	"parachain-info/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-	"sp-runtime/try-runtime",
+	"pallet-xvm/try-runtime",
+	"pallet-preimage/try-runtime",
+	"pallet-dynamic-evm-base-fee/try-runtime",
+	"pallet-evm/try-runtime",
+	"pallet-unified-accounts/try-runtime",
+	"pallet-ethereum-checked/try-runtime",
+	"orml-xtokens/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml
index bcbf56d935..486d8b00c8 100644
--- a/runtime/shiden/Cargo.toml
+++ b/runtime/shiden/Cargo.toml
@@ -141,198 +141,166 @@ substrate-wasm-builder = { workspace = true, optional = true }
 [features]
 default = ["std"]
 std = [
-	"astar-primitives/std",
-	"astar-xcm-benchmarks?/std",
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
-	"cumulus-primitives-utility/std",
-	"dapp-staking-v3-runtime-api/std",
+	"parity-scale-codec/std",
 	"fp-rpc/std",
 	"fp-self-contained/std",
-	"frame-benchmarking/std",
-	"frame-executive/std",
+	"sp-std/std",
+	"sp-api/std",
+	"sp-core/std",
+	"sp-consensus-aura/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-arithmetic/std",
+	"sp-runtime-interface/std",
+	"sp-version/std",
+	"sp-block-builder/std",
+	"sp-transaction-pool/std",
+	"sp-inherents/std",
 	"frame-support/std",
-	"frame-system-benchmarking?/std",
-	"frame-system-rpc-runtime-api/std",
+	"frame-executive/std",
 	"frame-system/std",
-	"frame-try-runtime/std",
-	"log?/std",
-	"moonbeam-evm-tracer/std",
-	"moonbeam-rpc-primitives-debug/std",
-	"moonbeam-rpc-primitives-txpool/std",
-	"num_enum/std",
-	"oracle-benchmarks/std",
-	"orml-oracle/std",
-	"orml-xcm-support/std",
-	"orml-xtokens/std",
-	"pallet-assets/std",
-	"pallet-aura/std",
+	"frame-system-rpc-runtime-api/std",
 	"pallet-authorship/std",
+	"pallet-aura/std",
+	"pallet-assets/std",
 	"pallet-balances/std",
-	"pallet-chain-extension-assets/std",
-	"pallet-collator-selection/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
-	"pallet-dapp-staking-migration/std",
-	"pallet-dapp-staking-v3/std",
+	"oracle-benchmarks/std",
+	"pallet-contracts-primitives/std",
 	"pallet-dynamic-evm-base-fee/std",
 	"pallet-ethereum/std",
-	"pallet-evm-precompile-assets-erc20/std",
+	"pallet-evm/std",
 	"pallet-evm-precompile-blake2/std",
+	"pallet-evm-precompile-simple/std",
 	"pallet-evm-precompile-bn128/std",
-	"pallet-evm-precompile-dapp-staking-v3/std",
-	"pallet-evm-precompile-dispatch-lockdrop/std",
+	"sp-genesis-builder/std",
 	"pallet-evm-precompile-dispatch/std",
+	"pallet-evm-precompile-dispatch-lockdrop/std",
 	"pallet-evm-precompile-ed25519/std",
 	"pallet-evm-precompile-modexp/std",
 	"pallet-evm-precompile-sha3fips/std",
-	"pallet-evm-precompile-simple/std",
+	"pallet-dapp-staking-v3/std",
+	"pallet-dapp-staking-migration/std",
+	"dapp-staking-v3-runtime-api/std",
+	"pallet-inflation/std",
+	"pallet-evm-precompile-dapp-staking-v3/std",
 	"pallet-evm-precompile-sr25519/std",
+	"pallet-evm-precompile-assets-erc20/std",
 	"pallet-evm-precompile-substrate-ecdsa/std",
 	"pallet-evm-precompile-xcm/std",
-	"pallet-evm/std",
 	"pallet-identity/std",
-	"pallet-inflation/std",
-	"pallet-insecure-randomness-collective-flip/std",
-	"pallet-membership/std",
 	"pallet-multisig/std",
-	"pallet-price-aggregator/std",
-	"pallet-proxy/std",
+	"pallet-membership/std",
+	"pallet-insecure-randomness-collective-flip/std",
 	"pallet-session/std",
-	"pallet-sudo/std",
-	"pallet-timestamp/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
-	"pallet-transaction-payment/std",
 	"pallet-utility/std",
+	"pallet-proxy/std",
+	"pallet-timestamp/std",
 	"pallet-vesting/std",
-	"pallet-xc-asset-config/std",
-	"pallet-xcm-benchmarks?/std",
+	"orml-oracle/std",
+	"sp-offchain/std",
+	"sp-session/std",
+	"pallet-sudo/std",
+	"pallet-transaction-payment/std",
+	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-xcm/std",
+	"pallet-price-aggregator/std",
 	"parachain-info/std",
-	"parity-scale-codec/std",
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
 	"polkadot-runtime-common/std",
-	"precompile-utils/std",
-	"scale-info/std",
-	"sp-api/std",
-	"sp-arithmetic/std",
-	"sp-block-builder/std",
-	"sp-consensus-aura/std",
-	"sp-core/std",
-	"sp-genesis-builder/std",
-	"sp-inherents/std",
-	"sp-io/std",
-	"sp-offchain/std",
-	"sp-runtime-interface/std",
-	"sp-runtime/std",
-	"sp-session/std",
-	"sp-std/std",
-	"sp-transaction-pool/std",
-	"sp-version/std",
-	"substrate-wasm-builder",
+	"cumulus-primitives-core/std",
+	"cumulus-primitives-utility/std",
+	"cumulus-primitives-timestamp/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-aura-ext/std",
+	"cumulus-pallet-dmp-queue/std",
+	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-pallet-xcm/std",
+	"pallet-collator-selection/std",
+	"moonbeam-evm-tracer/std",
+	"moonbeam-rpc-primitives-debug/std",
+	"moonbeam-rpc-primitives-txpool/std",
+	"frame-benchmarking/std",
+	"frame-try-runtime/std",
+	"xcm/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
-	"xcm/std",
+	"pallet-xc-asset-config/std",
+	"substrate-wasm-builder",
+	"pallet-chain-extension-assets/std",
+	"orml-xtokens/std",
+	"orml-xcm-support/std",
+	"astar-primitives/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
-	"astar-xcm-benchmarks/runtime-benchmarks",
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"oracle-benchmarks/runtime-benchmarks",
-	"orml-xtokens/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-chain-extension-assets/runtime-benchmarks",
-	"pallet-collator-selection/runtime-benchmarks",
-	"pallet-contracts/runtime-benchmarks",
-	"pallet-dapp-staking-migration/runtime-benchmarks",
 	"pallet-dapp-staking-v3/runtime-benchmarks",
-	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
-	"pallet-ethereum/runtime-benchmarks",
-	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
-	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
-	"pallet-evm-precompile-xcm/runtime-benchmarks",
-	"pallet-evm/runtime-benchmarks",
-	"pallet-identity/runtime-benchmarks",
+	"pallet-dapp-staking-migration/runtime-benchmarks",
 	"pallet-inflation/runtime-benchmarks",
-	"pallet-membership/runtime-benchmarks",
-	"pallet-multisig/runtime-benchmarks",
-	"pallet-price-aggregator/runtime-benchmarks",
-	"pallet-proxy/runtime-benchmarks",
-	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
-	"pallet-vesting/runtime-benchmarks",
-	"pallet-xc-asset-config/runtime-benchmarks",
-	"pallet-xcm-benchmarks/runtime-benchmarks",
+	"pallet-ethereum/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-parachain/runtime-benchmarks",
-	"polkadot-primitives/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
+	"pallet-xcm-benchmarks/runtime-benchmarks",
+	"astar-xcm-benchmarks/runtime-benchmarks",
+	"pallet-membership/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
+	"pallet-xc-asset-config/runtime-benchmarks",
+	"pallet-collator-selection/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
+	"pallet-price-aggregator/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 ]
 try-runtime = [
 	"astar-primitives/try-runtime",
-	"astar-xcm-benchmarks?/try-runtime",
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
 	"fp-self-contained/try-runtime",
+	"log",
+	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"frame-try-runtime/try-runtime",
-	"log",
-	"oracle-benchmarks/try-runtime",
-	"orml-oracle/try-runtime",
-	"orml-xtokens/try-runtime",
-	"pallet-assets/try-runtime",
 	"pallet-aura/try-runtime",
-	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
-	"pallet-chain-extension-assets/try-runtime",
-	"pallet-collator-selection/try-runtime",
-	"pallet-contracts/try-runtime",
-	"pallet-dapp-staking-migration/try-runtime",
+	"orml-oracle/try-runtime",
+	"pallet-price-aggregator/try-runtime",
+	"pallet-membership/try-runtime",
 	"pallet-dapp-staking-v3/try-runtime",
-	"pallet-dynamic-evm-base-fee/try-runtime",
-	"pallet-ethereum/try-runtime",
-	"pallet-evm/try-runtime",
-	"pallet-identity/try-runtime",
+	"pallet-dapp-staking-migration/try-runtime",
 	"pallet-inflation/try-runtime",
-	"pallet-insecure-randomness-collective-flip/try-runtime",
-	"pallet-membership/try-runtime",
-	"pallet-multisig/try-runtime",
-	"pallet-price-aggregator/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
+	"pallet-ethereum/try-runtime",
 	"pallet-xc-asset-config/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-authorship/try-runtime",
+	"pallet-collator-selection/try-runtime",
+	"pallet-session/try-runtime",
 	"pallet-xcm/try-runtime",
+	"pallet-identity/try-runtime",
+	"pallet-multisig/try-runtime",
+	"pallet-proxy/try-runtime",
+	"pallet-insecure-randomness-collective-flip/try-runtime",
+	"pallet-contracts/try-runtime",
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-dmp-queue/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
+	"cumulus-pallet-xcmp-queue/try-runtime",
 	"parachain-info/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-	"sp-runtime/try-runtime",
+	"pallet-dynamic-evm-base-fee/try-runtime",
+	"pallet-evm/try-runtime",
+	"orml-xtokens/try-runtime",
+	"oracle-benchmarks/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml
index 4f80366e5c..14c2c008e2 100644
--- a/tests/integration/Cargo.toml
+++ b/tests/integration/Cargo.toml
@@ -61,56 +61,22 @@ pallet-ethereum = { workspace = true, optional = true }
 [features]
 default = ["std"]
 std = [
-	"assets-chain-extension-types/std",
-	"astar-primitives/std",
 	"astar-runtime/std",
-	"astar-test-utils/std",
-	"ethereum?/std",
-	"fp-evm/std",
-	"fp-rpc?/std",
-	"frame-support/std",
-	"frame-system/std",
-	"hex/std",
-	"libsecp256k1/std",
-	"moonbeam-rpc-primitives-debug?/std",
-	"orml-oracle/std",
-	"pallet-assets/std",
-	"pallet-balances/std",
-	"pallet-collator-selection/std",
-	"pallet-contracts-primitives/std",
-	"pallet-contracts/std",
-	"pallet-dapp-staking-v3/std",
-	"pallet-ethereum-checked/std",
-	"pallet-ethereum?/std",
-	"pallet-evm-precompile-assets-erc20/std",
-	"pallet-evm-precompile-dispatch/std",
-	"pallet-evm/std",
-	"pallet-inflation/std",
-	"pallet-membership/std",
-	"pallet-price-aggregator/std",
-	"pallet-proxy/std",
-	"pallet-unified-accounts/std",
-	"pallet-utility/std",
-	"parity-scale-codec/std",
-	"precompile-utils/std",
-	"sha3/std",
 	"shibuya-runtime/std",
 	"shiden-runtime/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"unified-accounts-chain-extension-types/std",
+	"astar-primitives/std",
+	"astar-test-utils/std",
 ]
 shibuya = ["shibuya-runtime"]
 shiden = ["shiden-runtime"]
 astar = ["astar-runtime"]
 
 evm-tracing = [
+	"shibuya-runtime?/evm-tracing",
+	"shiden-runtime?/evm-tracing",
 	"astar-runtime?/evm-tracing",
 	"ethereum",
-	"fp-rpc",
-	"moonbeam-rpc-primitives-debug",
 	"pallet-ethereum",
-	"shibuya-runtime?/evm-tracing",
-	"shiden-runtime?/evm-tracing",
+	"moonbeam-rpc-primitives-debug",
+	"fp-rpc",
 ]
diff --git a/tests/utils/Cargo.toml b/tests/utils/Cargo.toml
index 66d4a2ae4c..0421e99221 100644
--- a/tests/utils/Cargo.toml
+++ b/tests/utils/Cargo.toml
@@ -21,11 +21,9 @@ sp-runtime = { workspace = true }
 [features]
 default = ["std"]
 std = [
+	"parity-scale-codec/std",
 	"frame-support/std",
 	"frame-system/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
-	"parity-scale-codec/std",
-	"scale-info/std",
-	"sp-runtime/std",
+	"pallet-contracts-primitives/std",
 ]
diff --git a/tests/xcm-simulator/Cargo.toml b/tests/xcm-simulator/Cargo.toml
index 7e359a8286..b8bed7b801 100644
--- a/tests/xcm-simulator/Cargo.toml
+++ b/tests/xcm-simulator/Cargo.toml
@@ -60,44 +60,44 @@ orml-xtokens = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"cumulus-pallet-xcm/std",
+	"parity-scale-codec/std",
+	"sp-std/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-tracing/std",
 	"frame-support/std",
 	"frame-system/std",
-	"orml-traits/std",
-	"orml-xcm-support/std",
-	"orml-xtokens/std",
-	"pallet-assets/std",
 	"pallet-balances/std",
-	"pallet-contracts-primitives/std",
+	"pallet-timestamp/std",
 	"pallet-contracts/std",
-	"pallet-dapp-staking-v3/std",
+	"pallet-contracts-primitives/std",
 	"pallet-insecure-randomness-collective-flip/std",
-	"pallet-message-queue/std",
-	"pallet-proxy/std",
-	"pallet-timestamp/std",
-	"pallet-utility/std",
 	"pallet-xcm/std",
-	"parity-scale-codec/std",
+	"cumulus-pallet-xcm/std",
+	"pallet-assets/std",
 	"polkadot-primitives/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"sp-std/std",
-	"sp-tracing/std",
+	"pallet-proxy/std",
+	"pallet-utility/std",
+	"pallet-message-queue/std",
+	"orml-xtokens/std",
+	"orml-traits/std",
+	"orml-xcm-support/std",
+	"pallet-dapp-staking-v3/std",
 ]
 runtime-benchmarks = [
-	"astar-primitives/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"orml-xtokens/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-contracts/runtime-benchmarks",
-	"pallet-dapp-staking-v3/runtime-benchmarks",
-	"pallet-message-queue/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-parachain/runtime-benchmarks",
-	"polkadot-runtime-parachains/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
+	"pallet-dapp-staking-v3/runtime-benchmarks",
 ]
diff --git a/vendor/primitives/debug/Cargo.toml b/vendor/primitives/debug/Cargo.toml
index 031f1adc8b..291c2fc16b 100644
--- a/vendor/primitives/debug/Cargo.toml
+++ b/vendor/primitives/debug/Cargo.toml
@@ -26,14 +26,12 @@ sp-std = { workspace = true }
 [features]
 default = ["std"]
 std = [
+	"parity-scale-codec/std",
 	"environmental/std",
 	"ethereum-types/std",
 	"ethereum/std",
 	"hex",
-	"hex?/std",
-	"parity-scale-codec/std",
 	"serde",
-	"serde?/std",
 	"serde_json",
 	"sp-api/std",
 	"sp-core/std",
diff --git a/vendor/primitives/evm-tracing-events/Cargo.toml b/vendor/primitives/evm-tracing-events/Cargo.toml
index 184a393504..b8b219c31a 100644
--- a/vendor/primitives/evm-tracing-events/Cargo.toml
+++ b/vendor/primitives/evm-tracing-events/Cargo.toml
@@ -24,13 +24,13 @@ evm-runtime = { workspace = true }
 [features]
 default = ["std"]
 std = [
+	"parity-scale-codec/std",
 	"environmental/std",
 	"ethereum-types/std",
 	"ethereum/std",
 	"evm-gasometer/std",
 	"evm-runtime/std",
 	"evm/std",
-	"parity-scale-codec/std",
 	"sp-runtime-interface/std",
 ]
 evm-tracing = ["evm-gasometer/tracing", "evm-runtime/tracing", "evm/tracing"]
diff --git a/vendor/primitives/txpool/Cargo.toml b/vendor/primitives/txpool/Cargo.toml
index f0ac6b4b92..9b4dcb0290 100644
--- a/vendor/primitives/txpool/Cargo.toml
+++ b/vendor/primitives/txpool/Cargo.toml
@@ -22,10 +22,10 @@ sp-std = { workspace = true }
 default = ["std"]
 std = [
 	"ethereum/std",
-	"parity-scale-codec/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"parity-scale-codec/std",
 ]
diff --git a/vendor/runtime/evm-tracer/Cargo.toml b/vendor/runtime/evm-tracer/Cargo.toml
index 9521a5f068..8c6a62159b 100644
--- a/vendor/runtime/evm-tracer/Cargo.toml
+++ b/vendor/runtime/evm-tracer/Cargo.toml
@@ -31,6 +31,7 @@ pallet-evm = { workspace = true }
 [features]
 default = ["std"]
 std = [
+	"parity-scale-codec/std",
 	"ethereum-types/std",
 	"evm-gasometer/std",
 	"evm-runtime/std",
@@ -40,9 +41,7 @@ std = [
 	"fp-evm/std",
 	"moonbeam-primitives-ext/std",
 	"pallet-evm/std",
-	"parity-scale-codec/std",
 	"sp-core/std",
-	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
diff --git a/vendor/runtime/ext/Cargo.toml b/vendor/runtime/ext/Cargo.toml
index cdbc2ce606..0a30218125 100644
--- a/vendor/runtime/ext/Cargo.toml
+++ b/vendor/runtime/ext/Cargo.toml
@@ -22,9 +22,9 @@ sp-std = { workspace = true }
 [features]
 default = ["std"]
 std = [
+	"parity-scale-codec/std",
 	"ethereum-types/std",
 	"evm-tracing-events/std",
-	"parity-scale-codec/std",
 	"sp-externalities/std",
 	"sp-runtime-interface/std",
 	"sp-std/std",

From 071b3fd25e4d0f082eb93285eeb86d6e57e1e977 Mon Sep 17 00:00:00 2001
From: Ermal Kaleci <ermalkaleci@gmail.com>
Date: Sun, 23 Jun 2024 16:46:04 +0200
Subject: [PATCH 10/10] rerun zepter without deps sorting

---
 bin/collator/Cargo.toml                      | 32 +++++++++++++++++-
 chain-extensions/pallet-assets/Cargo.toml    | 17 ++++++++--
 chain-extensions/unified-accounts/Cargo.toml |  1 +
 chain-extensions/xvm/Cargo.toml              |  2 ++
 pallets/astar-xcm-benchmarks/Cargo.toml      | 14 +++++++-
 pallets/collator-selection/Cargo.toml        | 12 ++++++-
 pallets/dapp-staking-migration/Cargo.toml    | 10 +++++-
 pallets/dapp-staking-v3/Cargo.toml           |  8 ++++-
 pallets/dynamic-evm-base-fee/Cargo.toml      |  2 ++
 pallets/ethereum-checked/Cargo.toml          | 11 ++++++-
 pallets/inflation/Cargo.toml                 | 10 +++++-
 pallets/oracle-benchmarks/Cargo.toml         | 11 ++++++-
 pallets/price-aggregator/Cargo.toml          | 10 +++++-
 pallets/static-price-provider/Cargo.toml     | 10 +++++-
 pallets/unified-accounts/Cargo.toml          | 10 +++++-
 pallets/xc-asset-config/Cargo.toml           | 12 ++++++-
 pallets/xvm/Cargo.toml                       | 12 +++++++
 precompiles/assets-erc20/Cargo.toml          | 11 ++++++-
 precompiles/dapp-staking-v3/Cargo.toml       | 11 ++++++-
 precompiles/dispatch-lockdrop/Cargo.toml     |  2 ++
 precompiles/sr25519/Cargo.toml               |  2 ++
 precompiles/substrate-ecdsa/Cargo.toml       |  1 +
 precompiles/unified-accounts/Cargo.toml      |  3 ++
 precompiles/utils/Cargo.toml                 |  7 ++++
 precompiles/utils/macro/Cargo.toml           |  1 +
 precompiles/xcm/Cargo.toml                   | 16 ++++++++-
 precompiles/xvm/Cargo.toml                   |  3 ++
 primitives/Cargo.toml                        | 24 ++++++++++++--
 runtime/astar/Cargo.toml                     | 31 ++++++++++++++++++
 runtime/local/Cargo.toml                     | 23 +++++++++++++
 runtime/shibuya/Cargo.toml                   | 32 ++++++++++++++++++
 runtime/shiden/Cargo.toml                    | 32 ++++++++++++++++++
 tests/integration/Cargo.toml                 | 34 ++++++++++++++++++++
 tests/utils/Cargo.toml                       |  2 ++
 vendor/primitives/debug/Cargo.toml           |  2 ++
 vendor/runtime/evm-tracer/Cargo.toml         |  1 +
 36 files changed, 403 insertions(+), 19 deletions(-)

diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
index 09d6c53c35..4904edaa74 100644
--- a/bin/collator/Cargo.toml
+++ b/bin/collator/Cargo.toml
@@ -166,9 +166,37 @@ runtime-benchmarks = [
 	"sp-keyring",
 	"polkadot-runtime-common",
 	"astar-primitives/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-benchmarking-cli?/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-ethereum/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common?/runtime-benchmarks",
+	"polkadot-service/runtime-benchmarks",
+	"sc-client-db/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 cli = ["try-runtime-cli"]
-try-runtime = ["local-runtime/try-runtime", "try-runtime-cli/try-runtime"]
+try-runtime = [
+	"local-runtime/try-runtime",
+	"try-runtime-cli/try-runtime",
+	"astar-primitives/try-runtime",
+	"astar-runtime/try-runtime",
+	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"pallet-ethereum/try-runtime",
+	"pallet-evm/try-runtime",
+	"pallet-transaction-payment/try-runtime",
+	"polkadot-cli?/try-runtime",
+	"polkadot-runtime-common?/try-runtime",
+	"polkadot-service/try-runtime",
+	"shibuya-runtime/try-runtime",
+	"shiden-runtime/try-runtime",
+	"sp-runtime/try-runtime",
+]
 evm-tracing = [
 	"moonbeam-rpc-debug",
 	"moonbeam-rpc-primitives-debug",
@@ -177,5 +205,7 @@ evm-tracing = [
 	"moonbeam-rpc-txpool",
 	"shibuya-runtime/evm-tracing",
 	"shiden-runtime/evm-tracing",
+	"astar-runtime/evm-tracing",
+	"local-runtime/evm-tracing",
 ]
 manual-seal = ["sc-consensus-manual-seal"]
diff --git a/chain-extensions/pallet-assets/Cargo.toml b/chain-extensions/pallet-assets/Cargo.toml
index 0bd86ecf95..198ee1ad2f 100644
--- a/chain-extensions/pallet-assets/Cargo.toml
+++ b/chain-extensions/pallet-assets/Cargo.toml
@@ -45,6 +45,19 @@ std = [
 	"pallet-assets/std",
 	"assets-chain-extension-types/std",
 	"pallet-balances/std",
+	"log/std",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-contracts/try-runtime",
+	"sp-runtime/try-runtime",
+]
+runtime-benchmarks = [
+	"pallet-assets/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
-runtime-benchmarks = ["pallet-assets/runtime-benchmarks"]
diff --git a/chain-extensions/unified-accounts/Cargo.toml b/chain-extensions/unified-accounts/Cargo.toml
index 5f6e4e4b8f..e017e5eeb2 100644
--- a/chain-extensions/unified-accounts/Cargo.toml
+++ b/chain-extensions/unified-accounts/Cargo.toml
@@ -44,4 +44,5 @@ std = [
 	"astar-primitives/std",
 	"pallet-unified-accounts/std",
 	"unified-accounts-chain-extension-types/std",
+	"log/std",
 ]
diff --git a/chain-extensions/xvm/Cargo.toml b/chain-extensions/xvm/Cargo.toml
index 11ac1ed5e1..4a2c0663ea 100644
--- a/chain-extensions/xvm/Cargo.toml
+++ b/chain-extensions/xvm/Cargo.toml
@@ -42,4 +42,6 @@ std = [
 	"sp-runtime/std",
 	# Astar
 	"astar-primitives/std",
+	"log/std",
+	"xvm-chain-extension-types/std",
 ]
diff --git a/pallets/astar-xcm-benchmarks/Cargo.toml b/pallets/astar-xcm-benchmarks/Cargo.toml
index db29f90c9e..5faa029c95 100644
--- a/pallets/astar-xcm-benchmarks/Cargo.toml
+++ b/pallets/astar-xcm-benchmarks/Cargo.toml
@@ -52,9 +52,18 @@ std = [
 	"sp-std/std",
 	"sp-runtime/std",
 	"xcm/std",
+	"log/std",
+	"scale-info/std",
+	"serde?/std",
+	"xcm-executor/std",
 ]
 
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"frame-support/try-runtime",
+	"astar-primitives/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
 
 runtime-benchmarks = [
 	"frame-benchmarking",
@@ -64,4 +73,7 @@ runtime-benchmarks = [
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"parity-scale-codec",
 	"xcm-executor/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
index a7807ed64c..ef1ab6a42f 100644
--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -44,6 +44,9 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 ]
 std = [
 	"parity-scale-codec/std",
@@ -60,6 +63,13 @@ std = [
 	"pallet-session/std",
 	"pallet-aura/std",
 	"pallet-balances/std",
+	"serde/std",
 ]
 
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-authorship/try-runtime",
+	"pallet-session/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/pallets/dapp-staking-migration/Cargo.toml b/pallets/dapp-staking-migration/Cargo.toml
index be2a13599a..270e496d81 100644
--- a/pallets/dapp-staking-migration/Cargo.toml
+++ b/pallets/dapp-staking-migration/Cargo.toml
@@ -42,6 +42,7 @@ std = [
 	"astar-primitives/std",
 	"sp-core/std",
 	"pallet-balances/std",
+	"sp-runtime/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
@@ -50,5 +51,12 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"pallet-dapp-staking-v3/runtime-benchmarks",
 	"astar-primitives/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"astar-primitives/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-dapp-staking-v3/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/dapp-staking-v3/Cargo.toml b/pallets/dapp-staking-v3/Cargo.toml
index bd95087453..68c6ff468a 100644
--- a/pallets/dapp-staking-v3/Cargo.toml
+++ b/pallets/dapp-staking-v3/Cargo.toml
@@ -56,5 +56,11 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"astar-primitives/runtime-benchmarks",
 	"assert_matches",
+	"frame-benchmarking/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"astar-primitives/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/dynamic-evm-base-fee/Cargo.toml b/pallets/dynamic-evm-base-fee/Cargo.toml
index c6ecb9208e..708832c091 100644
--- a/pallets/dynamic-evm-base-fee/Cargo.toml
+++ b/pallets/dynamic-evm-base-fee/Cargo.toml
@@ -54,9 +54,11 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-transaction-payment/try-runtime",
+	"sp-runtime/try-runtime",
 ]
diff --git a/pallets/ethereum-checked/Cargo.toml b/pallets/ethereum-checked/Cargo.toml
index e2538195fe..3fd9e5022e 100644
--- a/pallets/ethereum-checked/Cargo.toml
+++ b/pallets/ethereum-checked/Cargo.toml
@@ -55,6 +55,7 @@ std = [
 	"pallet-evm/std",
 	"pallet-ethereum/std",
 	"astar-primitives/std",
+	"frame-benchmarking?/std",
 ]
 runtime-benchmarks = [
 	"hex",
@@ -64,5 +65,13 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"pallet-ethereum/runtime-benchmarks",
 	"astar-primitives/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"astar-primitives/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-evm/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/inflation/Cargo.toml b/pallets/inflation/Cargo.toml
index 0ba8a6fe92..0422dce7cb 100644
--- a/pallets/inflation/Cargo.toml
+++ b/pallets/inflation/Cargo.toml
@@ -40,6 +40,8 @@ std = [
 	"frame-system/std",
 	"pallet-balances/std",
 	"astar-primitives/std",
+	"frame-benchmarking?/std",
+	"sp-runtime/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
@@ -47,5 +49,11 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"astar-primitives/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"astar-primitives/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/oracle-benchmarks/Cargo.toml b/pallets/oracle-benchmarks/Cargo.toml
index 534c34a2de..504955ce96 100644
--- a/pallets/oracle-benchmarks/Cargo.toml
+++ b/pallets/oracle-benchmarks/Cargo.toml
@@ -41,6 +41,8 @@ std = [
 	"sp-arithmetic/std",
 	"orml-traits/std",
 	"orml-oracle/std",
+	"frame-benchmarking?/std",
+	"sp-runtime/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
@@ -48,5 +50,12 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"astar-primitives/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"astar-primitives/try-runtime",
+	"frame-system/try-runtime",
+	"orml-oracle/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/price-aggregator/Cargo.toml b/pallets/price-aggregator/Cargo.toml
index c90324eac0..0471595eca 100644
--- a/pallets/price-aggregator/Cargo.toml
+++ b/pallets/price-aggregator/Cargo.toml
@@ -46,6 +46,8 @@ std = [
 	"astar-primitives/std",
 	"sp-arithmetic/std",
 	"orml-traits/std",
+	"frame-benchmarking?/std",
+	"sp-runtime/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
@@ -53,5 +55,11 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"astar-primitives/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"astar-primitives/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/static-price-provider/Cargo.toml b/pallets/static-price-provider/Cargo.toml
index 061aaa8e38..550512c72e 100644
--- a/pallets/static-price-provider/Cargo.toml
+++ b/pallets/static-price-provider/Cargo.toml
@@ -42,6 +42,8 @@ std = [
 	"pallet-balances/std",
 	"astar-primitives/std",
 	"sp-arithmetic/std",
+	"frame-benchmarking?/std",
+	"sp-runtime/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
@@ -49,5 +51,11 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"astar-primitives/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"astar-primitives/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/unified-accounts/Cargo.toml b/pallets/unified-accounts/Cargo.toml
index c74c5ac954..4b37bbae3b 100644
--- a/pallets/unified-accounts/Cargo.toml
+++ b/pallets/unified-accounts/Cargo.toml
@@ -62,6 +62,7 @@ std = [
 	"pallet-balances/std",
 	"pallet-timestamp/std",
 	"pallet-ethereum/std",
+	"frame-benchmarking?/std",
 ]
 runtime-benchmarks = [
 	"libsecp256k1/hmac",
@@ -72,5 +73,12 @@ runtime-benchmarks = [
 	"astar-primitives/runtime-benchmarks",
 	"pallet-ethereum/runtime-benchmarks",
 	"pallet-evm/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"pallet-evm/try-runtime",
+	"astar-primitives/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime", "pallet-evm/try-runtime"]
diff --git a/pallets/xc-asset-config/Cargo.toml b/pallets/xc-asset-config/Cargo.toml
index 3295f1221d..bf9172153d 100644
--- a/pallets/xc-asset-config/Cargo.toml
+++ b/pallets/xc-asset-config/Cargo.toml
@@ -44,9 +44,19 @@ std = [
 	"xcm/std",
 	"pallet-balances/std",
 	"frame-benchmarking?/std",
+	"log/std",
+	"serde?/std",
 ]
 
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/xvm/Cargo.toml b/pallets/xvm/Cargo.toml
index 0160aeb125..d4b2f22e69 100644
--- a/pallets/xvm/Cargo.toml
+++ b/pallets/xvm/Cargo.toml
@@ -60,13 +60,25 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 	"astar-primitives/std",
+	"frame-benchmarking?/std",
+	"serde?/std",
 ]
 
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"astar-primitives/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"pallet-contracts/try-runtime",
 	"pallet-evm/try-runtime",
+	"astar-primitives/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
diff --git a/precompiles/assets-erc20/Cargo.toml b/precompiles/assets-erc20/Cargo.toml
index a9cc8a9d68..56d3315e67 100644
--- a/precompiles/assets-erc20/Cargo.toml
+++ b/precompiles/assets-erc20/Cargo.toml
@@ -54,5 +54,14 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"log/std",
+	"num_enum/std",
+]
+runtime-benchmarks = [
+	"pallet-assets/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
-runtime-benchmarks = ["pallet-assets/runtime-benchmarks"]
diff --git a/precompiles/dapp-staking-v3/Cargo.toml b/precompiles/dapp-staking-v3/Cargo.toml
index 5c40d95a5f..00a9828666 100644
--- a/precompiles/dapp-staking-v3/Cargo.toml
+++ b/precompiles/dapp-staking-v3/Cargo.toml
@@ -58,5 +58,14 @@ std = [
 	"precompile-utils/std",
 	"pallet-balances/std",
 	"sp-arithmetic/std",
+	"log/std",
+	"num_enum/std",
+]
+runtime-benchmarks = [
+	"pallet-dapp-staking-v3/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
-runtime-benchmarks = ["pallet-dapp-staking-v3/runtime-benchmarks"]
diff --git a/precompiles/dispatch-lockdrop/Cargo.toml b/precompiles/dispatch-lockdrop/Cargo.toml
index b2ca7f5e20..f6f508c611 100644
--- a/precompiles/dispatch-lockdrop/Cargo.toml
+++ b/precompiles/dispatch-lockdrop/Cargo.toml
@@ -55,4 +55,6 @@ std = [
 	"pallet-evm/std",
 	"pallet-balances/std",
 	"pallet-timestamp/std",
+	"fp-evm/std",
+	"pallet-evm-precompile-dispatch/std",
 ]
diff --git a/precompiles/sr25519/Cargo.toml b/precompiles/sr25519/Cargo.toml
index a5abe88ec7..7ed56d51ad 100644
--- a/precompiles/sr25519/Cargo.toml
+++ b/precompiles/sr25519/Cargo.toml
@@ -46,4 +46,6 @@ std = [
 	"sp-core/std",
 	"sp-std/std",
 	"sp-io/std",
+	"log/std",
+	"num_enum/std",
 ]
diff --git a/precompiles/substrate-ecdsa/Cargo.toml b/precompiles/substrate-ecdsa/Cargo.toml
index 388283b9e9..c891b865eb 100644
--- a/precompiles/substrate-ecdsa/Cargo.toml
+++ b/precompiles/substrate-ecdsa/Cargo.toml
@@ -48,4 +48,5 @@ std = [
 	"sp-core/std",
 	"sp-std/std",
 	"sp-io/std",
+	"log/std",
 ]
diff --git a/precompiles/unified-accounts/Cargo.toml b/precompiles/unified-accounts/Cargo.toml
index 30842e0651..dbbdc909e1 100644
--- a/precompiles/unified-accounts/Cargo.toml
+++ b/precompiles/unified-accounts/Cargo.toml
@@ -59,4 +59,7 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"astar-primitives/std",
+	"hex/std",
+	"log/std",
+	"num_enum/std",
 ]
diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml
index 9e7b1dc67f..0255e214b7 100644
--- a/precompiles/utils/Cargo.toml
+++ b/precompiles/utils/Cargo.toml
@@ -54,6 +54,13 @@ std = [
 	"sp-io/std",
 	"sp-std/std",
 	"xcm?/std",
+	"evm/std",
+	"hex/std",
+	"log/std",
+	"num_enum/std",
+	"scale-info?/std",
+	"serde?/std",
+	"sp-runtime/std",
 ]
 codec-xcm = ["xcm"]
 testing = ["derive_more", "hex-literal", "scale-info", "serde", "similar-asserts", "std"]
diff --git a/precompiles/utils/macro/Cargo.toml b/precompiles/utils/macro/Cargo.toml
index c13219412a..a7365118af 100644
--- a/precompiles/utils/macro/Cargo.toml
+++ b/precompiles/utils/macro/Cargo.toml
@@ -39,4 +39,5 @@ std = [
 	"frame-support/std",
 	"sp-core-hashing/std",
 	"sp-std/std",
+	"num_enum/std",
 ]
diff --git a/precompiles/xcm/Cargo.toml b/precompiles/xcm/Cargo.toml
index a131fe9c52..dd869a06d2 100644
--- a/precompiles/xcm/Cargo.toml
+++ b/precompiles/xcm/Cargo.toml
@@ -71,5 +71,19 @@ std = [
 	"orml-xcm-support/std",
 	"orml-traits/std",
 	"astar-primitives/std",
+	"log/std",
+	"num_enum/std",
+]
+runtime-benchmarks = [
+	"pallet-xcm/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
-runtime-benchmarks = ["pallet-xcm/runtime-benchmarks", "pallet-assets/runtime-benchmarks", "xcm-builder/runtime-benchmarks"]
diff --git a/precompiles/xvm/Cargo.toml b/precompiles/xvm/Cargo.toml
index c64e26b3b2..2c50aa18aa 100644
--- a/precompiles/xvm/Cargo.toml
+++ b/precompiles/xvm/Cargo.toml
@@ -55,4 +55,7 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"astar-primitives/std",
+	"hex/std",
+	"log/std",
+	"num_enum/std",
 ]
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index c3379c04ca..d3805a2afb 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -76,5 +76,25 @@ std = [
 	"pallet-evm-precompile-dispatch/std",
 	"sp-arithmetic/std",
 ]
-runtime-benchmarks = ["xcm-builder/runtime-benchmarks", "pallet-assets/runtime-benchmarks"]
-try-runtime = ["pallet-contracts/try-runtime"]
+runtime-benchmarks = [
+	"xcm-builder/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-xc-asset-config/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
+]
+try-runtime = [
+	"pallet-contracts/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"orml-oracle/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-evm/try-runtime",
+	"pallet-xc-asset-config/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml
index 16ba21ef2e..f3d1a03fec 100644
--- a/runtime/astar/Cargo.toml
+++ b/runtime/astar/Cargo.toml
@@ -228,6 +228,13 @@ std = [
 	"orml-xtokens/std",
 	"orml-xcm-support/std",
 	"astar-primitives/std",
+	"astar-xcm-benchmarks?/std",
+	"frame-system-benchmarking?/std",
+	"log?/std",
+	"num_enum/std",
+	"pallet-xcm-benchmarks?/std",
+	"precompile-utils/std",
+	"scale-info/std",
 ]
 runtime-benchmarks = [
 	'frame-benchmarking',
@@ -255,6 +262,25 @@ runtime-benchmarks = [
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"astar-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"oracle-benchmarks/runtime-benchmarks",
+	"pallet-chain-extension-assets/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
+	"pallet-evm-precompile-xcm/runtime-benchmarks",
+	"pallet-identity/runtime-benchmarks",
+	"pallet-multisig/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
+	"pallet-vesting/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"fp-self-contained/try-runtime",
@@ -297,6 +323,11 @@ try-runtime = [
 	"pallet-contracts/try-runtime",
 	"pallet-evm/try-runtime",
 	"orml-xtokens/try-runtime",
+	"astar-primitives/try-runtime",
+	"astar-xcm-benchmarks?/try-runtime",
+	"pallet-chain-extension-assets/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml
index da7d526e38..0dd4ad7315 100644
--- a/runtime/local/Cargo.toml
+++ b/runtime/local/Cargo.toml
@@ -177,6 +177,12 @@ std = [
 	"substrate-wasm-builder",
 	"pallet-chain-extension-assets/std",
 	"astar-primitives/std",
+	"frame-system-benchmarking?/std",
+	"log?/std",
+	"num_enum/std",
+	"pallet-evm-precompile-assets-erc20/std",
+	"precompile-utils/std",
+	"scale-info/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
@@ -195,6 +201,20 @@ runtime-benchmarks = [
 	"pallet-dapp-staking-v3/runtime-benchmarks",
 	"pallet-inflation/runtime-benchmarks",
 	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"pallet-chain-extension-assets/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
+	"pallet-grandpa/runtime-benchmarks",
+	"pallet-proxy/runtime-benchmarks",
+	"pallet-scheduler/runtime-benchmarks",
+	"pallet-static-price-provider/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
+	"pallet-vesting/runtime-benchmarks",
+	"pallet-xvm/runtime-benchmarks",
 ]
 try-runtime = [
 	"fp-self-contained/try-runtime",
@@ -226,6 +246,9 @@ try-runtime = [
 	"pallet-evm/try-runtime",
 	"pallet-ethereum-checked/try-runtime",
 	"pallet-static-price-provider/try-runtime",
+	"astar-primitives/try-runtime",
+	"pallet-chain-extension-assets/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml
index 7a90e95671..d00e571611 100644
--- a/runtime/shibuya/Cargo.toml
+++ b/runtime/shibuya/Cargo.toml
@@ -249,6 +249,13 @@ std = [
 	"orml-xtokens/std",
 	"orml-xcm-support/std",
 	"astar-primitives/std",
+	"astar-xcm-benchmarks?/std",
+	"frame-system-benchmarking?/std",
+	"log?/std",
+	"num_enum/std",
+	"pallet-xcm-benchmarks?/std",
+	"precompile-utils/std",
+	"scale-info/std",
 ]
 runtime-benchmarks = [
 	"astar-xcm-benchmarks/runtime-benchmarks",
@@ -279,6 +286,26 @@ runtime-benchmarks = [
 	"pallet-assets/runtime-benchmarks",
 	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"pallet-chain-extension-assets/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
+	"pallet-evm-precompile-xcm/runtime-benchmarks",
+	"pallet-identity/runtime-benchmarks",
+	"pallet-multisig/runtime-benchmarks",
+	"pallet-proxy/runtime-benchmarks",
+	"pallet-scheduler/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
+	"pallet-vesting/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"fp-self-contained/try-runtime",
@@ -327,6 +354,11 @@ try-runtime = [
 	"pallet-unified-accounts/try-runtime",
 	"pallet-ethereum-checked/try-runtime",
 	"orml-xtokens/try-runtime",
+	"astar-primitives/try-runtime",
+	"astar-xcm-benchmarks?/try-runtime",
+	"pallet-chain-extension-assets/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml
index 486d8b00c8..7d52aaf4b6 100644
--- a/runtime/shiden/Cargo.toml
+++ b/runtime/shiden/Cargo.toml
@@ -232,6 +232,13 @@ std = [
 	"orml-xtokens/std",
 	"orml-xcm-support/std",
 	"astar-primitives/std",
+	"astar-xcm-benchmarks?/std",
+	"frame-system-benchmarking?/std",
+	"log?/std",
+	"num_enum/std",
+	"pallet-xcm-benchmarks?/std",
+	"precompile-utils/std",
+	"scale-info/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
@@ -257,6 +264,27 @@ runtime-benchmarks = [
 	"pallet-dynamic-evm-base-fee/runtime-benchmarks",
 	"pallet-price-aggregator/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"oracle-benchmarks/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
+	"pallet-chain-extension-assets/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
+	"pallet-evm-precompile-assets-erc20/runtime-benchmarks",
+	"pallet-evm-precompile-dapp-staking-v3/runtime-benchmarks",
+	"pallet-evm-precompile-xcm/runtime-benchmarks",
+	"pallet-identity/runtime-benchmarks",
+	"pallet-multisig/runtime-benchmarks",
+	"pallet-proxy/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
+	"pallet-vesting/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"astar-primitives/try-runtime",
@@ -301,6 +329,10 @@ try-runtime = [
 	"pallet-evm/try-runtime",
 	"orml-xtokens/try-runtime",
 	"oracle-benchmarks/try-runtime",
+	"astar-xcm-benchmarks?/try-runtime",
+	"pallet-chain-extension-assets/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 evm-tracing = [
 	"moonbeam-evm-tracer",
diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml
index 14c2c008e2..73a0bd0296 100644
--- a/tests/integration/Cargo.toml
+++ b/tests/integration/Cargo.toml
@@ -66,6 +66,40 @@ std = [
 	"shiden-runtime/std",
 	"astar-primitives/std",
 	"astar-test-utils/std",
+	"assets-chain-extension-types/std",
+	"ethereum?/std",
+	"fp-evm/std",
+	"fp-rpc?/std",
+	"frame-support/std",
+	"frame-system/std",
+	"hex/std",
+	"libsecp256k1/std",
+	"moonbeam-rpc-primitives-debug?/std",
+	"orml-oracle/std",
+	"pallet-assets/std",
+	"pallet-balances/std",
+	"pallet-collator-selection/std",
+	"pallet-contracts/std",
+	"pallet-contracts-primitives/std",
+	"pallet-dapp-staking-v3/std",
+	"pallet-ethereum?/std",
+	"pallet-ethereum-checked/std",
+	"pallet-evm/std",
+	"pallet-evm-precompile-assets-erc20/std",
+	"pallet-evm-precompile-dispatch/std",
+	"pallet-inflation/std",
+	"pallet-membership/std",
+	"pallet-price-aggregator/std",
+	"pallet-proxy/std",
+	"pallet-unified-accounts/std",
+	"pallet-utility/std",
+	"parity-scale-codec/std",
+	"precompile-utils/std",
+	"sha3/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"unified-accounts-chain-extension-types/std",
 ]
 shibuya = ["shibuya-runtime"]
 shiden = ["shiden-runtime"]
diff --git a/tests/utils/Cargo.toml b/tests/utils/Cargo.toml
index 0421e99221..88464fbd05 100644
--- a/tests/utils/Cargo.toml
+++ b/tests/utils/Cargo.toml
@@ -26,4 +26,6 @@ std = [
 	"frame-system/std",
 	"pallet-contracts/std",
 	"pallet-contracts-primitives/std",
+	"scale-info/std",
+	"sp-runtime/std",
 ]
diff --git a/vendor/primitives/debug/Cargo.toml b/vendor/primitives/debug/Cargo.toml
index 291c2fc16b..d3dc49bfbe 100644
--- a/vendor/primitives/debug/Cargo.toml
+++ b/vendor/primitives/debug/Cargo.toml
@@ -38,4 +38,6 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"hex?/std",
+	"serde?/std",
 ]
diff --git a/vendor/runtime/evm-tracer/Cargo.toml b/vendor/runtime/evm-tracer/Cargo.toml
index 8c6a62159b..afed879516 100644
--- a/vendor/runtime/evm-tracer/Cargo.toml
+++ b/vendor/runtime/evm-tracer/Cargo.toml
@@ -44,4 +44,5 @@ std = [
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"sp-io/std",
 ]