From e2d0aae31496ad163345427304bfafba6b8b5848 Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Mon, 24 Jun 2024 14:19:37 +0200 Subject: [PATCH] Zepter integration (#1278) --- .config/zepter.yaml | 46 ++++++++++++++++++++ .github/workflows/zepter.yml | 36 +++++++++++++++ bin/collator/Cargo.toml | 38 ++++++++++++++-- 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 ++++++++++++++ rust-toolchain.toml | 2 +- tests/integration/Cargo.toml | 34 +++++++++++++++ tests/utils/Cargo.toml | 2 + vendor/primitives/debug/Cargo.toml | 2 + vendor/runtime/evm-tracer/Cargo.toml | 1 + 39 files changed, 489 insertions(+), 23 deletions(-) create mode 100644 .config/zepter.yaml create mode 100644 .github/workflows/zepter.yml diff --git a/.config/zepter.yaml b/.config/zepter.yaml new file mode 100644 index 0000000000..291c3f0f3f --- /dev/null +++ b/.config/zepter.yaml @@ -0,0 +1,46 @@ +# Configuration for the Zepter CLI to ensure correct feature configuration in the Rust workspace. +# + +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', + ] + # Same as `check`, but actually fix the issues instead of just reporting them: + default: + - [ $check.0, '--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" diff --git a/.github/workflows/zepter.yml b/.github/workflows/zepter.yml new file mode 100644 index 0000000000..8e66a16c06 --- /dev/null +++ b/.github/workflows/zepter.yml @@ -0,0 +1,36 @@ +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: + check: + runs-on: ubuntu-latest + steps: + - 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 + + - name: Install Zepter + run: cargo install zepter -f --locked && zepter --version + + - name: Check Rust features + run: zepter run check diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml index 75a043b652..4904edaa74 100644 --- a/bin/collator/Cargo.toml +++ b/bin/collator/Cargo.toml @@ -166,16 +166,46 @@ 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", "moonbeam-rpc-primitives-txpool", "moonbeam-rpc-trace", "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", -] +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/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" 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", ]