From 0492be1cebe092535d27f87587d023ec2d6c6ed3 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Wed, 12 Mar 2025 13:41:55 +0000 Subject: [PATCH 01/25] pallet-revive: remove related crates from umbrella Signed-off-by: Iulian Barbu --- Cargo.lock | 4 --- substrate/frame/revive/Cargo.toml | 3 ++ .../frame/revive/mock-network/Cargo.toml | 3 ++ substrate/frame/revive/proc-macro/Cargo.toml | 3 ++ substrate/frame/revive/rpc/Cargo.toml | 3 ++ substrate/frame/revive/uapi/Cargo.toml | 3 ++ umbrella/Cargo.toml | 31 ++----------------- umbrella/src/lib.rs | 24 -------------- 8 files changed, 17 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4dd0f2f65d324..baf9ad8567264 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15551,10 +15551,6 @@ dependencies = [ "pallet-recovery", "pallet-referenda", "pallet-remark", - "pallet-revive", - "pallet-revive-eth-rpc", - "pallet-revive-proc-macro", - "pallet-revive-uapi", "pallet-root-offences", "pallet-root-testing", "pallet-safe-mode", diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml index dc694d52b38f4..219fe17f6b99d 100644 --- a/substrate/frame/revive/Cargo.toml +++ b/substrate/frame/revive/Cargo.toml @@ -13,6 +13,9 @@ include = ["CHANGELOG.md", "README.md", "build.rs", "src/**/*"] [lints] workspace = true +[package.metadata.polkadot-sdk] +exclude-from-umbrella = true + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/substrate/frame/revive/mock-network/Cargo.toml b/substrate/frame/revive/mock-network/Cargo.toml index 76a8be8f2cabb..8535372c8a2a7 100644 --- a/substrate/frame/revive/mock-network/Cargo.toml +++ b/substrate/frame/revive/mock-network/Cargo.toml @@ -9,6 +9,9 @@ repository.workspace = true description = "A mock network for testing pallet-revive." publish = false +[package.metadata.polkadot-sdk] +exclude-from-umbrella = true + [lints] workspace = true diff --git a/substrate/frame/revive/proc-macro/Cargo.toml b/substrate/frame/revive/proc-macro/Cargo.toml index 97e0785d6d9fc..0f6a2260ec5a3 100644 --- a/substrate/frame/revive/proc-macro/Cargo.toml +++ b/substrate/frame/revive/proc-macro/Cargo.toml @@ -8,6 +8,9 @@ homepage.workspace = true repository.workspace = true description = "Procedural macros used in pallet_revive" +[package.metadata.polkadot-sdk] +exclude-from-umbrella = true + [lints] workspace = true diff --git a/substrate/frame/revive/rpc/Cargo.toml b/substrate/frame/revive/rpc/Cargo.toml index 8eb3e7a647ac4..ad12827ac181e 100644 --- a/substrate/frame/revive/rpc/Cargo.toml +++ b/substrate/frame/revive/rpc/Cargo.toml @@ -8,6 +8,9 @@ homepage.workspace = true repository.workspace = true description = "An Ethereum JSON-RPC server for pallet-revive." +[package.metadata.polkadot-sdk] +exclude-from-umbrella = true + [[bin]] name = "eth-rpc" path = "src/main.rs" diff --git a/substrate/frame/revive/uapi/Cargo.toml b/substrate/frame/revive/uapi/Cargo.toml index 9ce4c305b8167..b40e6d2f68fbc 100644 --- a/substrate/frame/revive/uapi/Cargo.toml +++ b/substrate/frame/revive/uapi/Cargo.toml @@ -8,6 +8,9 @@ homepage.workspace = true repository.workspace = true description = "Exposes all the host functions that a contract can import." +[package.metadata.polkadot-sdk] +exclude-from-umbrella = true + [lints] workspace = true diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml index 582500ada5f2b..4fc75fd175702 100644 --- a/umbrella/Cargo.toml +++ b/umbrella/Cargo.toml @@ -120,7 +120,6 @@ std = [ "pallet-recovery?/std", "pallet-referenda?/std", "pallet-remark?/std", - "pallet-revive?/std", "pallet-root-offences?/std", "pallet-root-testing?/std", "pallet-safe-mode?/std", @@ -307,7 +306,6 @@ runtime-benchmarks = [ "pallet-recovery?/runtime-benchmarks", "pallet-referenda?/runtime-benchmarks", "pallet-remark?/runtime-benchmarks", - "pallet-revive?/runtime-benchmarks", "pallet-root-offences?/runtime-benchmarks", "pallet-safe-mode?/runtime-benchmarks", "pallet-salary?/runtime-benchmarks", @@ -440,7 +438,6 @@ try-runtime = [ "pallet-recovery?/try-runtime", "pallet-referenda?/try-runtime", "pallet-remark?/try-runtime", - "pallet-revive?/try-runtime", "pallet-root-offences?/try-runtime", "pallet-root-testing?/try-runtime", "pallet-safe-mode?/try-runtime", @@ -538,7 +535,7 @@ with-tracing = [ "sp-tracing?/with-tracing", "sp-tracing?/with-tracing", ] -runtime-full = ["assets-common", "binary-merkle-tree", "bp-header-chain", "bp-messages", "bp-parachains", "bp-polkadot", "bp-polkadot-core", "bp-relayers", "bp-runtime", "bp-test-utils", "bp-xcm-bridge-hub", "bp-xcm-bridge-hub-router", "bridge-hub-common", "bridge-runtime-common", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-parachain-system-proc-macro", "cumulus-pallet-session-benchmarking", "cumulus-pallet-solo-to-para", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-ping", "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-primitives-proof-size-hostfunction", "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-benchmarking-pallet-pov", "frame-election-provider-solution-type", "frame-election-provider-support", "frame-executive", "frame-metadata-hash-extension", "frame-support", "frame-support-procedural", "frame-support-procedural-tools-derive", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", "pallet-alliance", "pallet-asset-conversion", "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-asset-rate", "pallet-asset-tx-payment", "pallet-assets", "pallet-assets-freezer", "pallet-atomic-swap", "pallet-aura", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-bags-list", "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", "pallet-bounties", "pallet-bridge-grandpa", "pallet-bridge-messages", "pallet-bridge-parachains", "pallet-bridge-relayers", "pallet-broker", "pallet-child-bounties", "pallet-collator-selection", "pallet-collective", "pallet-collective-content", "pallet-contracts", "pallet-contracts-proc-macro", "pallet-contracts-uapi", "pallet-conviction-voting", "pallet-core-fellowship", "pallet-delegated-staking", "pallet-democracy", "pallet-dev-mode", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", "pallet-fast-unstake", "pallet-glutton", "pallet-grandpa", "pallet-identity", "pallet-im-online", "pallet-indices", "pallet-insecure-randomness-collective-flip", "pallet-lottery", "pallet-membership", "pallet-message-queue", "pallet-migrations", "pallet-mixnet", "pallet-mmr", "pallet-multisig", "pallet-nft-fractionalization", "pallet-nfts", "pallet-nfts-runtime-api", "pallet-nis", "pallet-node-authorization", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-nomination-pools-runtime-api", "pallet-offences", "pallet-offences-benchmarking", "pallet-paged-list", "pallet-parameters", "pallet-preimage", "pallet-proxy", "pallet-ranked-collective", "pallet-recovery", "pallet-referenda", "pallet-remark", "pallet-revive", "pallet-revive-proc-macro", "pallet-revive-uapi", "pallet-root-offences", "pallet-root-testing", "pallet-safe-mode", "pallet-salary", "pallet-scheduler", "pallet-scored-pool", "pallet-session", "pallet-session-benchmarking", "pallet-skip-feeless-payment", "pallet-society", "pallet-staking", "pallet-staking-reward-curve", "pallet-staking-reward-fn", "pallet-staking-runtime-api", "pallet-state-trie-migration", "pallet-statement", "pallet-sudo", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-transaction-storage", "pallet-treasury", "pallet-tx-pause", "pallet-uniques", "pallet-utility", "pallet-verify-signature", "pallet-vesting", "pallet-whitelist", "pallet-xcm", "pallet-xcm-benchmarks", "pallet-xcm-bridge-hub", "pallet-xcm-bridge-hub-router", "parachains-common", "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-metrics", "polkadot-runtime-parachains", "polkadot-sdk-frame", "sc-chain-spec-derive", "sc-tracing-proc-macro", "slot-range-helper", "snowbridge-beacon-primitives", "snowbridge-core", "snowbridge-ethereum", "snowbridge-outbound-queue-merkle-tree", "snowbridge-outbound-queue-runtime-api", "snowbridge-pallet-ethereum-client", "snowbridge-pallet-ethereum-client-fixtures", "snowbridge-pallet-inbound-queue", "snowbridge-pallet-inbound-queue-fixtures", "snowbridge-pallet-outbound-queue", "snowbridge-pallet-system", "snowbridge-router-primitives", "snowbridge-runtime-common", "snowbridge-system-runtime-api", "sp-api", "sp-api-proc-macro", "sp-application-crypto", "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-aura", "sp-consensus-babe", "sp-consensus-beefy", "sp-consensus-grandpa", "sp-consensus-pow", "sp-consensus-slots", "sp-core", "sp-crypto-ec-utils", "sp-crypto-hashing", "sp-crypto-hashing-proc-macro", "sp-debug-derive", "sp-externalities", "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", "sp-keystore", "sp-metadata-ir", "sp-mixnet", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime", "sp-runtime-interface", "sp-runtime-interface-proc-macro", "sp-session", "sp-staking", "sp-state-machine", "sp-statement-store", "sp-std", "sp-storage", "sp-timestamp", "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", "sp-version", "sp-version-proc-macro", "sp-wasm-interface", "sp-weights", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", "substrate-bip39", "testnet-parachains-constants", "tracing-gum-proc-macro", "xcm-procedural", "xcm-runtime-apis"] +runtime-full = ["assets-common", "binary-merkle-tree", "bp-header-chain", "bp-messages", "bp-parachains", "bp-polkadot", "bp-polkadot-core", "bp-relayers", "bp-runtime", "bp-test-utils", "bp-xcm-bridge-hub", "bp-xcm-bridge-hub-router", "bridge-hub-common", "bridge-runtime-common", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-parachain-system-proc-macro", "cumulus-pallet-session-benchmarking", "cumulus-pallet-solo-to-para", "cumulus-pallet-weight-reclaim", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-ping", "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-primitives-proof-size-hostfunction", "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-benchmarking-pallet-pov", "frame-election-provider-solution-type", "frame-election-provider-support", "frame-executive", "frame-metadata-hash-extension", "frame-support", "frame-support-procedural", "frame-support-procedural-tools-derive", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", "pallet-alliance", "pallet-asset-conversion", "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-asset-rate", "pallet-asset-rewards", "pallet-asset-tx-payment", "pallet-assets", "pallet-assets-freezer", "pallet-assets-holder", "pallet-atomic-swap", "pallet-aura", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-bags-list", "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", "pallet-bounties", "pallet-bridge-grandpa", "pallet-bridge-messages", "pallet-bridge-parachains", "pallet-bridge-relayers", "pallet-broker", "pallet-child-bounties", "pallet-collator-selection", "pallet-collective", "pallet-collective-content", "pallet-contracts", "pallet-contracts-proc-macro", "pallet-contracts-uapi", "pallet-conviction-voting", "pallet-core-fellowship", "pallet-delegated-staking", "pallet-democracy", "pallet-dev-mode", "pallet-election-provider-multi-block", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", "pallet-fast-unstake", "pallet-glutton", "pallet-grandpa", "pallet-identity", "pallet-im-online", "pallet-indices", "pallet-insecure-randomness-collective-flip", "pallet-lottery", "pallet-membership", "pallet-message-queue", "pallet-migrations", "pallet-mixnet", "pallet-mmr", "pallet-multisig", "pallet-nft-fractionalization", "pallet-nfts", "pallet-nfts-runtime-api", "pallet-nis", "pallet-node-authorization", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-nomination-pools-runtime-api", "pallet-offences", "pallet-offences-benchmarking", "pallet-paged-list", "pallet-parameters", "pallet-preimage", "pallet-proxy", "pallet-ranked-collective", "pallet-recovery", "pallet-referenda", "pallet-remark", "pallet-root-offences", "pallet-root-testing", "pallet-safe-mode", "pallet-salary", "pallet-scheduler", "pallet-scored-pool", "pallet-session", "pallet-session-benchmarking", "pallet-skip-feeless-payment", "pallet-society", "pallet-staking", "pallet-staking-ah-client", "pallet-staking-rc-client", "pallet-staking-reward-curve", "pallet-staking-reward-fn", "pallet-staking-runtime-api", "pallet-state-trie-migration", "pallet-statement", "pallet-sudo", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-transaction-storage", "pallet-treasury", "pallet-tx-pause", "pallet-uniques", "pallet-utility", "pallet-verify-signature", "pallet-vesting", "pallet-whitelist", "pallet-xcm", "pallet-xcm-benchmarks", "pallet-xcm-bridge-hub", "pallet-xcm-bridge-hub-router", "parachains-common", "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-metrics", "polkadot-runtime-parachains", "polkadot-sdk-frame", "sc-chain-spec-derive", "sc-tracing-proc-macro", "slot-range-helper", "snowbridge-beacon-primitives", "snowbridge-core", "snowbridge-ethereum", "snowbridge-outbound-queue-merkle-tree", "snowbridge-outbound-queue-runtime-api", "snowbridge-pallet-ethereum-client", "snowbridge-pallet-ethereum-client-fixtures", "snowbridge-pallet-inbound-queue", "snowbridge-pallet-inbound-queue-fixtures", "snowbridge-pallet-outbound-queue", "snowbridge-pallet-system", "snowbridge-router-primitives", "snowbridge-runtime-common", "snowbridge-system-runtime-api", "sp-api", "sp-api-proc-macro", "sp-application-crypto", "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-aura", "sp-consensus-babe", "sp-consensus-beefy", "sp-consensus-grandpa", "sp-consensus-pow", "sp-consensus-slots", "sp-core", "sp-crypto-ec-utils", "sp-crypto-hashing", "sp-crypto-hashing-proc-macro", "sp-debug-derive", "sp-externalities", "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", "sp-keystore", "sp-metadata-ir", "sp-mixnet", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime", "sp-runtime-interface", "sp-runtime-interface-proc-macro", "sp-session", "sp-staking", "sp-state-machine", "sp-statement-store", "sp-std", "sp-storage", "sp-timestamp", "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", "sp-version", "sp-version-proc-macro", "sp-wasm-interface", "sp-weights", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", "substrate-bip39", "testnet-parachains-constants", "tracing-gum-proc-macro", "xcm-procedural", "xcm-runtime-apis"] runtime = [ "frame-benchmarking", "frame-benchmarking-pallet-pov", @@ -602,7 +599,7 @@ runtime = [ "sp-wasm-interface", "sp-weights", ] -node = ["asset-test-utils", "bridge-hub-test-utils", "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", "cumulus-client-consensus-proposer", "cumulus-client-consensus-relay-chain", "cumulus-client-network", "cumulus-client-parachain-inherent", "cumulus-client-pov-recovery", "cumulus-client-service", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-minimal-node", "cumulus-relay-chain-rpc-interface", "cumulus-test-relay-sproof-builder", "emulated-integration-tests-common", "fork-tree", "frame-benchmarking-cli", "frame-remote-externalities", "frame-support-procedural-tools", "generate-bags", "mmr-gadget", "mmr-rpc", "pallet-contracts-mock-network", "pallet-revive-eth-rpc", "pallet-transaction-payment-rpc", "parachains-runtimes-test-utils", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", "polkadot-availability-recovery", "polkadot-cli", "polkadot-collator-protocol", "polkadot-dispute-distribution", "polkadot-erasure-coding", "polkadot-gossip-support", "polkadot-network-bridge", "polkadot-node-collation-generation", "polkadot-node-core-approval-voting", "polkadot-node-core-approval-voting-parallel", "polkadot-node-core-av-store", "polkadot-node-core-backing", "polkadot-node-core-bitfield-signing", "polkadot-node-core-candidate-validation", "polkadot-node-core-chain-api", "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", "polkadot-node-core-parachains-inherent", "polkadot-node-core-prospective-parachains", "polkadot-node-core-provisioner", "polkadot-node-core-pvf", "polkadot-node-core-pvf-checker", "polkadot-node-core-pvf-common", "polkadot-node-core-pvf-execute-worker", "polkadot-node-core-pvf-prepare-worker", "polkadot-node-core-runtime-api", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-omni-node-lib", "polkadot-overseer", "polkadot-rpc", "polkadot-service", "polkadot-statement-distribution", "polkadot-statement-table", "sc-allocator", "sc-authority-discovery", "sc-basic-authorship", "sc-block-builder", "sc-chain-spec", "sc-cli", "sc-client-api", "sc-client-db", "sc-consensus", "sc-consensus-aura", "sc-consensus-babe", "sc-consensus-babe-rpc", "sc-consensus-beefy", "sc-consensus-beefy-rpc", "sc-consensus-epochs", "sc-consensus-grandpa", "sc-consensus-grandpa-rpc", "sc-consensus-manual-seal", "sc-consensus-pow", "sc-consensus-slots", "sc-executor", "sc-executor-common", "sc-executor-polkavm", "sc-executor-wasmtime", "sc-informant", "sc-keystore", "sc-mixnet", "sc-network", "sc-network-common", "sc-network-gossip", "sc-network-light", "sc-network-statement", "sc-network-sync", "sc-network-transactions", "sc-network-types", "sc-offchain", "sc-proposer-metrics", "sc-rpc", "sc-rpc-api", "sc-rpc-server", "sc-rpc-spec-v2", "sc-service", "sc-state-db", "sc-statement-store", "sc-storage-monitor", "sc-sync-state-rpc", "sc-sysinfo", "sc-telemetry", "sc-tracing", "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", "snowbridge-runtime-test-common", "sp-blockchain", "sp-consensus", "sp-core-hashing", "sp-core-hashing-proc-macro", "sp-database", "sp-maybe-compressed-blob", "sp-panic-handler", "sp-rpc", "staging-chain-spec-builder", "staging-node-inspect", "staging-tracking-allocator", "std", "subkey", "substrate-build-script-utils", "substrate-frame-rpc-support", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "substrate-rpc-client", "substrate-state-trie-migration-rpc", "substrate-wasm-builder", "tracing-gum", "xcm-emulator", "xcm-simulator"] +node = ["asset-test-utils", "bridge-hub-test-utils", "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", "cumulus-client-consensus-proposer", "cumulus-client-consensus-relay-chain", "cumulus-client-network", "cumulus-client-parachain-inherent", "cumulus-client-pov-recovery", "cumulus-client-service", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-minimal-node", "cumulus-relay-chain-rpc-interface", "cumulus-test-relay-sproof-builder", "emulated-integration-tests-common", "fork-tree", "frame-benchmarking-cli", "frame-remote-externalities", "frame-support-procedural-tools", "generate-bags", "mmr-gadget", "mmr-rpc", "pallet-contracts-mock-network", "pallet-transaction-payment-rpc", "parachains-runtimes-test-utils", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", "polkadot-availability-recovery", "polkadot-cli", "polkadot-collator-protocol", "polkadot-dispute-distribution", "polkadot-erasure-coding", "polkadot-gossip-support", "polkadot-network-bridge", "polkadot-node-collation-generation", "polkadot-node-core-approval-voting", "polkadot-node-core-approval-voting-parallel", "polkadot-node-core-av-store", "polkadot-node-core-backing", "polkadot-node-core-bitfield-signing", "polkadot-node-core-candidate-validation", "polkadot-node-core-chain-api", "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", "polkadot-node-core-parachains-inherent", "polkadot-node-core-prospective-parachains", "polkadot-node-core-provisioner", "polkadot-node-core-pvf", "polkadot-node-core-pvf-checker", "polkadot-node-core-pvf-common", "polkadot-node-core-pvf-execute-worker", "polkadot-node-core-pvf-prepare-worker", "polkadot-node-core-runtime-api", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-omni-node-lib", "polkadot-overseer", "polkadot-rpc", "polkadot-service", "polkadot-statement-distribution", "polkadot-statement-table", "sc-allocator", "sc-authority-discovery", "sc-basic-authorship", "sc-block-builder", "sc-chain-spec", "sc-cli", "sc-client-api", "sc-client-db", "sc-consensus", "sc-consensus-aura", "sc-consensus-babe", "sc-consensus-babe-rpc", "sc-consensus-beefy", "sc-consensus-beefy-rpc", "sc-consensus-epochs", "sc-consensus-grandpa", "sc-consensus-grandpa-rpc", "sc-consensus-manual-seal", "sc-consensus-pow", "sc-consensus-slots", "sc-executor", "sc-executor-common", "sc-executor-polkavm", "sc-executor-wasmtime", "sc-informant", "sc-keystore", "sc-mixnet", "sc-network", "sc-network-common", "sc-network-gossip", "sc-network-light", "sc-network-statement", "sc-network-sync", "sc-network-transactions", "sc-network-types", "sc-offchain", "sc-proposer-metrics", "sc-rpc", "sc-rpc-api", "sc-rpc-server", "sc-rpc-spec-v2", "sc-runtime-utilities", "sc-service", "sc-state-db", "sc-statement-store", "sc-storage-monitor", "sc-sync-state-rpc", "sc-sysinfo", "sc-telemetry", "sc-tracing", "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", "snowbridge-runtime-test-common", "sp-blockchain", "sp-consensus", "sp-core-hashing", "sp-core-hashing-proc-macro", "sp-database", "sp-maybe-compressed-blob", "sp-panic-handler", "sp-rpc", "staging-chain-spec-builder", "staging-node-inspect", "staging-tracking-allocator", "std", "subkey", "substrate-build-script-utils", "substrate-frame-rpc-support", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "substrate-rpc-client", "substrate-state-trie-migration-rpc", "substrate-wasm-builder", "tracing-gum", "xcm-emulator", "xcm-simulator"] tuples-96 = [ "frame-support-procedural?/tuples-96", "frame-support?/tuples-96", @@ -1292,24 +1289,6 @@ default-features = false optional = true version = "39.0.0" -[dependencies.pallet-revive] -path = "../substrate/frame/revive" -default-features = false -optional = true -version = "0.3.1" - -[dependencies.pallet-revive-proc-macro] -path = "../substrate/frame/revive/proc-macro" -default-features = false -optional = true -version = "0.1.2" - -[dependencies.pallet-revive-uapi] -path = "../substrate/frame/revive/uapi" -default-features = false -optional = true -version = "0.2.0" - [dependencies.pallet-root-offences] path = "../substrate/frame/root-offences" default-features = false @@ -2144,12 +2123,6 @@ default-features = false optional = true version = "15.0.0" -[dependencies.pallet-revive-eth-rpc] -path = "../substrate/frame/revive/rpc" -default-features = false -optional = true -version = "0.2.0" - [dependencies.pallet-transaction-payment-rpc] path = "../substrate/frame/transaction-payment/rpc" default-features = false diff --git a/umbrella/src/lib.rs b/umbrella/src/lib.rs index 2216864fad0f7..13e0a0716e9c3 100644 --- a/umbrella/src/lib.rs +++ b/umbrella/src/lib.rs @@ -576,30 +576,6 @@ pub use pallet_referenda; #[cfg(feature = "pallet-remark")] pub use pallet_remark; -/// FRAME pallet for PolkaVM contracts. -#[cfg(feature = "pallet-revive")] -pub use pallet_revive; - -/// An Ethereum JSON-RPC server for pallet-revive. -#[cfg(feature = "pallet-revive-eth-rpc")] -pub use pallet_revive_eth_rpc; - -/// Fixtures for testing and benchmarking. -#[cfg(feature = "pallet-revive-fixtures")] -pub use pallet_revive_fixtures; - -/// A mock network for testing pallet-revive. -#[cfg(feature = "pallet-revive-mock-network")] -pub use pallet_revive_mock_network; - -/// Procedural macros used in pallet_revive. -#[cfg(feature = "pallet-revive-proc-macro")] -pub use pallet_revive_proc_macro; - -/// Exposes all the host functions that a contract can import. -#[cfg(feature = "pallet-revive-uapi")] -pub use pallet_revive_uapi; - /// FRAME root offences pallet. #[cfg(feature = "pallet-root-offences")] pub use pallet_root_offences; From b73505cfa33234f7883ac8bc74cea413e21797f3 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Thu, 13 Mar 2025 12:12:27 +0200 Subject: [PATCH 02/25] annoyed by long lines Signed-off-by: Iulian Barbu --- .config/taplo.toml | 2 +- umbrella/Cargo.toml | 384 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 383 insertions(+), 3 deletions(-) diff --git a/.config/taplo.toml b/.config/taplo.toml index 7cbc1b075125a..5f419a65d7f12 100644 --- a/.config/taplo.toml +++ b/.config/taplo.toml @@ -14,7 +14,7 @@ exclude = [ [formatting] reorder_arrays = true inline_table_expand = false -array_auto_expand = false +array_auto_expand = true array_auto_collapse = false indent_string = " " # tab diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml index 4fc75fd175702..a147ca500bb35 100644 --- a/umbrella/Cargo.toml +++ b/umbrella/Cargo.toml @@ -535,7 +535,240 @@ with-tracing = [ "sp-tracing?/with-tracing", "sp-tracing?/with-tracing", ] -runtime-full = ["assets-common", "binary-merkle-tree", "bp-header-chain", "bp-messages", "bp-parachains", "bp-polkadot", "bp-polkadot-core", "bp-relayers", "bp-runtime", "bp-test-utils", "bp-xcm-bridge-hub", "bp-xcm-bridge-hub-router", "bridge-hub-common", "bridge-runtime-common", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-parachain-system-proc-macro", "cumulus-pallet-session-benchmarking", "cumulus-pallet-solo-to-para", "cumulus-pallet-weight-reclaim", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-ping", "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-primitives-proof-size-hostfunction", "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-benchmarking-pallet-pov", "frame-election-provider-solution-type", "frame-election-provider-support", "frame-executive", "frame-metadata-hash-extension", "frame-support", "frame-support-procedural", "frame-support-procedural-tools-derive", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", "pallet-alliance", "pallet-asset-conversion", "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-asset-rate", "pallet-asset-rewards", "pallet-asset-tx-payment", "pallet-assets", "pallet-assets-freezer", "pallet-assets-holder", "pallet-atomic-swap", "pallet-aura", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-bags-list", "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", "pallet-bounties", "pallet-bridge-grandpa", "pallet-bridge-messages", "pallet-bridge-parachains", "pallet-bridge-relayers", "pallet-broker", "pallet-child-bounties", "pallet-collator-selection", "pallet-collective", "pallet-collective-content", "pallet-contracts", "pallet-contracts-proc-macro", "pallet-contracts-uapi", "pallet-conviction-voting", "pallet-core-fellowship", "pallet-delegated-staking", "pallet-democracy", "pallet-dev-mode", "pallet-election-provider-multi-block", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", "pallet-fast-unstake", "pallet-glutton", "pallet-grandpa", "pallet-identity", "pallet-im-online", "pallet-indices", "pallet-insecure-randomness-collective-flip", "pallet-lottery", "pallet-membership", "pallet-message-queue", "pallet-migrations", "pallet-mixnet", "pallet-mmr", "pallet-multisig", "pallet-nft-fractionalization", "pallet-nfts", "pallet-nfts-runtime-api", "pallet-nis", "pallet-node-authorization", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-nomination-pools-runtime-api", "pallet-offences", "pallet-offences-benchmarking", "pallet-paged-list", "pallet-parameters", "pallet-preimage", "pallet-proxy", "pallet-ranked-collective", "pallet-recovery", "pallet-referenda", "pallet-remark", "pallet-root-offences", "pallet-root-testing", "pallet-safe-mode", "pallet-salary", "pallet-scheduler", "pallet-scored-pool", "pallet-session", "pallet-session-benchmarking", "pallet-skip-feeless-payment", "pallet-society", "pallet-staking", "pallet-staking-ah-client", "pallet-staking-rc-client", "pallet-staking-reward-curve", "pallet-staking-reward-fn", "pallet-staking-runtime-api", "pallet-state-trie-migration", "pallet-statement", "pallet-sudo", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-transaction-storage", "pallet-treasury", "pallet-tx-pause", "pallet-uniques", "pallet-utility", "pallet-verify-signature", "pallet-vesting", "pallet-whitelist", "pallet-xcm", "pallet-xcm-benchmarks", "pallet-xcm-bridge-hub", "pallet-xcm-bridge-hub-router", "parachains-common", "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-metrics", "polkadot-runtime-parachains", "polkadot-sdk-frame", "sc-chain-spec-derive", "sc-tracing-proc-macro", "slot-range-helper", "snowbridge-beacon-primitives", "snowbridge-core", "snowbridge-ethereum", "snowbridge-outbound-queue-merkle-tree", "snowbridge-outbound-queue-runtime-api", "snowbridge-pallet-ethereum-client", "snowbridge-pallet-ethereum-client-fixtures", "snowbridge-pallet-inbound-queue", "snowbridge-pallet-inbound-queue-fixtures", "snowbridge-pallet-outbound-queue", "snowbridge-pallet-system", "snowbridge-router-primitives", "snowbridge-runtime-common", "snowbridge-system-runtime-api", "sp-api", "sp-api-proc-macro", "sp-application-crypto", "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-aura", "sp-consensus-babe", "sp-consensus-beefy", "sp-consensus-grandpa", "sp-consensus-pow", "sp-consensus-slots", "sp-core", "sp-crypto-ec-utils", "sp-crypto-hashing", "sp-crypto-hashing-proc-macro", "sp-debug-derive", "sp-externalities", "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", "sp-keystore", "sp-metadata-ir", "sp-mixnet", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime", "sp-runtime-interface", "sp-runtime-interface-proc-macro", "sp-session", "sp-staking", "sp-state-machine", "sp-statement-store", "sp-std", "sp-storage", "sp-timestamp", "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", "sp-version", "sp-version-proc-macro", "sp-wasm-interface", "sp-weights", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", "substrate-bip39", "testnet-parachains-constants", "tracing-gum-proc-macro", "xcm-procedural", "xcm-runtime-apis"] +runtime-full = [ + "assets-common", + "binary-merkle-tree", + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot", + "bp-polkadot-core", + "bp-relayers", + "bp-runtime", + "bp-test-utils", + "bp-xcm-bridge-hub", + "bp-xcm-bridge-hub-router", + "bridge-hub-common", + "bridge-runtime-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-parachain-system-proc-macro", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-solo-to-para", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-ping", + "cumulus-primitives-aura", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", + "cumulus-primitives-storage-weight-reclaim", + "cumulus-primitives-timestamp", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-benchmarking-pallet-pov", + "frame-election-provider-solution-type", + "frame-election-provider-support", + "frame-executive", + "frame-metadata-hash-extension", + "frame-support", + "frame-support-procedural", + "frame-support-procedural-tools-derive", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "pallet-alliance", + "pallet-asset-conversion", + "pallet-asset-conversion-ops", + "pallet-asset-conversion-tx-payment", + "pallet-asset-rate", + "pallet-asset-rewards", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-assets-freezer", + "pallet-assets-holder", + "pallet-atomic-swap", + "pallet-aura", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bounties", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-broker", + "pallet-child-bounties", + "pallet-collator-selection", + "pallet-collective", + "pallet-collective-content", + "pallet-contracts", + "pallet-contracts-proc-macro", + "pallet-contracts-uapi", + "pallet-conviction-voting", + "pallet-core-fellowship", + "pallet-delegated-staking", + "pallet-democracy", + "pallet-dev-mode", + "pallet-election-provider-multi-block", + "pallet-election-provider-multi-phase", + "pallet-election-provider-support-benchmarking", + "pallet-elections-phragmen", + "pallet-fast-unstake", + "pallet-glutton", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-insecure-randomness-collective-flip", + "pallet-lottery", + "pallet-membership", + "pallet-message-queue", + "pallet-migrations", + "pallet-mixnet", + "pallet-mmr", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-nis", + "pallet-node-authorization", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-paged-list", + "pallet-parameters", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-remark", + "pallet-root-offences", + "pallet-root-testing", + "pallet-safe-mode", + "pallet-salary", + "pallet-scheduler", + "pallet-scored-pool", + "pallet-session", + "pallet-session-benchmarking", + "pallet-skip-feeless-payment", + "pallet-society", + "pallet-staking", + "pallet-staking-ah-client", + "pallet-staking-rc-client", + "pallet-staking-reward-curve", + "pallet-staking-reward-fn", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-statement", + "pallet-sudo", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-storage", + "pallet-treasury", + "pallet-tx-pause", + "pallet-uniques", + "pallet-utility", + "pallet-verify-signature", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "pallet-xcm-bridge-hub", + "pallet-xcm-bridge-hub-router", + "parachains-common", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-metrics", + "polkadot-runtime-parachains", + "polkadot-sdk-frame", + "sc-chain-spec-derive", + "sc-tracing-proc-macro", + "slot-range-helper", + "snowbridge-beacon-primitives", + "snowbridge-core", + "snowbridge-ethereum", + "snowbridge-outbound-queue-merkle-tree", + "snowbridge-outbound-queue-runtime-api", + "snowbridge-pallet-ethereum-client", + "snowbridge-pallet-ethereum-client-fixtures", + "snowbridge-pallet-inbound-queue", + "snowbridge-pallet-inbound-queue-fixtures", + "snowbridge-pallet-outbound-queue", + "snowbridge-pallet-system", + "snowbridge-router-primitives", + "snowbridge-runtime-common", + "snowbridge-system-runtime-api", + "sp-api", + "sp-api-proc-macro", + "sp-application-crypto", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-aura", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-consensus-grandpa", + "sp-consensus-pow", + "sp-consensus-slots", + "sp-core", + "sp-crypto-ec-utils", + "sp-crypto-hashing", + "sp-crypto-hashing-proc-macro", + "sp-debug-derive", + "sp-externalities", + "sp-genesis-builder", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-keystore", + "sp-metadata-ir", + "sp-mixnet", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-runtime", + "sp-runtime-interface", + "sp-runtime-interface-proc-macro", + "sp-session", + "sp-staking", + "sp-state-machine", + "sp-statement-store", + "sp-std", + "sp-storage", + "sp-timestamp", + "sp-tracing", + "sp-transaction-pool", + "sp-transaction-storage-proof", + "sp-trie", + "sp-version", + "sp-version-proc-macro", + "sp-wasm-interface", + "sp-weights", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-bip39", + "testnet-parachains-constants", + "tracing-gum-proc-macro", + "xcm-procedural", + "xcm-runtime-apis", +] runtime = [ "frame-benchmarking", "frame-benchmarking-pallet-pov", @@ -599,7 +832,154 @@ runtime = [ "sp-wasm-interface", "sp-weights", ] -node = ["asset-test-utils", "bridge-hub-test-utils", "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", "cumulus-client-consensus-proposer", "cumulus-client-consensus-relay-chain", "cumulus-client-network", "cumulus-client-parachain-inherent", "cumulus-client-pov-recovery", "cumulus-client-service", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-minimal-node", "cumulus-relay-chain-rpc-interface", "cumulus-test-relay-sproof-builder", "emulated-integration-tests-common", "fork-tree", "frame-benchmarking-cli", "frame-remote-externalities", "frame-support-procedural-tools", "generate-bags", "mmr-gadget", "mmr-rpc", "pallet-contracts-mock-network", "pallet-transaction-payment-rpc", "parachains-runtimes-test-utils", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", "polkadot-availability-recovery", "polkadot-cli", "polkadot-collator-protocol", "polkadot-dispute-distribution", "polkadot-erasure-coding", "polkadot-gossip-support", "polkadot-network-bridge", "polkadot-node-collation-generation", "polkadot-node-core-approval-voting", "polkadot-node-core-approval-voting-parallel", "polkadot-node-core-av-store", "polkadot-node-core-backing", "polkadot-node-core-bitfield-signing", "polkadot-node-core-candidate-validation", "polkadot-node-core-chain-api", "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", "polkadot-node-core-parachains-inherent", "polkadot-node-core-prospective-parachains", "polkadot-node-core-provisioner", "polkadot-node-core-pvf", "polkadot-node-core-pvf-checker", "polkadot-node-core-pvf-common", "polkadot-node-core-pvf-execute-worker", "polkadot-node-core-pvf-prepare-worker", "polkadot-node-core-runtime-api", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-omni-node-lib", "polkadot-overseer", "polkadot-rpc", "polkadot-service", "polkadot-statement-distribution", "polkadot-statement-table", "sc-allocator", "sc-authority-discovery", "sc-basic-authorship", "sc-block-builder", "sc-chain-spec", "sc-cli", "sc-client-api", "sc-client-db", "sc-consensus", "sc-consensus-aura", "sc-consensus-babe", "sc-consensus-babe-rpc", "sc-consensus-beefy", "sc-consensus-beefy-rpc", "sc-consensus-epochs", "sc-consensus-grandpa", "sc-consensus-grandpa-rpc", "sc-consensus-manual-seal", "sc-consensus-pow", "sc-consensus-slots", "sc-executor", "sc-executor-common", "sc-executor-polkavm", "sc-executor-wasmtime", "sc-informant", "sc-keystore", "sc-mixnet", "sc-network", "sc-network-common", "sc-network-gossip", "sc-network-light", "sc-network-statement", "sc-network-sync", "sc-network-transactions", "sc-network-types", "sc-offchain", "sc-proposer-metrics", "sc-rpc", "sc-rpc-api", "sc-rpc-server", "sc-rpc-spec-v2", "sc-runtime-utilities", "sc-service", "sc-state-db", "sc-statement-store", "sc-storage-monitor", "sc-sync-state-rpc", "sc-sysinfo", "sc-telemetry", "sc-tracing", "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", "snowbridge-runtime-test-common", "sp-blockchain", "sp-consensus", "sp-core-hashing", "sp-core-hashing-proc-macro", "sp-database", "sp-maybe-compressed-blob", "sp-panic-handler", "sp-rpc", "staging-chain-spec-builder", "staging-node-inspect", "staging-tracking-allocator", "std", "subkey", "substrate-build-script-utils", "substrate-frame-rpc-support", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "substrate-rpc-client", "substrate-state-trie-migration-rpc", "substrate-wasm-builder", "tracing-gum", "xcm-emulator", "xcm-simulator"] +node = [ + "asset-test-utils", + "bridge-hub-test-utils", + "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-client-consensus-relay-chain", + "cumulus-client-network", + "cumulus-client-parachain-inherent", + "cumulus-client-pov-recovery", + "cumulus-client-service", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "cumulus-relay-chain-rpc-interface", + "cumulus-test-relay-sproof-builder", + "emulated-integration-tests-common", + "fork-tree", + "frame-benchmarking-cli", + "frame-remote-externalities", + "frame-support-procedural-tools", + "generate-bags", + "mmr-gadget", + "mmr-rpc", + "pallet-contracts-mock-network", + "pallet-transaction-payment-rpc", + "parachains-runtimes-test-utils", + "polkadot-approval-distribution", + "polkadot-availability-bitfield-distribution", + "polkadot-availability-distribution", + "polkadot-availability-recovery", + "polkadot-cli", + "polkadot-collator-protocol", + "polkadot-dispute-distribution", + "polkadot-erasure-coding", + "polkadot-gossip-support", + "polkadot-network-bridge", + "polkadot-node-collation-generation", + "polkadot-node-core-approval-voting", + "polkadot-node-core-approval-voting-parallel", + "polkadot-node-core-av-store", + "polkadot-node-core-backing", + "polkadot-node-core-bitfield-signing", + "polkadot-node-core-candidate-validation", + "polkadot-node-core-chain-api", + "polkadot-node-core-chain-selection", + "polkadot-node-core-dispute-coordinator", + "polkadot-node-core-parachains-inherent", + "polkadot-node-core-prospective-parachains", + "polkadot-node-core-provisioner", + "polkadot-node-core-pvf", + "polkadot-node-core-pvf-checker", + "polkadot-node-core-pvf-common", + "polkadot-node-core-pvf-execute-worker", + "polkadot-node-core-pvf-prepare-worker", + "polkadot-node-core-runtime-api", + "polkadot-node-metrics", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-types", + "polkadot-node-subsystem-util", + "polkadot-omni-node-lib", + "polkadot-overseer", + "polkadot-rpc", + "polkadot-service", + "polkadot-statement-distribution", + "polkadot-statement-table", + "sc-allocator", + "sc-authority-discovery", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-babe-rpc", + "sc-consensus-beefy", + "sc-consensus-beefy-rpc", + "sc-consensus-epochs", + "sc-consensus-grandpa", + "sc-consensus-grandpa-rpc", + "sc-consensus-manual-seal", + "sc-consensus-pow", + "sc-consensus-slots", + "sc-executor", + "sc-executor-common", + "sc-executor-polkavm", + "sc-executor-wasmtime", + "sc-informant", + "sc-keystore", + "sc-mixnet", + "sc-network", + "sc-network-common", + "sc-network-gossip", + "sc-network-light", + "sc-network-statement", + "sc-network-sync", + "sc-network-transactions", + "sc-network-types", + "sc-offchain", + "sc-proposer-metrics", + "sc-rpc", + "sc-rpc-api", + "sc-rpc-server", + "sc-rpc-spec-v2", + "sc-runtime-utilities", + "sc-service", + "sc-state-db", + "sc-statement-store", + "sc-storage-monitor", + "sc-sync-state-rpc", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sc-utils", + "snowbridge-runtime-test-common", + "sp-blockchain", + "sp-consensus", + "sp-core-hashing", + "sp-core-hashing-proc-macro", + "sp-database", + "sp-maybe-compressed-blob", + "sp-panic-handler", + "sp-rpc", + "staging-chain-spec-builder", + "staging-node-inspect", + "staging-tracking-allocator", + "std", + "subkey", + "substrate-build-script-utils", + "substrate-frame-rpc-support", + "substrate-frame-rpc-system", + "substrate-prometheus-endpoint", + "substrate-rpc-client", + "substrate-state-trie-migration-rpc", + "substrate-wasm-builder", + "tracing-gum", + "xcm-emulator", + "xcm-simulator", +] tuples-96 = [ "frame-support-procedural?/tuples-96", "frame-support?/tuples-96", From 8a82c68755cd13d78e818d3a3e7f907a597dcd6d Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Thu, 13 Mar 2025 12:22:50 +0200 Subject: [PATCH 03/25] remove non-existing deps Signed-off-by: Iulian Barbu --- umbrella/Cargo.toml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml index a147ca500bb35..516dac4156f8e 100644 --- a/umbrella/Cargo.toml +++ b/umbrella/Cargo.toml @@ -556,7 +556,6 @@ runtime-full = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-pallet-session-benchmarking", "cumulus-pallet-solo-to-para", - "cumulus-pallet-weight-reclaim", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-ping", @@ -585,11 +584,9 @@ runtime-full = [ "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-asset-rate", - "pallet-asset-rewards", "pallet-asset-tx-payment", "pallet-assets", "pallet-assets-freezer", - "pallet-assets-holder", "pallet-atomic-swap", "pallet-aura", "pallet-authority-discovery", @@ -617,7 +614,6 @@ runtime-full = [ "pallet-delegated-staking", "pallet-democracy", "pallet-dev-mode", - "pallet-election-provider-multi-block", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", @@ -664,8 +660,6 @@ runtime-full = [ "pallet-skip-feeless-payment", "pallet-society", "pallet-staking", - "pallet-staking-ah-client", - "pallet-staking-rc-client", "pallet-staking-reward-curve", "pallet-staking-reward-fn", "pallet-staking-runtime-api", @@ -943,7 +937,6 @@ node = [ "sc-rpc-api", "sc-rpc-server", "sc-rpc-spec-v2", - "sc-runtime-utilities", "sc-service", "sc-state-db", "sc-statement-store", From 6533253d559ab063576af2feb62d9e479284c488 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Thu, 13 Mar 2025 13:33:50 +0200 Subject: [PATCH 04/25] set revive publish to false Signed-off-by: Iulian Barbu --- substrate/frame/revive/Cargo.toml | 1 + substrate/frame/revive/rpc/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml index 219fe17f6b99d..d53eaecec3181 100644 --- a/substrate/frame/revive/Cargo.toml +++ b/substrate/frame/revive/Cargo.toml @@ -9,6 +9,7 @@ repository.workspace = true description = "FRAME pallet for PolkaVM contracts." readme = "README.md" include = ["CHANGELOG.md", "README.md", "build.rs", "src/**/*"] +publish = false [lints] workspace = true diff --git a/substrate/frame/revive/rpc/Cargo.toml b/substrate/frame/revive/rpc/Cargo.toml index ad12827ac181e..79b203d342745 100644 --- a/substrate/frame/revive/rpc/Cargo.toml +++ b/substrate/frame/revive/rpc/Cargo.toml @@ -7,6 +7,7 @@ license = "Apache-2.0" homepage.workspace = true repository.workspace = true description = "An Ethereum JSON-RPC server for pallet-revive." +publish = false [package.metadata.polkadot-sdk] exclude-from-umbrella = true From 86d8a47b03dc03dc31031e85220a3cdac6bfa7f5 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Thu, 13 Mar 2025 16:44:34 +0200 Subject: [PATCH 05/25] remove pallet-revive usage from runtimes Signed-off-by: Iulian Barbu --- Cargo.lock | 2 - .../assets/asset-hub-westend/Cargo.toml | 4 - .../assets/asset-hub-westend/src/lib.rs | 181 +---------------- substrate/bin/node/runtime/src/lib.rs | 184 +----------------- substrate/bin/node/testing/Cargo.toml | 2 - 5 files changed, 6 insertions(+), 367 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index baf9ad8567264..29eccd046f0e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -982,7 +982,6 @@ dependencies = [ "pallet-nfts", "pallet-nfts-runtime-api", "pallet-proxy", - "pallet-revive", "pallet-session", "pallet-state-trie-migration", "pallet-timestamp", @@ -10454,7 +10453,6 @@ dependencies = [ "pallet-asset-conversion-tx-payment", "pallet-asset-tx-payment", "pallet-assets", - "pallet-revive", "pallet-skip-feeless-payment", "parity-scale-codec", "sc-block-builder", diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml index 1a0b35dd854d8..9e8859c907805 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml @@ -42,7 +42,6 @@ pallet-timestamp.workspace = true pallet-transaction-payment.workspace = true pallet-transaction-payment-rpc-runtime-api.workspace = true pallet-uniques.workspace = true -pallet-revive.workspace = true pallet-utility.workspace = true sp-api.workspace = true sp-block-builder.workspace = true @@ -122,7 +121,6 @@ runtime-benchmarks = [ "pallet-nft-fractionalization/runtime-benchmarks", "pallet-nfts/runtime-benchmarks", "pallet-proxy/runtime-benchmarks", - "pallet-revive/runtime-benchmarks", "pallet-state-trie-migration/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-transaction-payment/runtime-benchmarks", @@ -163,7 +161,6 @@ try-runtime = [ "pallet-nft-fractionalization/try-runtime", "pallet-nfts/try-runtime", "pallet-proxy/try-runtime", - "pallet-revive/try-runtime", "pallet-session/try-runtime", "pallet-state-trie-migration/try-runtime", "pallet-timestamp/try-runtime", @@ -216,7 +213,6 @@ std = [ "pallet-nfts-runtime-api/std", "pallet-nfts/std", "pallet-proxy/std", - "pallet-revive/std", "pallet-session/std", "pallet-state-trie-migration/std", "pallet-timestamp/std", diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs index 514187e12ceb6..7dedc43d5698f 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -61,7 +61,6 @@ use frame_system::{ }; use pallet_asset_conversion_tx_payment::SwapAssetAdapter; use pallet_nfts::{DestroyWitness, PalletFeatures}; -use pallet_revive::{evm::runtime::EthExtra, AddressMapper}; use pallet_xcm::EnsureXcm; use parachains_common::{ impls::DealWithFees, message_queue::*, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, @@ -553,8 +552,7 @@ impl InstanceFilter for ProxyType { RuntimeCall::Utility { .. } | RuntimeCall::Multisig { .. } | RuntimeCall::NftFractionalization { .. } | - RuntimeCall::Nfts { .. } | - RuntimeCall::Uniques { .. } + RuntimeCall::Nfts { .. } | RuntimeCall::Uniques { .. } ) }, ProxyType::AssetOwner => matches!( @@ -955,42 +953,6 @@ type EventRecord = frame_system::EventRecord< ::Hash, >; -impl pallet_revive::Config for Runtime { - type Time = Timestamp; - type Currency = Balances; - type RuntimeEvent = RuntimeEvent; - type RuntimeCall = RuntimeCall; - type CallFilter = Nothing; - type DepositPerItem = DepositPerItem; - type DepositPerByte = DepositPerByte; - type WeightPrice = pallet_transaction_payment::Pallet; - type WeightInfo = pallet_revive::weights::SubstrateWeight; - type ChainExtension = (); - type AddressMapper = pallet_revive::AccountId32Mapper; - type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>; - type PVFMemory = ConstU32<{ 512 * 1024 * 1024 }>; - type UnsafeUnstableInterface = ConstBool; - type UploadOrigin = EnsureSigned; - type InstantiateOrigin = EnsureSigned; - type RuntimeHoldReason = RuntimeHoldReason; - type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; - type Debug = (); - type Xcm = pallet_xcm::Pallet; - type ChainId = ConstU64<420_420_421>; - type NativeToEthRatio = ConstU32<1_000_000>; // 10^(18 - 12) Eth is 10^18, Native is 10^12. -} - -impl TryFrom for pallet_revive::Call { - type Error = (); - - fn try_from(value: RuntimeCall) -> Result { - match value { - RuntimeCall::Revive(call) => Ok(call), - _ => Err(()), - } - } -} - // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( pub enum Runtime @@ -1039,7 +1001,6 @@ construct_runtime!( AssetsFreezer: pallet_assets_freezer:: = 57, ForeignAssetsFreezer: pallet_assets_freezer:: = 58, PoolAssetsFreezer: pallet_assets_freezer:: = 59, - Revive: pallet_revive = 60, StateTrieMigration: pallet_state_trie_migration = 70, @@ -1071,33 +1032,9 @@ pub type TxExtension = ( frame_metadata_hash_extension::CheckMetadataHash, ); -/// Default extensions applied to Ethereum transactions. -#[derive(Clone, PartialEq, Eq, Debug)] -pub struct EthExtraImpl; - -impl EthExtra for EthExtraImpl { - type Config = Runtime; - type Extension = TxExtension; - - fn get_eth_extension(nonce: u32, tip: Balance) -> Self::Extension { - ( - frame_system::CheckNonZeroSender::::new(), - frame_system::CheckSpecVersion::::new(), - frame_system::CheckTxVersion::::new(), - frame_system::CheckGenesis::::new(), - frame_system::CheckMortality::from(generic::Era::Immortal), - frame_system::CheckNonce::::from(nonce), - frame_system::CheckWeight::::new(), - pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::::from(tip, None), - cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim::::new(), - frame_metadata_hash_extension::CheckMetadataHash::::new(false), - ) - } -} - /// Unchecked extrinsic type as expected by this runtime. pub type UncheckedExtrinsic = - pallet_revive::evm::runtime::UncheckedExtrinsic; + generic::UncheckedExtrinsic; /// Migrations to apply on runtime upgrade. pub type Migrations = ( @@ -1332,7 +1269,6 @@ mod benches { [cumulus_pallet_xcmp_queue, XcmpQueue] [pallet_xcm_bridge_hub_router, ToRococo] [pallet_asset_conversion_ops, AssetConversionMigration] - [pallet_revive, Revive] // XCM [pallet_xcm, PalletXcmExtrinsicsBenchmark::] // NOTE: Make sure you point to the individual modules below. @@ -2083,119 +2019,6 @@ impl_runtime_apis! { PolkadotXcm::is_trusted_teleporter(asset, location) } } - - impl pallet_revive::ReviveApi for Runtime - { - fn balance(address: H160) -> Balance { - use frame_support::traits::fungible::Inspect; - let account = ::AddressMapper::to_account_id(&address); - Balances::reducible_balance(&account, Expendable, Polite) - } - - fn nonce(address: H160) -> Nonce { - let account = ::AddressMapper::to_account_id(&address); - System::account_nonce(account) - } - fn eth_transact( - from: H160, - dest: Option, - value: Balance, - input: Vec, - gas_limit: Option, - storage_deposit_limit: Option, - ) -> pallet_revive::EthContractResult - { - use pallet_revive::AddressMapper; - let blockweights = ::BlockWeights::get(); - let origin = ::AddressMapper::to_account_id(&from); - - let encoded_size = |pallet_call| { - let call = RuntimeCall::Revive(pallet_call); - let uxt: UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic::new_bare(call).into(); - uxt.encoded_size() as u32 - }; - - Revive::bare_eth_transact( - origin, - dest, - value, - input, - gas_limit.unwrap_or(blockweights.max_block), - storage_deposit_limit.unwrap_or(u128::MAX), - encoded_size, - pallet_revive::DebugInfo::UnsafeDebug, - pallet_revive::CollectEvents::UnsafeCollect, - ) - } - - fn call( - origin: AccountId, - dest: H160, - value: Balance, - gas_limit: Option, - storage_deposit_limit: Option, - input_data: Vec, - ) -> pallet_revive::ContractResult { - let blockweights= ::BlockWeights::get(); - Revive::bare_call( - RuntimeOrigin::signed(origin), - dest, - value, - gas_limit.unwrap_or(blockweights.max_block), - storage_deposit_limit.unwrap_or(u128::MAX), - input_data, - pallet_revive::DebugInfo::UnsafeDebug, - pallet_revive::CollectEvents::UnsafeCollect, - ) - } - - fn instantiate( - origin: AccountId, - value: Balance, - gas_limit: Option, - storage_deposit_limit: Option, - code: pallet_revive::Code, - data: Vec, - salt: Option<[u8; 32]>, - ) -> pallet_revive::ContractResult - { - let blockweights= ::BlockWeights::get(); - Revive::bare_instantiate( - RuntimeOrigin::signed(origin), - value, - gas_limit.unwrap_or(blockweights.max_block), - storage_deposit_limit.unwrap_or(u128::MAX), - code, - data, - salt, - pallet_revive::DebugInfo::UnsafeDebug, - pallet_revive::CollectEvents::UnsafeCollect, - ) - } - - fn upload_code( - origin: AccountId, - code: Vec, - storage_deposit_limit: Option, - ) -> pallet_revive::CodeUploadResult - { - Revive::bare_upload_code( - RuntimeOrigin::signed(origin), - code, - storage_deposit_limit.unwrap_or(u128::MAX), - ) - } - - fn get_storage( - address: H160, - key: [u8; 32], - ) -> pallet_revive::GetStorageResult { - Revive::get_storage( - address, - key - ) - } - } } cumulus_pallet_parachain_system::register_validate_block! { diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs index 5a2ff3ceb7f6a..d4c1c3e1fd237 100644 --- a/substrate/bin/node/runtime/src/lib.rs +++ b/substrate/bin/node/runtime/src/lib.rs @@ -84,7 +84,6 @@ use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use pallet_nfts::PalletFeatures; use pallet_nis::WithMaximumOf; use pallet_nomination_pools::PoolId; -use pallet_revive::{evm::runtime::EthExtra, AddressMapper}; use pallet_session::historical as pallet_session_historical; // Can't use `FungibleAdapter` here until Treasury pallet migrates to fungibles // @@ -1442,31 +1441,6 @@ impl pallet_contracts::Config for Runtime { type Xcm = (); } -impl pallet_revive::Config for Runtime { - type Time = Timestamp; - type Currency = Balances; - type RuntimeEvent = RuntimeEvent; - type RuntimeCall = RuntimeCall; - type CallFilter = Nothing; - type DepositPerItem = DepositPerItem; - type DepositPerByte = DepositPerByte; - type WeightPrice = pallet_transaction_payment::Pallet; - type WeightInfo = pallet_revive::weights::SubstrateWeight; - type ChainExtension = (); - type AddressMapper = pallet_revive::AccountId32Mapper; - type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>; - type PVFMemory = ConstU32<{ 512 * 1024 * 1024 }>; - type UnsafeUnstableInterface = ConstBool; - type UploadOrigin = EnsureSigned; - type InstantiateOrigin = EnsureSigned; - type RuntimeHoldReason = RuntimeHoldReason; - type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; - type Debug = (); - type Xcm = (); - type ChainId = ConstU64<420_420_420>; - type NativeToEthRatio = ConstU32<1_000_000>; // 10^(18 - 12) Eth is 10^18, Native is 10^12. -} - impl pallet_sudo::Config for Runtime { type RuntimeEvent = RuntimeEvent; type RuntimeCall = RuntimeCall; @@ -1489,7 +1463,7 @@ where type Extension = TxExtension; fn create_transaction(call: RuntimeCall, extension: TxExtension) -> UncheckedExtrinsic { - generic::UncheckedExtrinsic::new_transaction(call, extension).into() + UncheckedExtrinsic::new_transaction(call, extension) } } @@ -1539,8 +1513,7 @@ where let signature = raw_payload.using_encoded(|payload| C::sign(payload, public))?; let address = Indices::unlookup(account); let (call, tx_ext, _) = raw_payload.deconstruct(); - let transaction = - generic::UncheckedExtrinsic::new_signed(call, address, signature, tx_ext).into(); + let transaction = UncheckedExtrinsic::new_signed(call, address, signature, tx_ext); Some(transaction) } } @@ -1550,7 +1523,7 @@ where RuntimeCall: From, { fn create_inherent(call: RuntimeCall) -> UncheckedExtrinsic { - generic::UncheckedExtrinsic::new_bare(call).into() + UncheckedExtrinsic::new_bare(call) } } @@ -2625,22 +2598,9 @@ mod runtime { pub type AssetConversionMigration = pallet_asset_conversion_ops::Pallet; #[runtime::pallet_index(80)] - pub type Revive = pallet_revive::Pallet; - - #[runtime::pallet_index(81)] pub type VerifySignature = pallet_verify_signature::Pallet; } -impl TryFrom for pallet_revive::Call { - type Error = (); - - fn try_from(value: RuntimeCall) -> Result { - match value { - RuntimeCall::Revive(call) => Ok(call), - _ => Err(()), - } - } -} /// The address format for describing accounts. pub type Address = sp_runtime::MultiAddress; /// Block header type as expected by this runtime. @@ -2671,32 +2631,9 @@ pub type TxExtension = ( frame_metadata_hash_extension::CheckMetadataHash, ); -#[derive(Clone, PartialEq, Eq, Debug)] -pub struct EthExtraImpl; - -impl EthExtra for EthExtraImpl { - type Config = Runtime; - type Extension = TxExtension; - - fn get_eth_extension(nonce: u32, tip: Balance) -> Self::Extension { - ( - frame_system::CheckNonZeroSender::::new(), - frame_system::CheckSpecVersion::::new(), - frame_system::CheckTxVersion::::new(), - frame_system::CheckGenesis::::new(), - frame_system::CheckEra::from(crate::generic::Era::Immortal), - frame_system::CheckNonce::::from(nonce), - frame_system::CheckWeight::::new(), - pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::::from(tip, None) - .into(), - frame_metadata_hash_extension::CheckMetadataHash::::new(false), - ) - } -} - /// Unchecked extrinsic type as expected by this runtime. pub type UncheckedExtrinsic = - pallet_revive::evm::runtime::UncheckedExtrinsic; + generic::UncheckedExtrinsic; /// Unchecked signature payload type as expected by this runtime. pub type UncheckedSignaturePayload = generic::UncheckedSignaturePayload; @@ -2832,7 +2769,6 @@ mod benches { [pallet_collective, Council] [pallet_conviction_voting, ConvictionVoting] [pallet_contracts, Contracts] - [pallet_revive, Revive] [pallet_core_fellowship, CoreFellowship] [pallet_example_tasks, TasksExample] [pallet_democracy, Democracy] @@ -3203,118 +3139,6 @@ impl_runtime_apis! { } } - impl pallet_revive::ReviveApi for Runtime - { - fn balance(address: H160) -> Balance { - use frame_support::traits::fungible::Inspect; - let account = ::AddressMapper::to_account_id(&address); - Balances::reducible_balance(&account, Preserve, Polite) - } - - fn nonce(address: H160) -> Nonce { - let account = ::AddressMapper::to_account_id(&address); - System::account_nonce(account) - } - - fn eth_transact( - from: H160, - dest: Option, - value: Balance, - input: Vec, - gas_limit: Option, - storage_deposit_limit: Option, - ) -> pallet_revive::EthContractResult - { - use pallet_revive::AddressMapper; - let blockweights: BlockWeights = ::BlockWeights::get(); - let origin = ::AddressMapper::to_account_id(&from); - - let encoded_size = |pallet_call| { - let call = RuntimeCall::Revive(pallet_call); - let uxt: UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic::new_bare(call).into(); - uxt.encoded_size() as u32 - }; - - Revive::bare_eth_transact( - origin, - dest, - value, - input, - gas_limit.unwrap_or(blockweights.max_block), - storage_deposit_limit.unwrap_or(u128::MAX), - encoded_size, - pallet_revive::DebugInfo::UnsafeDebug, - pallet_revive::CollectEvents::UnsafeCollect, - ) - } - - fn call( - origin: AccountId, - dest: H160, - value: Balance, - gas_limit: Option, - storage_deposit_limit: Option, - input_data: Vec, - ) -> pallet_revive::ContractResult { - Revive::bare_call( - RuntimeOrigin::signed(origin), - dest, - value, - gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block), - storage_deposit_limit.unwrap_or(u128::MAX), - input_data, - pallet_revive::DebugInfo::UnsafeDebug, - pallet_revive::CollectEvents::UnsafeCollect, - ) - } - - fn instantiate( - origin: AccountId, - value: Balance, - gas_limit: Option, - storage_deposit_limit: Option, - code: pallet_revive::Code, - data: Vec, - salt: Option<[u8; 32]>, - ) -> pallet_revive::ContractResult - { - Revive::bare_instantiate( - RuntimeOrigin::signed(origin), - value, - gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block), - storage_deposit_limit.unwrap_or(u128::MAX), - code, - data, - salt, - pallet_revive::DebugInfo::UnsafeDebug, - pallet_revive::CollectEvents::UnsafeCollect, - ) - } - - fn upload_code( - origin: AccountId, - code: Vec, - storage_deposit_limit: Option, - ) -> pallet_revive::CodeUploadResult - { - Revive::bare_upload_code( - RuntimeOrigin::signed(origin), - code, - storage_deposit_limit.unwrap_or(u128::MAX), - ) - } - - fn get_storage( - address: H160, - key: [u8; 32], - ) -> pallet_revive::GetStorageResult { - Revive::get_storage( - address, - key - ) - } - } - impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi< Block, Balance, diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml index 596d092b9b582..721d5e5353b97 100644 --- a/substrate/bin/node/testing/Cargo.toml +++ b/substrate/bin/node/testing/Cargo.toml @@ -33,8 +33,6 @@ pallet-asset-conversion.workspace = true pallet-asset-conversion.default-features = true pallet-assets.workspace = true pallet-assets.default-features = true -pallet-revive.workspace = true -pallet-revive.default-features = true pallet-asset-conversion-tx-payment.workspace = true pallet-asset-conversion-tx-payment.default-features = true pallet-asset-tx-payment.workspace = true From 01541e6aebc43e1e6cd455efc8409628ea155297 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Thu, 13 Mar 2025 17:34:47 +0200 Subject: [PATCH 06/25] make more tests happy Signed-off-by: Iulian Barbu --- .../runtimes/assets/asset-hub-westend/src/lib.rs | 14 +++----------- substrate/bin/node/runtime/src/lib.rs | 8 ++++---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs index 7dedc43d5698f..131fdaf8e6bf8 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -45,12 +45,9 @@ use frame_support::{ ord_parameter_types, parameter_types, traits::{ fungible, fungibles, - tokens::{ - imbalance::ResolveAssetTo, nonfungibles_v2::Inspect, Fortitude::Polite, - Preservation::Expendable, - }, + tokens::{imbalance::ResolveAssetTo, nonfungibles_v2::Inspect}, AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, ConstU8, Equals, - InstanceFilter, Nothing, TransformOrigin, + InstanceFilter, TransformOrigin, }, weights::{ConstantMultiplier, Weight, WeightToFee as _}, BoundedVec, PalletId, @@ -68,7 +65,7 @@ use parachains_common::{ NORMAL_DISPATCH_RATIO, }; use sp_api::impl_runtime_apis; -use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H160}; +use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_runtime::{ generic, impl_opaque_keys, traits::{AccountIdConversion, BlakeTwo256, Block as BlockT, Saturating, Verify}, @@ -948,11 +945,6 @@ parameter_types! { pub CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); } -type EventRecord = frame_system::EventRecord< - ::RuntimeEvent, - ::Hash, ->; - // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( pub enum Runtime diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs index d4c1c3e1fd237..51d82b731b3bd 100644 --- a/substrate/bin/node/runtime/src/lib.rs +++ b/substrate/bin/node/runtime/src/lib.rs @@ -54,10 +54,10 @@ use frame_support::{ }, tokens::{ imbalance::ResolveAssetTo, nonfungibles_v2::Inspect, pay::PayAssetFromAccount, - Fortitude::Polite, GetSalary, PayFromAccount, Preservation::Preserve, + GetSalary, PayFromAccount, }, - AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU16, ConstU32, ConstU64, Contains, - Currency, EitherOfDiverse, EnsureOriginWithArg, EqualPrivilegeOnly, Imbalance, InsideBoth, + AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU16, ConstU32, Contains, Currency, + EitherOfDiverse, EnsureOriginWithArg, EqualPrivilegeOnly, Imbalance, InsideBoth, InstanceFilter, KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, Nothing, OnUnbalanced, VariantCountOf, WithdrawReasons, }, @@ -99,7 +99,7 @@ use sp_consensus_beefy::{ mmr::MmrLeafVersion, }; use sp_consensus_grandpa::AuthorityId as GrandpaId; -use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H160}; +use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_inherents::{CheckInherentsResult, InherentData}; use sp_runtime::{ curve::PiecewiseLinear, From 50c80bd8ff54f3554f939fed4d043742da2ab56c Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Thu, 13 Mar 2025 17:44:41 +0200 Subject: [PATCH 07/25] fmt Signed-off-by: Iulian Barbu --- .../parachains/runtimes/assets/asset-hub-westend/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs index 131fdaf8e6bf8..ddd34fa39e934 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -549,7 +549,8 @@ impl InstanceFilter for ProxyType { RuntimeCall::Utility { .. } | RuntimeCall::Multisig { .. } | RuntimeCall::NftFractionalization { .. } | - RuntimeCall::Nfts { .. } | RuntimeCall::Uniques { .. } + RuntimeCall::Nfts { .. } | + RuntimeCall::Uniques { .. } ) }, ProxyType::AssetOwner => matches!( From f9ddecddb22d39ae742c4bd9320678de6839a6b8 Mon Sep 17 00:00:00 2001 From: Iulian Barbu <14218860+iulianbarbu@users.noreply.github.com> Date: Thu, 13 Mar 2025 18:29:02 +0200 Subject: [PATCH 08/25] Update .config/taplo.toml --- .config/taplo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/taplo.toml b/.config/taplo.toml index 5f419a65d7f12..1959b29fca6c4 100644 --- a/.config/taplo.toml +++ b/.config/taplo.toml @@ -14,7 +14,7 @@ exclude = [ [formatting] reorder_arrays = true inline_table_expand = false -array_auto_expand = true +array_auto_expand = true array_auto_collapse = false indent_string = " " # tab From b12666cf7fb70f0956d881c6931d8436293b507f Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Fri, 14 Mar 2025 15:05:34 +0200 Subject: [PATCH 09/25] fix kitchensink related tests Signed-off-by: Iulian Barbu --- substrate/bin/node/cli/tests/basic.rs | 8 ++++---- substrate/bin/node/cli/tests/fees.rs | 2 +- substrate/bin/node/cli/tests/submit_transaction.rs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/substrate/bin/node/cli/tests/basic.rs b/substrate/bin/node/cli/tests/basic.rs index 8f1475fce4f89..616d813f78e39 100644 --- a/substrate/bin/node/cli/tests/basic.rs +++ b/substrate/bin/node/cli/tests/basic.rs @@ -61,14 +61,14 @@ pub fn bloaty_code_unwrap() -> &'static [u8] { /// correct multiplier. fn transfer_fee(extrinsic: &UncheckedExtrinsic) -> Balance { let mut info = default_transfer_call().get_dispatch_info(); - info.extension_weight = extrinsic.0.extension_weight(); + info.extension_weight = extrinsic.extension_weight(); TransactionPayment::compute_fee(extrinsic.encode().len() as u32, &info, 0) } /// Default transfer fee, same as `transfer_fee`, but with a weight refund factored in. fn transfer_fee_with_refund(extrinsic: &UncheckedExtrinsic, weight_refund: Weight) -> Balance { let mut info = default_transfer_call().get_dispatch_info(); - info.extension_weight = extrinsic.0.extension_weight(); + info.extension_weight = extrinsic.extension_weight(); let post_info = (Some(info.total_weight().saturating_sub(weight_refund)), info.pays_fee).into(); TransactionPayment::compute_actual_fee(extrinsic.encode().len() as u32, &info, &post_info, 0) } @@ -324,7 +324,7 @@ fn full_native_block_import_works() { let mut alice_last_known_balance: Balance = Default::default(); let mut fees = t.execute_with(|| transfer_fee(&xt())); - let extension_weight = xt().0.extension_weight(); + let extension_weight = xt().extension_weight(); let weight_refund = Weight::zero(); let fees_after_refund = t.execute_with(|| transfer_fee_with_refund(&xt(), weight_refund)); @@ -427,7 +427,7 @@ fn full_native_block_import_works() { fees = t.execute_with(|| transfer_fee(&xt())); let pot = t.execute_with(|| Treasury::pot()); - let extension_weight = xt().0.extension_weight(); + let extension_weight = xt().extension_weight(); let weight_refund = Weight::zero(); let fees_after_refund = t.execute_with(|| transfer_fee_with_refund(&xt(), weight_refund)); diff --git a/substrate/bin/node/cli/tests/fees.rs b/substrate/bin/node/cli/tests/fees.rs index da9d2662408eb..59ade9b8547b8 100644 --- a/substrate/bin/node/cli/tests/fees.rs +++ b/substrate/bin/node/cli/tests/fees.rs @@ -175,7 +175,7 @@ fn transaction_fee_is_correct() { balance_alice -= length_fee; let mut info = default_transfer_call().get_dispatch_info(); - info.extension_weight = xt.0.extension_weight(); + info.extension_weight = xt.extension_weight(); let weight = info.total_weight(); let weight_fee = IdentityFee::::weight_to_fee(&weight); diff --git a/substrate/bin/node/cli/tests/submit_transaction.rs b/substrate/bin/node/cli/tests/submit_transaction.rs index 3672432ae3426..24d59306f655a 100644 --- a/substrate/bin/node/cli/tests/submit_transaction.rs +++ b/substrate/bin/node/cli/tests/submit_transaction.rs @@ -131,7 +131,7 @@ fn should_submit_signed_twice_from_the_same_account() { // now check that the transaction nonces are not equal let s = state.read(); fn nonce(tx: UncheckedExtrinsic) -> frame_system::CheckNonce { - let extra = tx.0.preamble.to_signed().unwrap().2; + let extra = tx.preamble.to_signed().unwrap().2; extra.5 } let nonce1 = nonce(UncheckedExtrinsic::decode(&mut &*s.transactions[0]).unwrap()); @@ -180,7 +180,7 @@ fn should_submit_signed_twice_from_all_accounts() { // now check that the transaction nonces are not equal let s = state.read(); fn nonce(tx: UncheckedExtrinsic) -> frame_system::CheckNonce { - let extra = tx.0.preamble.to_signed().unwrap().2; + let extra = tx.preamble.to_signed().unwrap().2; extra.5 } let nonce1 = nonce(UncheckedExtrinsic::decode(&mut &*s.transactions[0]).unwrap()); @@ -237,7 +237,7 @@ fn submitted_transaction_should_be_valid() { let source = TransactionSource::External; let extrinsic = UncheckedExtrinsic::decode(&mut &*tx0).unwrap(); // add balance to the account - let author = extrinsic.0.preamble.clone().to_signed().clone().unwrap().0; + let author = extrinsic.preamble.clone().to_signed().clone().unwrap().0; let address = Indices::lookup(author).unwrap(); let data = pallet_balances::AccountData { free: 5_000_000_000_000, ..Default::default() }; let account = frame_system::AccountInfo { providers: 1, data, ..Default::default() }; From ed8c0eb61dcc03ccd281921b7e8ec6c73e350943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= Date: Mon, 17 Mar 2025 16:42:30 +0100 Subject: [PATCH 10/25] Set remaining crates to publish = false --- substrate/frame/revive/fixtures/Cargo.toml | 3 +++ substrate/frame/revive/proc-macro/Cargo.toml | 1 + substrate/frame/revive/uapi/Cargo.toml | 1 + 3 files changed, 5 insertions(+) diff --git a/substrate/frame/revive/fixtures/Cargo.toml b/substrate/frame/revive/fixtures/Cargo.toml index 0a11ff6699e73..6f05b7c1efa7a 100644 --- a/substrate/frame/revive/fixtures/Cargo.toml +++ b/substrate/frame/revive/fixtures/Cargo.toml @@ -7,6 +7,9 @@ license.workspace = true description = "Fixtures for testing and benchmarking" publish = false +[package.metadata.polkadot-sdk] +exclude-from-umbrella = true + [lints] workspace = true diff --git a/substrate/frame/revive/proc-macro/Cargo.toml b/substrate/frame/revive/proc-macro/Cargo.toml index 0f6a2260ec5a3..a2aee257ca0d3 100644 --- a/substrate/frame/revive/proc-macro/Cargo.toml +++ b/substrate/frame/revive/proc-macro/Cargo.toml @@ -7,6 +7,7 @@ license = "Apache-2.0" homepage.workspace = true repository.workspace = true description = "Procedural macros used in pallet_revive" +publish = false [package.metadata.polkadot-sdk] exclude-from-umbrella = true diff --git a/substrate/frame/revive/uapi/Cargo.toml b/substrate/frame/revive/uapi/Cargo.toml index b40e6d2f68fbc..53c101dbed676 100644 --- a/substrate/frame/revive/uapi/Cargo.toml +++ b/substrate/frame/revive/uapi/Cargo.toml @@ -7,6 +7,7 @@ license = "Apache-2.0" homepage.workspace = true repository.workspace = true description = "Exposes all the host functions that a contract can import." +publish = false [package.metadata.polkadot-sdk] exclude-from-umbrella = true From 01eb3fc20434bc3e6de9b331170aee00b5fe7bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= Date: Mon, 17 Mar 2025 16:43:31 +0100 Subject: [PATCH 11/25] Rename to _Cargo.toml to suppress build errors --- substrate/frame/revive/fixtures/build.rs | 2 +- .../frame/revive/fixtures/build/{Cargo.toml => _Cargo.toml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename substrate/frame/revive/fixtures/build/{Cargo.toml => _Cargo.toml} (100%) diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs index a5b23e58c0d62..9a61c4d4d7966 100644 --- a/substrate/frame/revive/fixtures/build.rs +++ b/substrate/frame/revive/fixtures/build.rs @@ -82,7 +82,7 @@ fn create_cargo_toml<'a>( entries: impl Iterator, output_dir: &Path, ) -> Result<()> { - let mut cargo_toml: toml::Value = toml::from_str(include_str!("./build/Cargo.toml"))?; + let mut cargo_toml: toml::Value = toml::from_str(include_str!("./build/_Cargo.toml"))?; let mut set_dep = |name, path| -> Result<()> { cargo_toml["dependencies"][name]["path"] = toml::Value::String( fixtures_dir.join(path).canonicalize()?.to_str().unwrap().to_string(), diff --git a/substrate/frame/revive/fixtures/build/Cargo.toml b/substrate/frame/revive/fixtures/build/_Cargo.toml similarity index 100% rename from substrate/frame/revive/fixtures/build/Cargo.toml rename to substrate/frame/revive/fixtures/build/_Cargo.toml From 0ca6dfe3f64fa19f94db02b281235e3e116878db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= Date: Mon, 17 Mar 2025 16:46:36 +0100 Subject: [PATCH 12/25] Include fixtures when benchmarking --- substrate/frame/revive/Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml index d53eaecec3181..2a57c69e18e89 100644 --- a/substrate/frame/revive/Cargo.toml +++ b/substrate/frame/revive/Cargo.toml @@ -42,6 +42,7 @@ frame-benchmarking = { optional = true, workspace = true } frame-support.workspace = true frame-system.workspace = true pallet-balances = { optional = true, workspace = true } +pallet-revive-fixtures = { workspace = true, optional = true } pallet-revive-uapi.workspace = true pallet-revive-uapi.default-features = true pallet-revive-proc-macro.workspace = true @@ -64,7 +65,7 @@ subxt-signer = { workspace = true, optional = true, features = [ array-bytes = { workspace = true, default-features = true } assert_matches = { workspace = true } pretty_assertions = { workspace = true } -pallet-revive-fixtures = { default-features = true, path = "fixtures" } +pallet-revive-fixtures = { workspace = true, default-features = true } secp256k1 = { workspace = true, features = ["recovery"] } serde_json = { workspace = true } hex-literal = { workspace = true } @@ -93,6 +94,7 @@ std = [ "jsonrpsee", "log/std", "pallet-balances?/std", + "pallet-revive-fixtures?/std", "pallet-transaction-payment/std", "polkavm/std", "rlp/std", @@ -114,6 +116,7 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-balances/runtime-benchmarks", + "pallet-revive-fixtures", "pallet-transaction-payment/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", From a96596019b69f9b488fcf0bdbc6a187915d5f4e8 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Mon, 17 Mar 2025 22:25:27 +0200 Subject: [PATCH 13/25] fix build error Signed-off-by: Iulian Barbu --- polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs b/polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs index 98b60071b2fff..3f37f85b7e26b 100644 --- a/polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs +++ b/polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs @@ -18,7 +18,7 @@ use super::*; use crate::{account_and_location, new_executor, EnsureDelivery, XcmCallOf}; use alloc::{vec, vec::Vec}; use codec::Encode; -use frame_benchmarking::{benchmarks, BenchmarkError}; +use frame_benchmarking::{benchmarks, BenchmarkError, BenchmarkResult}; use frame_support::{traits::fungible::Inspect, BoundedVec}; use xcm::{ latest::{prelude::*, MaxDispatchErrorLen, MaybeErrorCode, Weight, MAX_ITEMS_IN_ASSETS}, From 076e431b3e2e61f1ceaa8c50a937d56cf6f746c5 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Tue, 18 Mar 2025 22:00:46 +0200 Subject: [PATCH 14/25] experiment with no forklift Signed-off-by: Iulian Barbu --- .github/workflows/tests-linux-stable.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests-linux-stable.yml b/.github/workflows/tests-linux-stable.yml index 24b96219738ac..44b2751ce594d 100644 --- a/.github/workflows/tests-linux-stable.yml +++ b/.github/workflows/tests-linux-stable.yml @@ -53,7 +53,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: script - run: forklift cargo nextest run --workspace --features runtime-benchmarks benchmark --locked --cargo-profile testnet --cargo-quiet + run: cargo nextest run --workspace --features runtime-benchmarks benchmark --locked --cargo-profile testnet --cargo-quiet test-linux-stable: needs: [preflight] @@ -85,7 +85,7 @@ jobs: run: | # Fixes "detected dubious ownership" error in the ci git config --global --add safe.directory '*' - forklift cargo nextest run \ + cargo nextest run \ --workspace \ --locked \ --release \ @@ -96,7 +96,7 @@ jobs: # run runtime-api tests with `enable-staging-api` feature on the 1st node - name: runtime-api tests if: ${{ matrix.partition == '1/3' }} - run: forklift cargo nextest run -p sp-api-test --features enable-staging-api --cargo-quiet + run: cargo nextest run -p sp-api-test --features enable-staging-api --cargo-quiet # some tests do not run with `try-runtime` feature enabled # https://github.com/paritytech/polkadot-sdk/pull/4251#discussion_r1624282143 @@ -124,7 +124,7 @@ jobs: uses: actions/checkout@v4 - name: script run: | - forklift cargo nextest run --workspace \ + cargo nextest run --workspace \ --locked \ --release \ --no-fail-fast \ From 7a017a45c078b779b1cc8301840aa05f6ee50303 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Tue, 18 Mar 2025 22:08:19 +0200 Subject: [PATCH 15/25] taplo fmt Signed-off-by: Iulian Barbu --- polkadot/node/overseer/Cargo.toml | 2 +- polkadot/roadmap/phase-1.toml | 6 +++++- templates/parachain/runtime/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml index 8065576ed8aaf..290d546620bff 100644 --- a/polkadot/node/overseer/Cargo.toml +++ b/polkadot/node/overseer/Cargo.toml @@ -50,5 +50,5 @@ tikv-jemalloc-ctl = "0.5.0" [features] default = ["futures_channel"] expand = ["orchestra/expand"] -futures_channel = [ "orchestra/futures_channel"] +futures_channel = ["orchestra/futures_channel"] jemalloc-allocator = ["dep:tikv-jemalloc-ctl"] diff --git a/polkadot/roadmap/phase-1.toml b/polkadot/roadmap/phase-1.toml index 9b9374d234bdc..a94d5e6f4e670 100644 --- a/polkadot/roadmap/phase-1.toml +++ b/polkadot/roadmap/phase-1.toml @@ -60,5 +60,9 @@ items = [ [[group]] name = "phase-1" label = "Phase 1: Availability and Validity" -requires = ["grandpa-voting-rule", "non-direct-ancestor", "runtime-availability-validity-slashing"] +requires = [ + "grandpa-voting-rule", + "non-direct-ancestor", + "runtime-availability-validity-slashing", +] items = [] diff --git a/templates/parachain/runtime/Cargo.toml b/templates/parachain/runtime/Cargo.toml index c0408b09fc579..eb469e8de0fe9 100644 --- a/templates/parachain/runtime/Cargo.toml +++ b/templates/parachain/runtime/Cargo.toml @@ -25,7 +25,7 @@ smallvec = { workspace = true, default-features = true } docify = { workspace = true } serde_json = { workspace = true, default-features = false, features = ["alloc"] } pallet-parachain-template.workspace = true -polkadot-sdk = { workspace = true, features = ["pallet-aura", "pallet-authorship", "pallet-balances", "pallet-message-queue", "pallet-session", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-xcm", "polkadot-parachain-primitives", "polkadot-runtime-common", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", "cumulus-pallet-aura-ext", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "pallet-collator-selection", "parachains-common", "staging-parachain-info", "runtime"], default-features = false } +polkadot-sdk = { workspace = true, features = ["cumulus-pallet-aura-ext", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "pallet-aura", "pallet-authorship", "pallet-balances", "pallet-collator-selection", "pallet-message-queue", "pallet-session", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-xcm", "parachains-common", "polkadot-parachain-primitives", "polkadot-runtime-common", "runtime", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor"], default-features = false } cumulus-pallet-parachain-system.workspace = true [features] From 2e4f7073d1d047c1f88e59cb46b64c27ce1a9561 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Tue, 18 Mar 2025 23:43:25 +0200 Subject: [PATCH 16/25] Revert "experiment with no forklift" This reverts commit 076e431b3e2e61f1ceaa8c50a937d56cf6f746c5. --- .github/workflows/tests-linux-stable.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests-linux-stable.yml b/.github/workflows/tests-linux-stable.yml index 44b2751ce594d..24b96219738ac 100644 --- a/.github/workflows/tests-linux-stable.yml +++ b/.github/workflows/tests-linux-stable.yml @@ -53,7 +53,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: script - run: cargo nextest run --workspace --features runtime-benchmarks benchmark --locked --cargo-profile testnet --cargo-quiet + run: forklift cargo nextest run --workspace --features runtime-benchmarks benchmark --locked --cargo-profile testnet --cargo-quiet test-linux-stable: needs: [preflight] @@ -85,7 +85,7 @@ jobs: run: | # Fixes "detected dubious ownership" error in the ci git config --global --add safe.directory '*' - cargo nextest run \ + forklift cargo nextest run \ --workspace \ --locked \ --release \ @@ -96,7 +96,7 @@ jobs: # run runtime-api tests with `enable-staging-api` feature on the 1st node - name: runtime-api tests if: ${{ matrix.partition == '1/3' }} - run: cargo nextest run -p sp-api-test --features enable-staging-api --cargo-quiet + run: forklift cargo nextest run -p sp-api-test --features enable-staging-api --cargo-quiet # some tests do not run with `try-runtime` feature enabled # https://github.com/paritytech/polkadot-sdk/pull/4251#discussion_r1624282143 @@ -124,7 +124,7 @@ jobs: uses: actions/checkout@v4 - name: script run: | - cargo nextest run --workspace \ + forklift cargo nextest run --workspace \ --locked \ --release \ --no-fail-fast \ From 8a4d47781b085e591bc91c1efb3acdfa18f87a9c Mon Sep 17 00:00:00 2001 From: Francisco Aguirre Date: Wed, 19 Mar 2025 18:16:05 -0300 Subject: [PATCH 17/25] fix: pass tests --- bridges/bin/runtime-common/Cargo.toml | 4 ++++ bridges/modules/beefy/Cargo.toml | 2 ++ bridges/modules/messages/Cargo.toml | 9 +++++++++ bridges/modules/relayers/Cargo.toml | 10 ++++++++++ bridges/modules/xcm-bridge-hub/Cargo.toml | 11 +++++++++++ .../snowbridge/pallets/inbound-queue/Cargo.toml | 2 ++ .../pallets/outbound-queue/Cargo.toml | 3 +++ bridges/snowbridge/pallets/system/Cargo.toml | 7 +++++++ bridges/snowbridge/primitives/core/Cargo.toml | 6 ++++++ cumulus/pallets/collator-selection/Cargo.toml | 3 +++ cumulus/pallets/parachain-system/Cargo.toml | 1 + cumulus/pallets/xcmp-queue/Cargo.toml | 4 ++++ .../pallets/collective-content/Cargo.toml | 1 + .../runtimes/assets/asset-hub-rococo/src/lib.rs | 3 ++- .../assets/asset-hub-westend/src/lib.rs | 3 ++- .../bridge-hubs/bridge-hub-rococo/Cargo.toml | 1 + .../bridge-hubs/bridge-hub-rococo/src/lib.rs | 3 ++- .../bridge-hubs/bridge-hub-westend/Cargo.toml | 1 + .../bridge-hubs/bridge-hub-westend/src/lib.rs | 3 ++- .../collectives/collectives-westend/src/lib.rs | 3 ++- .../coretime/coretime-rococo/src/lib.rs | 3 ++- .../coretime/coretime-westend/src/lib.rs | 3 ++- .../runtimes/people/people-rococo/src/lib.rs | 3 ++- .../runtimes/people/people-westend/src/lib.rs | 3 ++- cumulus/polkadot-parachain/Cargo.toml | 17 +++++++++++++++++ .../storage-weight-reclaim/Cargo.toml | 2 ++ cumulus/test/service/Cargo.toml | 1 + polkadot/node/metrics/Cargo.toml | 1 + polkadot/node/service/Cargo.toml | 1 + polkadot/runtime/common/Cargo.toml | 1 + polkadot/runtime/parachains/Cargo.toml | 1 + polkadot/runtime/rococo/Cargo.toml | 1 + polkadot/runtime/westend/Cargo.toml | 1 + polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml | 5 +++++ polkadot/xcm/pallet-xcm/Cargo.toml | 5 +++++ polkadot/xcm/xcm-builder/Cargo.toml | 8 ++++++++ polkadot/xcm/xcm-runtime-apis/Cargo.toml | 13 +++++++++++++ polkadot/xcm/xcm-runtime-apis/tests/mock.rs | 3 ++- substrate/bin/node/cli/Cargo.toml | 1 + substrate/client/db/Cargo.toml | 1 + substrate/frame/Cargo.toml | 1 + substrate/frame/alliance/Cargo.toml | 2 ++ substrate/frame/asset-conversion/Cargo.toml | 5 +++++ substrate/frame/asset-conversion/ops/Cargo.toml | 5 +++++ substrate/frame/asset-rate/Cargo.toml | 2 ++ substrate/frame/assets-freezer/Cargo.toml | 5 +++++ substrate/frame/assets/Cargo.toml | 2 ++ substrate/frame/atomic-swap/Cargo.toml | 1 + substrate/frame/aura/Cargo.toml | 1 + substrate/frame/babe/Cargo.toml | 8 ++++++++ substrate/frame/balances/Cargo.toml | 2 ++ substrate/frame/beefy-mmr/Cargo.toml | 1 + substrate/frame/beefy/Cargo.toml | 6 ++++++ substrate/frame/bounties/Cargo.toml | 2 ++ substrate/frame/child-bounties/Cargo.toml | 2 ++ substrate/frame/collective/Cargo.toml | 3 +++ substrate/frame/contracts/Cargo.toml | 11 +++++++++++ substrate/frame/conviction-voting/Cargo.toml | 4 ++++ substrate/frame/delegated-staking/Cargo.toml | 11 +++++++++++ substrate/frame/democracy/Cargo.toml | 6 ++++++ .../election-provider-multi-phase/Cargo.toml | 2 ++ .../test-staking-e2e/Cargo.toml | 11 +++++++++++ substrate/frame/elections-phragmen/Cargo.toml | 2 ++ .../authorization-tx-extension/Cargo.toml | 4 ++++ substrate/frame/examples/basic/Cargo.toml | 1 + substrate/frame/examples/dev-mode/Cargo.toml | 1 + substrate/frame/examples/kitchensink/Cargo.toml | 1 + substrate/frame/examples/split/Cargo.toml | 1 + substrate/frame/executive/Cargo.toml | 2 ++ substrate/frame/fast-unstake/Cargo.toml | 7 +++++++ substrate/frame/glutton/Cargo.toml | 2 ++ substrate/frame/grandpa/Cargo.toml | 10 ++++++++++ substrate/frame/identity/Cargo.toml | 2 ++ substrate/frame/im-online/Cargo.toml | 1 + substrate/frame/indices/Cargo.toml | 2 ++ substrate/frame/lottery/Cargo.toml | 3 +++ substrate/frame/migrations/Cargo.toml | 1 + substrate/frame/multisig/Cargo.toml | 2 ++ .../frame/nft-fractionalization/Cargo.toml | 2 ++ substrate/frame/nfts/Cargo.toml | 2 ++ substrate/frame/nis/Cargo.toml | 2 ++ .../nomination-pools/benchmarking/Cargo.toml | 3 +++ .../frame/offences/benchmarking/Cargo.toml | 1 + substrate/frame/parameters/Cargo.toml | 4 ++++ substrate/frame/preimage/Cargo.toml | 2 ++ substrate/frame/proxy/Cargo.toml | 4 ++++ substrate/frame/recovery/Cargo.toml | 2 ++ substrate/frame/referenda/Cargo.toml | 6 ++++++ substrate/frame/revive/Cargo.toml | 12 ++++++++++++ substrate/frame/revive/mock-network/Cargo.toml | 1 + substrate/frame/root-offences/Cargo.toml | 7 +++++++ substrate/frame/scheduler/Cargo.toml | 3 +++ substrate/frame/scored-pool/Cargo.toml | 1 + substrate/frame/session/benchmarking/Cargo.toml | 3 +++ substrate/frame/society/Cargo.toml | 3 +++ substrate/frame/staking/Cargo.toml | 6 ++++++ substrate/frame/state-trie-migration/Cargo.toml | 2 ++ substrate/frame/statement/Cargo.toml | 1 + substrate/frame/support/Cargo.toml | 3 +++ substrate/frame/support/procedural/Cargo.toml | 8 ++++++++ substrate/frame/tips/Cargo.toml | 2 ++ substrate/frame/transaction-payment/Cargo.toml | 2 ++ .../asset-conversion-tx-payment/Cargo.toml | 7 +++++++ .../asset-tx-payment/Cargo.toml | 6 ++++++ substrate/frame/transaction-storage/Cargo.toml | 1 + substrate/frame/treasury/Cargo.toml | 2 ++ substrate/frame/uniques/Cargo.toml | 2 ++ substrate/frame/utility/Cargo.toml | 7 +++++++ substrate/frame/verify-signature/Cargo.toml | 7 +++++++ substrate/frame/vesting/Cargo.toml | 3 +++ substrate/frame/whitelist/Cargo.toml | 4 ++++ substrate/test-utils/runtime/Cargo.toml | 1 + .../utils/frame/benchmarking-cli/Cargo.toml | 1 + templates/solochain/pallets/template/Cargo.toml | 2 ++ 114 files changed, 404 insertions(+), 10 deletions(-) diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml index 126fa051bceb9..57d5bcb85d70f 100644 --- a/bridges/bin/runtime-common/Cargo.toml +++ b/bridges/bin/runtime-common/Cargo.toml @@ -70,6 +70,9 @@ std = [ "sp-weights/std", "tuplex/std", "xcm/std", + "bp-test-utils/std", + "pallet-balances/std", + "sp-core/std" ] runtime-benchmarks = [ "bp-runtime/test-helpers", @@ -84,6 +87,7 @@ runtime-benchmarks = [ "pallet-utility/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-trie", + "pallet-balances/runtime-benchmarks" ] integrity-test = ["static_assertions"] test-helpers = ["bp-runtime/test-helpers", "sp-trie"] diff --git a/bridges/modules/beefy/Cargo.toml b/bridges/modules/beefy/Cargo.toml index f40d939ac6930..55e6c1bb3d63c 100644 --- a/bridges/modules/beefy/Cargo.toml +++ b/bridges/modules/beefy/Cargo.toml @@ -52,4 +52,6 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-beefy-mmr/try-runtime", + "pallet-mmr/try-runtime" ] diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml index 3b1f91c3de6c2..57e31e734c759 100644 --- a/bridges/modules/messages/Cargo.toml +++ b/bridges/modules/messages/Cargo.toml @@ -47,6 +47,11 @@ std = [ "sp-runtime/std", "sp-std/std", "sp-trie/std", + "pallet-bridge-grandpa/std", + "bp-test-utils/std", + "pallet-balances/std", + "sp-core/std", + "sp-io/std" ] runtime-benchmarks = [ "bp-runtime/test-helpers", @@ -54,10 +59,14 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-bridge-grandpa/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-bridge-grandpa/try-runtime", + "pallet-balances/try-runtime" ] test-helpers = ["bp-runtime/test-helpers", "sp-trie"] diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml index 4fd1620c957bf..cbcc424b9f260 100644 --- a/bridges/modules/relayers/Cargo.toml +++ b/bridges/modules/relayers/Cargo.toml @@ -60,6 +60,12 @@ std = [ "sp-arithmetic/std", "sp-runtime/std", "sp-std/std", + "bp-parachains/std", + "bp-polkadot-core/std", + "bp-test-utils/std", + "pallet-utility/std", + "sp-core/std", + "sp-io/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", @@ -70,6 +76,8 @@ runtime-benchmarks = [ "pallet-bridge-parachains/runtime-benchmarks", "pallet-transaction-payment/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-utility/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", @@ -79,5 +87,7 @@ try-runtime = [ "pallet-bridge-parachains/try-runtime", "pallet-transaction-payment/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "pallet-utility/try-runtime" ] integrity-test = [] diff --git a/bridges/modules/xcm-bridge-hub/Cargo.toml b/bridges/modules/xcm-bridge-hub/Cargo.toml index 0189b0f3513c9..af15bb9c17cc8 100644 --- a/bridges/modules/xcm-bridge-hub/Cargo.toml +++ b/bridges/modules/xcm-bridge-hub/Cargo.toml @@ -54,6 +54,12 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", + "pallet-xcm-bridge-hub-router/std", + "bp-header-chain/std", + "bp-xcm-bridge-hub-router/std", + "polkadot-parachain-primitives/std", + "pallet-balances/std", + "sp-io/std" ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", @@ -62,10 +68,15 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", + "pallet-xcm-bridge-hub-router/runtime-benchmarks", + "polkadot-parachain-primitives/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-bridge-messages/try-runtime", "sp-runtime/try-runtime", + "pallet-xcm-bridge-hub-router/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/bridges/snowbridge/pallets/inbound-queue/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml index 363620ff90a41..3f9a79b9e93e7 100644 --- a/bridges/snowbridge/pallets/inbound-queue/Cargo.toml +++ b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml @@ -79,10 +79,12 @@ runtime-benchmarks = [ "snowbridge-router-primitives/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-executor/runtime-benchmarks", + "snowbridge-pallet-ethereum-client/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-balances/try-runtime", "sp-runtime/try-runtime", + "snowbridge-pallet-ethereum-client/try-runtime" ] diff --git a/bridges/snowbridge/pallets/outbound-queue/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml index 1af0f2e8a5cf5..a14cbfa8a595a 100644 --- a/bridges/snowbridge/pallets/outbound-queue/Cargo.toml +++ b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml @@ -53,6 +53,7 @@ std = [ "sp-io/std", "sp-runtime/std", "sp-std/std", + "pallet-message-queue/std" ] runtime-benchmarks = [ "bridge-hub-common/runtime-benchmarks", @@ -62,9 +63,11 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-message-queue/try-runtime" ] diff --git a/bridges/snowbridge/pallets/system/Cargo.toml b/bridges/snowbridge/pallets/system/Cargo.toml index 3f820aae4044b..1dee989963714 100644 --- a/bridges/snowbridge/pallets/system/Cargo.toml +++ b/bridges/snowbridge/pallets/system/Cargo.toml @@ -64,9 +64,16 @@ runtime-benchmarks = [ "snowbridge-core/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-executor/runtime-benchmarks", + "snowbridge-pallet-outbound-queue/runtime-benchmarks", + "polkadot-primitives/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "snowbridge-pallet-outbound-queue/try-runtime", + "pallet-balances/try-runtime", + "pallet-message-queue/try-runtime" ] diff --git a/bridges/snowbridge/primitives/core/Cargo.toml b/bridges/snowbridge/primitives/core/Cargo.toml index b347d9fdf01e7..9160285f24ed9 100644 --- a/bridges/snowbridge/primitives/core/Cargo.toml +++ b/bridges/snowbridge/primitives/core/Cargo.toml @@ -55,4 +55,10 @@ std = [ ] serde = ["dep:serde", "scale-info/serde"] runtime-benchmarks = [ + "polkadot-parachain-primitives/runtime-benchmarks", + "xcm-builder/runtime-benchmarks", + "xcm-executor/runtime-benchmarks", + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", + "sp-runtime/runtime-benchmarks" ] diff --git a/cumulus/pallets/collator-selection/Cargo.toml b/cumulus/pallets/collator-selection/Cargo.toml index d86c3c1231945..c3eb2bf4274e0 100644 --- a/cumulus/pallets/collator-selection/Cargo.toml +++ b/cumulus/pallets/collator-selection/Cargo.toml @@ -47,6 +47,7 @@ runtime-benchmarks = [ "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] std = [ "codec/std", @@ -70,4 +71,6 @@ try-runtime = [ "pallet-balances/try-runtime", "pallet-session/try-runtime", "sp-runtime/try-runtime", + "pallet-aura/try-runtime", + "pallet-timestamp/try-runtime" ] diff --git a/cumulus/pallets/parachain-system/Cargo.toml b/cumulus/pallets/parachain-system/Cargo.toml index 4fb4317620759..37479dbbfca86 100644 --- a/cumulus/pallets/parachain-system/Cargo.toml +++ b/cumulus/pallets/parachain-system/Cargo.toml @@ -103,6 +103,7 @@ runtime-benchmarks = [ "polkadot-runtime-parachains/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", + "cumulus-test-client/runtime-benchmarks" ] try-runtime = [ diff --git a/cumulus/pallets/xcmp-queue/Cargo.toml b/cumulus/pallets/xcmp-queue/Cargo.toml index 643cb9d887050..5a3d2f9570d33 100644 --- a/cumulus/pallets/xcmp-queue/Cargo.toml +++ b/cumulus/pallets/xcmp-queue/Cargo.toml @@ -73,6 +73,8 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", + "cumulus-pallet-parachain-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", @@ -81,5 +83,7 @@ try-runtime = [ "polkadot-runtime-common/try-runtime", "polkadot-runtime-parachains/try-runtime", "sp-runtime/try-runtime", + "cumulus-pallet-parachain-system/try-runtime", + "pallet-balances/try-runtime" ] bridging = ["bp-xcm-bridge-hub-router"] diff --git a/cumulus/parachains/pallets/collective-content/Cargo.toml b/cumulus/parachains/pallets/collective-content/Cargo.toml index c74806e57daa4..2bd369494cacf 100644 --- a/cumulus/parachains/pallets/collective-content/Cargo.toml +++ b/cumulus/parachains/pallets/collective-content/Cargo.toml @@ -44,4 +44,5 @@ std = [ "scale-info/std", "sp-core/std", "sp-runtime/std", + "sp-io/std" ] diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs index 6835267e93680..9f50c61d69555 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs @@ -1429,7 +1429,8 @@ impl_runtime_apis! { fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { let native_asset = xcm_config::TokenLocation::get(); let fee_in_native = WeightToFee::weight_to_fee(&weight); - match asset.try_as::() { + let latest_asset_id: Result = asset.clone().try_into(); + match latest_asset_id { Ok(asset_id) if asset_id.0 == native_asset => { // for native token Ok(fee_in_native) diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs index ddd34fa39e934..b545bcab43cf4 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -1474,7 +1474,8 @@ impl_runtime_apis! { fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { let native_asset = xcm_config::WestendLocation::get(); let fee_in_native = WeightToFee::weight_to_fee(&weight); - match asset.try_as::() { + let latest_asset_id: Result = asset.clone().try_into(); + match latest_asset_id { Ok(asset_id) if asset_id.0 == native_asset => { // for native asset Ok(fee_in_native) diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml index 4cb65fe7c65a2..344a5c725610c 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml @@ -249,6 +249,7 @@ runtime-benchmarks = [ "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", "xcm-runtime-apis/runtime-benchmarks", + "snowbridge-runtime-test-common/runtime-benchmarks" ] try-runtime = [ diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index 961ecf1c6edae..7354ede034bfd 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -846,7 +846,8 @@ impl_runtime_apis! { } fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { - match asset.try_as::() { + let latest_asset_id: Result = asset.clone().try_into(); + match latest_asset_id { Ok(asset_id) if asset_id.0 == xcm_config::TokenLocation::get() => { // for native token Ok(WeightToFee::weight_to_fee(&weight)) diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml index dd5132903a09b..4faebc49e1933 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml @@ -248,6 +248,7 @@ runtime-benchmarks = [ "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", "xcm-runtime-apis/runtime-benchmarks", + "snowbridge-runtime-test-common/runtime-benchmarks" ] try-runtime = [ diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs index 90cf2e85aa40e..10f6be2e029c5 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs @@ -778,7 +778,8 @@ impl_runtime_apis! { } fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { - match asset.try_as::() { + let latest_asset_id: Result = asset.clone().try_into(); + match latest_asset_id { Ok(asset_id) if asset_id.0 == xcm_config::WestendLocation::get() => { // for native token Ok(WeightToFee::weight_to_fee(&weight)) diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs index f1763445d470c..9db22672352df 100644 --- a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs @@ -961,7 +961,8 @@ impl_runtime_apis! { } fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { - match asset.try_as::() { + let latest_asset_id: Result = asset.clone().try_into(); + match latest_asset_id { Ok(asset_id) if asset_id.0 == xcm_config::WndLocation::get() => { // for native token Ok(WeightToFee::weight_to_fee(&weight)) diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs index d9e73d0694ad1..33cebeb2ae5a4 100644 --- a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs @@ -813,7 +813,8 @@ impl_runtime_apis! { } fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { - match asset.try_as::() { + let latest_asset_id: Result = asset.clone().try_into(); + match latest_asset_id { Ok(asset_id) if asset_id.0 == xcm_config::RocRelayLocation::get() => { // for native token Ok(WeightToFee::weight_to_fee(&weight)) diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs index 47dd9ba5627b9..15f972ad09fe7 100644 --- a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs @@ -805,7 +805,8 @@ impl_runtime_apis! { } fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { - match asset.try_as::() { + let latest_asset_id: Result = asset.clone().try_into(); + match latest_asset_id { Ok(asset_id) if asset_id.0 == xcm_config::TokenRelayLocation::get() => { // for native token Ok(WeightToFee::weight_to_fee(&weight)) diff --git a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs index 7358402a9f781..c2154732613c3 100644 --- a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs @@ -781,7 +781,8 @@ impl_runtime_apis! { } fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { - match asset.try_as::() { + let latest_asset_id: Result = asset.clone().try_into(); + match latest_asset_id { Ok(asset_id) if asset_id.0 == xcm_config::RelayLocation::get() => { // for native token Ok(WeightToFee::weight_to_fee(&weight)) diff --git a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs index 7e1aceb8bcc07..26c88d02f991d 100644 --- a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs @@ -779,7 +779,8 @@ impl_runtime_apis! { } fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { - match asset.try_as::() { + let latest_asset_id: Result = asset.clone().try_into(); + match latest_asset_id { Ok(asset_id) if asset_id.0 == xcm_config::RelayLocation::get() => { // for native token Ok(WeightToFee::weight_to_fee(&weight)) diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml index 3992a48e3ea41..4acc9c072d813 100644 --- a/cumulus/polkadot-parachain/Cargo.toml +++ b/cumulus/polkadot-parachain/Cargo.toml @@ -64,6 +64,23 @@ substrate-build-script-utils.default-features = true [features] default = [] runtime-benchmarks = [ + "parachains-common/runtime-benchmarks", + "asset-hub-rococo-runtime/runtime-benchmarks", + "asset-hub-westend-runtime/runtime-benchmarks", + "bridge-hub-rococo-runtime/runtime-benchmarks", + "bridge-hub-westend-runtime/runtime-benchmarks", + "collectives-westend-runtime/runtime-benchmarks", + "contracts-rococo-runtime/runtime-benchmarks", + "coretime-rococo-runtime/runtime-benchmarks", + "coretime-westend-runtime/runtime-benchmarks", + "glutton-westend-runtime/runtime-benchmarks", + "people-rococo-runtime/runtime-benchmarks", + "people-westend-runtime/runtime-benchmarks", + "penpal-runtime/runtime-benchmarks", + "rococo-parachain-runtime/runtime-benchmarks", + "polkadot-omni-node-lib/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", + "sc-service/runtime-benchmarks" ] try-runtime = [ "polkadot-omni-node-lib/try-runtime", diff --git a/cumulus/primitives/storage-weight-reclaim/Cargo.toml b/cumulus/primitives/storage-weight-reclaim/Cargo.toml index 5ed54bfbb23df..2a662effc4eb3 100644 --- a/cumulus/primitives/storage-weight-reclaim/Cargo.toml +++ b/cumulus/primitives/storage-weight-reclaim/Cargo.toml @@ -38,4 +38,6 @@ std = [ "log/std", "scale-info/std", "sp-runtime/std", + "sp-io/std", + "sp-trie/std" ] diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml index 5a10b99a57029..1e6cfd56b6860 100644 --- a/cumulus/test/service/Cargo.toml +++ b/cumulus/test/service/Cargo.toml @@ -165,6 +165,7 @@ runtime-benchmarks = [ "polkadot-test-service/runtime-benchmarks", "sc-service/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "cumulus-test-client/runtime-benchmarks" ] [[bench]] diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml index b9c7f986e0080..5cb181d545826 100644 --- a/polkadot/node/metrics/Cargo.toml +++ b/polkadot/node/metrics/Cargo.toml @@ -49,4 +49,5 @@ runtime-metrics = [] runtime-benchmarks = [ "polkadot-primitives/runtime-benchmarks", "sc-service/runtime-benchmarks", + "polkadot-test-service/runtime-benchmarks" ] diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml index e4bf51c15e3de..7b43f11bbd9a7 100644 --- a/polkadot/node/service/Cargo.toml +++ b/polkadot/node/service/Cargo.toml @@ -253,6 +253,7 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "westend-runtime?/runtime-benchmarks", "xcm-runtime-apis/runtime-benchmarks", + "polkadot-test-client/runtime-benchmarks" ] try-runtime = [ "frame-system/try-runtime", diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml index cb1bfa0046081..af2325ad2aa1b 100644 --- a/polkadot/runtime/common/Cargo.toml +++ b/polkadot/runtime/common/Cargo.toml @@ -156,4 +156,5 @@ try-runtime = [ "pallet-vesting/try-runtime", "polkadot-runtime-parachains/try-runtime", "sp-runtime/try-runtime", + "frame-support-test/try-runtime" ] diff --git a/polkadot/runtime/parachains/Cargo.toml b/polkadot/runtime/parachains/Cargo.toml index 48a70134ee178..852ac94c76a0d 100644 --- a/polkadot/runtime/parachains/Cargo.toml +++ b/polkadot/runtime/parachains/Cargo.toml @@ -151,6 +151,7 @@ try-runtime = [ "pallet-timestamp/try-runtime", "pallet-vesting/try-runtime", "sp-runtime/try-runtime", + "frame-support-test/try-runtime" ] runtime-metrics = [ "polkadot-runtime-metrics/runtime-metrics", diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml index 10e4835c9568d..2fc4550c904cd 100644 --- a/polkadot/runtime/rococo/Cargo.toml +++ b/polkadot/runtime/rococo/Cargo.toml @@ -214,6 +214,7 @@ std = [ "xcm-executor/std", "xcm-runtime-apis/std", "xcm/std", + "sp-tracing/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml index 09e08f2bf97e7..ecb5fc99ba0dc 100644 --- a/polkadot/runtime/westend/Cargo.toml +++ b/polkadot/runtime/westend/Cargo.toml @@ -231,6 +231,7 @@ std = [ "xcm-executor/std", "xcm-runtime-apis/std", "xcm/std", + "sp-tracing/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml index 72e96aa3e1d08..502c5721203c8 100644 --- a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml +++ b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml @@ -57,4 +57,9 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", + "polkadot-primitives/runtime-benchmarks", + "polkadot-runtime-common/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] diff --git a/polkadot/xcm/pallet-xcm/Cargo.toml b/polkadot/xcm/pallet-xcm/Cargo.toml index 25b9c0a20b5e4..cd31aa40293cd 100644 --- a/polkadot/xcm/pallet-xcm/Cargo.toml +++ b/polkadot/xcm/pallet-xcm/Cargo.toml @@ -61,10 +61,15 @@ runtime-benchmarks = [ "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", "xcm-runtime-apis/runtime-benchmarks", + "polkadot-parachain-primitives/runtime-benchmarks", + "polkadot-runtime-parachains/runtime-benchmarks", + "pallet-assets/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-balances/try-runtime", "sp-runtime/try-runtime", + "polkadot-runtime-parachains/try-runtime", + "pallet-assets/try-runtime" ] diff --git a/polkadot/xcm/xcm-builder/Cargo.toml b/polkadot/xcm/xcm-builder/Cargo.toml index dd048f558b861..f886eb57875c1 100644 --- a/polkadot/xcm/xcm-builder/Cargo.toml +++ b/polkadot/xcm/xcm-builder/Cargo.toml @@ -48,6 +48,13 @@ runtime-benchmarks = [ "polkadot-parachain-primitives/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-executor/runtime-benchmarks", + "polkadot-primitives/runtime-benchmarks", + "polkadot-runtime-parachains/runtime-benchmarks", + "polkadot-test-runtime/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-salary/runtime-benchmarks" ] std = [ "codec/std", @@ -64,4 +71,5 @@ std = [ "sp-weights/std", "xcm-executor/std", "xcm/std", + "primitive-types/std" ] diff --git a/polkadot/xcm/xcm-runtime-apis/Cargo.toml b/polkadot/xcm/xcm-runtime-apis/Cargo.toml index c00b8ee0b853b..ba87fa38a4b1f 100644 --- a/polkadot/xcm/xcm-runtime-apis/Cargo.toml +++ b/polkadot/xcm/xcm-runtime-apis/Cargo.toml @@ -42,8 +42,21 @@ std = [ "sp-weights/std", "xcm-executor/std", "xcm/std", + "pallet-xcm/std", + "xcm-builder/std", + "pallet-assets/std", + "pallet-balances/std", + "frame-executive/std", + "frame-system/std", + "sp-io/std", + "log/std" ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", "xcm-executor/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", + "xcm-builder/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "frame-system/runtime-benchmarks" ] diff --git a/polkadot/xcm/xcm-runtime-apis/tests/mock.rs b/polkadot/xcm/xcm-runtime-apis/tests/mock.rs index 75d9f09c80417..fbc53588bb3eb 100644 --- a/polkadot/xcm/xcm-runtime-apis/tests/mock.rs +++ b/polkadot/xcm/xcm-runtime-apis/tests/mock.rs @@ -469,7 +469,8 @@ sp_api::mock_impl_runtime_apis! { } fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { - match asset.try_as::() { + let latest_asset_id: Result = asset.clone().try_into(); + match latest_asset_id { Ok(asset_id) if asset_id.0 == HereLocation::get() => { Ok(WeightToFee::weight_to_fee(&weight)) }, diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml index d21a788e1c0ef..3f3654472aa83 100644 --- a/substrate/bin/node/cli/Cargo.toml +++ b/substrate/bin/node/cli/Cargo.toml @@ -94,6 +94,7 @@ runtime-benchmarks = [ try-runtime = [ "kitchensink-runtime/try-runtime", "polkadot-sdk/try-runtime", + "substrate-cli-test-utils/try-runtime" ] [[bench]] diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml index f62570e1d15ca..9c3d9a1877db5 100644 --- a/substrate/client/db/Cargo.toml +++ b/substrate/client/db/Cargo.toml @@ -63,6 +63,7 @@ default = [] test-helpers = [] runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", + "kitchensink-runtime/runtime-benchmarks" ] rocksdb = ["kvdb-rocksdb"] diff --git a/substrate/frame/Cargo.toml b/substrate/frame/Cargo.toml index ca3b91f2661b7..2692b7a9a6caa 100644 --- a/substrate/frame/Cargo.toml +++ b/substrate/frame/Cargo.toml @@ -114,4 +114,5 @@ try-runtime = [ "frame-system/try-runtime", "frame-try-runtime/try-runtime", "sp-runtime/try-runtime", + "pallet-examples/try-runtime" ] diff --git a/substrate/frame/alliance/Cargo.toml b/substrate/frame/alliance/Cargo.toml index a2f53b59e6feb..ae692bb78eb7e 100644 --- a/substrate/frame/alliance/Cargo.toml +++ b/substrate/frame/alliance/Cargo.toml @@ -62,6 +62,7 @@ runtime-benchmarks = [ "pallet-identity/runtime-benchmarks", "sp-crypto-hashing", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", @@ -69,4 +70,5 @@ try-runtime = [ "pallet-collective?/try-runtime", "pallet-identity/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/asset-conversion/Cargo.toml b/substrate/frame/asset-conversion/Cargo.toml index d25b29c147af3..e29f549e90d67 100644 --- a/substrate/frame/asset-conversion/Cargo.toml +++ b/substrate/frame/asset-conversion/Cargo.toml @@ -47,15 +47,20 @@ std = [ "sp-core/std", "sp-io/std", "sp-runtime/std", + "primitive-types/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-assets/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/asset-conversion/ops/Cargo.toml b/substrate/frame/asset-conversion/ops/Cargo.toml index 3f8ef1329f5a5..4778f973b1504 100644 --- a/substrate/frame/asset-conversion/ops/Cargo.toml +++ b/substrate/frame/asset-conversion/ops/Cargo.toml @@ -46,6 +46,7 @@ std = [ "sp-core/std", "sp-io/std", "sp-runtime/std", + "primitive-types/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", @@ -53,10 +54,14 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "pallet-asset-conversion/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-asset-conversion/try-runtime", "sp-runtime/try-runtime", + "pallet-assets/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/asset-rate/Cargo.toml b/substrate/frame/asset-rate/Cargo.toml index 6619758c992e0..f08e98dd0825b 100644 --- a/substrate/frame/asset-rate/Cargo.toml +++ b/substrate/frame/asset-rate/Cargo.toml @@ -47,9 +47,11 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "sp-core", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/assets-freezer/Cargo.toml b/substrate/frame/assets-freezer/Cargo.toml index 29cc5009710c9..4826fcfa298ed 100644 --- a/substrate/frame/assets-freezer/Cargo.toml +++ b/substrate/frame/assets-freezer/Cargo.toml @@ -40,6 +40,9 @@ std = [ "pallet-assets/std", "scale-info/std", "sp-runtime/std", + "pallet-balances/std", + "sp-core/std", + "sp-io/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", @@ -47,10 +50,12 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "pallet-assets/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-assets/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/assets/Cargo.toml b/substrate/frame/assets/Cargo.toml index 050e8b96b2d02..d80885db7aa0e 100644 --- a/substrate/frame/assets/Cargo.toml +++ b/substrate/frame/assets/Cargo.toml @@ -47,9 +47,11 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/atomic-swap/Cargo.toml b/substrate/frame/atomic-swap/Cargo.toml index 748fdc4e606cd..6101ee92d240c 100644 --- a/substrate/frame/atomic-swap/Cargo.toml +++ b/substrate/frame/atomic-swap/Cargo.toml @@ -42,4 +42,5 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/aura/Cargo.toml b/substrate/frame/aura/Cargo.toml index f1ddc38a44065..f28ba8095e7eb 100644 --- a/substrate/frame/aura/Cargo.toml +++ b/substrate/frame/aura/Cargo.toml @@ -42,6 +42,7 @@ std = [ "sp-application-crypto/std", "sp-consensus-aura/std", "sp-runtime/std", + "sp-core/std" ] try-runtime = [ "frame-support/try-runtime", diff --git a/substrate/frame/babe/Cargo.toml b/substrate/frame/babe/Cargo.toml index ec8dc21cf824b..e48ccaf7718cc 100644 --- a/substrate/frame/babe/Cargo.toml +++ b/substrate/frame/babe/Cargo.toml @@ -68,6 +68,10 @@ runtime-benchmarks = [ "pallet-timestamp/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "frame-election-provider-support/runtime-benchmarks", + "pallet-offences/runtime-benchmarks", + "pallet-staking/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", @@ -76,4 +80,8 @@ try-runtime = [ "pallet-session/try-runtime", "pallet-timestamp/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "frame-election-provider-support/try-runtime", + "pallet-offences/try-runtime", + "pallet-staking/try-runtime" ] diff --git a/substrate/frame/balances/Cargo.toml b/substrate/frame/balances/Cargo.toml index 47da142651ca8..10f310efc4859 100644 --- a/substrate/frame/balances/Cargo.toml +++ b/substrate/frame/balances/Cargo.toml @@ -50,9 +50,11 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-transaction-payment/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-transaction-payment/try-runtime" ] diff --git a/substrate/frame/beefy-mmr/Cargo.toml b/substrate/frame/beefy-mmr/Cargo.toml index 80c5dc4fe00ba..489ed809363c9 100644 --- a/substrate/frame/beefy-mmr/Cargo.toml +++ b/substrate/frame/beefy-mmr/Cargo.toml @@ -71,4 +71,5 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "pallet-mmr/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "sp-staking/runtime-benchmarks" ] diff --git a/substrate/frame/beefy/Cargo.toml b/substrate/frame/beefy/Cargo.toml index 7a82873b37650..6a4f0c083670c 100644 --- a/substrate/frame/beefy/Cargo.toml +++ b/substrate/frame/beefy/Cargo.toml @@ -52,6 +52,7 @@ std = [ "sp-runtime/std", "sp-session/std", "sp-staking/std", + "sp-state-machine/std" ] try-runtime = [ "frame-support/try-runtime", @@ -59,4 +60,9 @@ try-runtime = [ "pallet-authorship/try-runtime", "pallet-session/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "frame-election-provider-support/try-runtime", + "pallet-offences/try-runtime", + "pallet-staking/try-runtime", + "pallet-timestamp/try-runtime" ] diff --git a/substrate/frame/bounties/Cargo.toml b/substrate/frame/bounties/Cargo.toml index d29d16c922468..528772bd8cf70 100644 --- a/substrate/frame/bounties/Cargo.toml +++ b/substrate/frame/bounties/Cargo.toml @@ -52,10 +52,12 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-treasury/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/child-bounties/Cargo.toml b/substrate/frame/child-bounties/Cargo.toml index 65226c4895d11..f244892a041fe 100644 --- a/substrate/frame/child-bounties/Cargo.toml +++ b/substrate/frame/child-bounties/Cargo.toml @@ -56,6 +56,7 @@ runtime-benchmarks = [ "pallet-bounties/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", @@ -63,4 +64,5 @@ try-runtime = [ "pallet-bounties/try-runtime", "pallet-treasury/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/collective/Cargo.toml b/substrate/frame/collective/Cargo.toml index dd14cec551da2..29a14f2843201 100644 --- a/substrate/frame/collective/Cargo.toml +++ b/substrate/frame/collective/Cargo.toml @@ -42,15 +42,18 @@ std = [ "sp-core/std", "sp-io/std", "sp-runtime/std", + "pallet-balances/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml index 8265f666fe315..bb4ebe268b1ad 100644 --- a/substrate/frame/contracts/Cargo.toml +++ b/substrate/frame/contracts/Cargo.toml @@ -110,10 +110,21 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "wasm-instrument", "xcm-builder/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks", + "pallet-proxy/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", + "pallet-utility/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-balances/try-runtime", "sp-runtime/try-runtime", + "pallet-assets/try-runtime", + "pallet-insecure-randomness-collective-flip/try-runtime", + "pallet-message-queue/try-runtime", + "pallet-proxy/try-runtime", + "pallet-timestamp/try-runtime", + "pallet-utility/try-runtime" ] diff --git a/substrate/frame/conviction-voting/Cargo.toml b/substrate/frame/conviction-voting/Cargo.toml index cf968428920c5..2be20b9c7cd16 100644 --- a/substrate/frame/conviction-voting/Cargo.toml +++ b/substrate/frame/conviction-voting/Cargo.toml @@ -51,9 +51,13 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-scheduler/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "pallet-scheduler/try-runtime" ] diff --git a/substrate/frame/delegated-staking/Cargo.toml b/substrate/frame/delegated-staking/Cargo.toml index 98ec32c1a475e..6df75ec589699 100644 --- a/substrate/frame/delegated-staking/Cargo.toml +++ b/substrate/frame/delegated-staking/Cargo.toml @@ -44,15 +44,26 @@ std = [ "sp-io/std", "sp-runtime/std", "sp-staking/std", + "frame-election-provider-support/std" ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "frame-election-provider-support/runtime-benchmarks", + "pallet-nomination-pools/runtime-benchmarks", + "pallet-staking/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "frame-election-provider-support/try-runtime", + "pallet-nomination-pools/try-runtime", + "pallet-staking/try-runtime", + "pallet-timestamp/try-runtime" ] diff --git a/substrate/frame/democracy/Cargo.toml b/substrate/frame/democracy/Cargo.toml index 93025b1c6a317..49d448fb1c82d 100644 --- a/substrate/frame/democracy/Cargo.toml +++ b/substrate/frame/democracy/Cargo.toml @@ -53,9 +53,15 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-preimage/runtime-benchmarks", + "pallet-scheduler/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "pallet-preimage/try-runtime", + "pallet-scheduler/try-runtime" ] diff --git a/substrate/frame/election-provider-multi-phase/Cargo.toml b/substrate/frame/election-provider-multi-phase/Cargo.toml index a3ca523809243..f57f5bc140d9b 100644 --- a/substrate/frame/election-provider-multi-phase/Cargo.toml +++ b/substrate/frame/election-provider-multi-phase/Cargo.toml @@ -73,10 +73,12 @@ runtime-benchmarks = [ "rand", "sp-runtime/runtime-benchmarks", "strum", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-election-provider-support/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml b/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml index bf5f992698b71..47df71ecbdd2f 100644 --- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml +++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml @@ -43,4 +43,15 @@ pallet-session = { default-features = true, path = "../../session" } [features] try-runtime = [ + "pallet-bags-list/try-runtime", + "pallet-balances/try-runtime", + "pallet-election-provider-multi-phase/try-runtime", + "frame-election-provider-support/try-runtime", + "pallet-nomination-pools/try-runtime", + "pallet-session/try-runtime", + "pallet-staking/try-runtime", + "frame-support/try-runtime", + "frame-system/try-runtime", + "pallet-timestamp/try-runtime", + "sp-runtime/try-runtime" ] diff --git a/substrate/frame/elections-phragmen/Cargo.toml b/substrate/frame/elections-phragmen/Cargo.toml index b42edcffaeab5..bed130c26b7fa 100644 --- a/substrate/frame/elections-phragmen/Cargo.toml +++ b/substrate/frame/elections-phragmen/Cargo.toml @@ -57,9 +57,11 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/examples/authorization-tx-extension/Cargo.toml b/substrate/frame/examples/authorization-tx-extension/Cargo.toml index de39b1e023770..eef8ebb3848b5 100644 --- a/substrate/frame/examples/authorization-tx-extension/Cargo.toml +++ b/substrate/frame/examples/authorization-tx-extension/Cargo.toml @@ -42,15 +42,19 @@ std = [ "scale-info/std", "sp-io/std", "sp-runtime/std", + "pallet-verify-signature/std", + "sp-core/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-verify-signature/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-verify-signature/try-runtime" ] diff --git a/substrate/frame/examples/basic/Cargo.toml b/substrate/frame/examples/basic/Cargo.toml index 30f36c7ee204b..0d8042d071318 100644 --- a/substrate/frame/examples/basic/Cargo.toml +++ b/substrate/frame/examples/basic/Cargo.toml @@ -42,6 +42,7 @@ std = [ "scale-info/std", "sp-io/std", "sp-runtime/std", + "sp-core/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/substrate/frame/examples/dev-mode/Cargo.toml b/substrate/frame/examples/dev-mode/Cargo.toml index dde954e975607..66b6d0ef206e5 100644 --- a/substrate/frame/examples/dev-mode/Cargo.toml +++ b/substrate/frame/examples/dev-mode/Cargo.toml @@ -39,6 +39,7 @@ std = [ "scale-info/std", "sp-io/std", "sp-runtime/std", + "sp-core/std" ] try-runtime = [ "frame-support/try-runtime", diff --git a/substrate/frame/examples/kitchensink/Cargo.toml b/substrate/frame/examples/kitchensink/Cargo.toml index 0f5345345a36c..7a029b27d634f 100644 --- a/substrate/frame/examples/kitchensink/Cargo.toml +++ b/substrate/frame/examples/kitchensink/Cargo.toml @@ -41,6 +41,7 @@ std = [ "scale-info/std", "sp-io/std", "sp-runtime/std", + "sp-core/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/substrate/frame/examples/split/Cargo.toml b/substrate/frame/examples/split/Cargo.toml index 43acf58286704..62b753e28446c 100644 --- a/substrate/frame/examples/split/Cargo.toml +++ b/substrate/frame/examples/split/Cargo.toml @@ -38,6 +38,7 @@ std = [ "log/std", "scale-info/std", "sp-io/std", + "sp-core/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/substrate/frame/executive/Cargo.toml b/substrate/frame/executive/Cargo.toml index d11722c7510b8..3cd73a07f127f 100644 --- a/substrate/frame/executive/Cargo.toml +++ b/substrate/frame/executive/Cargo.toml @@ -60,4 +60,6 @@ try-runtime = [ "frame-system/try-runtime", "frame-try-runtime/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "pallet-transaction-payment/try-runtime" ] diff --git a/substrate/frame/fast-unstake/Cargo.toml b/substrate/frame/fast-unstake/Cargo.toml index 28b02db21ffd7..75098cc33981a 100644 --- a/substrate/frame/fast-unstake/Cargo.toml +++ b/substrate/frame/fast-unstake/Cargo.toml @@ -50,6 +50,7 @@ std = [ "sp-io/std", "sp-runtime/std", "sp-staking/std", + "sp-core/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", @@ -58,10 +59,16 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-staking/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] try-runtime = [ "frame-election-provider-support/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "pallet-staking/try-runtime", + "pallet-timestamp/try-runtime" ] diff --git a/substrate/frame/glutton/Cargo.toml b/substrate/frame/glutton/Cargo.toml index b887f732f76b4..8a6127a243bc8 100644 --- a/substrate/frame/glutton/Cargo.toml +++ b/substrate/frame/glutton/Cargo.toml @@ -50,6 +50,7 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] runtime-benchmarks = [ @@ -57,4 +58,5 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml index bc9ef425cc435..6b403708fc377 100644 --- a/substrate/frame/grandpa/Cargo.toml +++ b/substrate/frame/grandpa/Cargo.toml @@ -68,6 +68,11 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "frame-election-provider-support/runtime-benchmarks", + "pallet-offences/runtime-benchmarks", + "pallet-staking/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", @@ -75,4 +80,9 @@ try-runtime = [ "pallet-authorship/try-runtime", "pallet-session/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "frame-election-provider-support/try-runtime", + "pallet-offences/try-runtime", + "pallet-staking/try-runtime", + "pallet-timestamp/try-runtime" ] diff --git a/substrate/frame/identity/Cargo.toml b/substrate/frame/identity/Cargo.toml index 18a35e59e0839..9ce8d8a927862 100644 --- a/substrate/frame/identity/Cargo.toml +++ b/substrate/frame/identity/Cargo.toml @@ -50,9 +50,11 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/im-online/Cargo.toml b/substrate/frame/im-online/Cargo.toml index b9a0f80182824..f0b626922d598 100644 --- a/substrate/frame/im-online/Cargo.toml +++ b/substrate/frame/im-online/Cargo.toml @@ -60,4 +60,5 @@ try-runtime = [ "frame-system/try-runtime", "pallet-authorship/try-runtime", "sp-runtime/try-runtime", + "pallet-session/try-runtime" ] diff --git a/substrate/frame/indices/Cargo.toml b/substrate/frame/indices/Cargo.toml index bb83df149402c..8af4a9141bdb6 100644 --- a/substrate/frame/indices/Cargo.toml +++ b/substrate/frame/indices/Cargo.toml @@ -48,9 +48,11 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/lottery/Cargo.toml b/substrate/frame/lottery/Cargo.toml index e6a757ca5d8e8..d7ca697251261 100644 --- a/substrate/frame/lottery/Cargo.toml +++ b/substrate/frame/lottery/Cargo.toml @@ -45,9 +45,12 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "frame-support-test/try-runtime" ] diff --git a/substrate/frame/migrations/Cargo.toml b/substrate/frame/migrations/Cargo.toml index 4436231d401a0..c17012663d827 100644 --- a/substrate/frame/migrations/Cargo.toml +++ b/substrate/frame/migrations/Cargo.toml @@ -58,4 +58,5 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "frame-executive/try-runtime" ] diff --git a/substrate/frame/multisig/Cargo.toml b/substrate/frame/multisig/Cargo.toml index 36800af6c70f9..93103ffebadaa 100644 --- a/substrate/frame/multisig/Cargo.toml +++ b/substrate/frame/multisig/Cargo.toml @@ -36,7 +36,9 @@ std = [ ] runtime-benchmarks = [ "frame/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/nft-fractionalization/Cargo.toml b/substrate/frame/nft-fractionalization/Cargo.toml index 72119119bbe45..4a931e2834227 100644 --- a/substrate/frame/nft-fractionalization/Cargo.toml +++ b/substrate/frame/nft-fractionalization/Cargo.toml @@ -52,6 +52,7 @@ runtime-benchmarks = [ "pallet-assets/runtime-benchmarks", "pallet-nfts/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", @@ -59,4 +60,5 @@ try-runtime = [ "pallet-assets/try-runtime", "pallet-nfts/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/nfts/Cargo.toml b/substrate/frame/nfts/Cargo.toml index 93e160176e5e4..ab1b7da12753e 100644 --- a/substrate/frame/nfts/Cargo.toml +++ b/substrate/frame/nfts/Cargo.toml @@ -50,9 +50,11 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/nis/Cargo.toml b/substrate/frame/nis/Cargo.toml index 17a48d9c32c54..63b3b856554a1 100644 --- a/substrate/frame/nis/Cargo.toml +++ b/substrate/frame/nis/Cargo.toml @@ -46,9 +46,11 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/nomination-pools/benchmarking/Cargo.toml b/substrate/frame/nomination-pools/benchmarking/Cargo.toml index ceac9361cd355..37f6417932c8e 100644 --- a/substrate/frame/nomination-pools/benchmarking/Cargo.toml +++ b/substrate/frame/nomination-pools/benchmarking/Cargo.toml @@ -55,6 +55,7 @@ std = [ "sp-runtime-interface/std", "sp-runtime/std", "sp-staking/std", + "pallet-balances/std" ] runtime-benchmarks = [ @@ -68,4 +69,6 @@ runtime-benchmarks = [ "pallet-staking/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] diff --git a/substrate/frame/offences/benchmarking/Cargo.toml b/substrate/frame/offences/benchmarking/Cargo.toml index a4c04c9363835..f80888328b46d 100644 --- a/substrate/frame/offences/benchmarking/Cargo.toml +++ b/substrate/frame/offences/benchmarking/Cargo.toml @@ -73,4 +73,5 @@ runtime-benchmarks = [ "pallet-staking/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] diff --git a/substrate/frame/parameters/Cargo.toml b/substrate/frame/parameters/Cargo.toml index 338714afa13c0..915c6b9ec0aab 100644 --- a/substrate/frame/parameters/Cargo.toml +++ b/substrate/frame/parameters/Cargo.toml @@ -42,9 +42,13 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-example-basic/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "pallet-example-basic/try-runtime" ] diff --git a/substrate/frame/preimage/Cargo.toml b/substrate/frame/preimage/Cargo.toml index a79ff2ed8dfd0..705b356054917 100644 --- a/substrate/frame/preimage/Cargo.toml +++ b/substrate/frame/preimage/Cargo.toml @@ -34,6 +34,7 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] std = [ "codec/std", @@ -50,4 +51,5 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/proxy/Cargo.toml b/substrate/frame/proxy/Cargo.toml index 25a2def78c1be..8cb0aabb9b504 100644 --- a/substrate/frame/proxy/Cargo.toml +++ b/substrate/frame/proxy/Cargo.toml @@ -33,7 +33,11 @@ std = [ ] runtime-benchmarks = [ "frame/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-utility/runtime-benchmarks" ] try-runtime = [ "frame/try-runtime", + "pallet-balances/try-runtime", + "pallet-utility/try-runtime" ] diff --git a/substrate/frame/recovery/Cargo.toml b/substrate/frame/recovery/Cargo.toml index dbce6aadbd2e7..11d9361ebb582 100644 --- a/substrate/frame/recovery/Cargo.toml +++ b/substrate/frame/recovery/Cargo.toml @@ -36,6 +36,7 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", 'frame-benchmarking', + "pallet-balances/runtime-benchmarks" ] std = [ "codec/std", @@ -50,4 +51,5 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/referenda/Cargo.toml b/substrate/frame/referenda/Cargo.toml index da630a74a79dd..c53beb239c401 100644 --- a/substrate/frame/referenda/Cargo.toml +++ b/substrate/frame/referenda/Cargo.toml @@ -58,9 +58,15 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-preimage/runtime-benchmarks", + "pallet-scheduler/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "pallet-preimage/try-runtime", + "pallet-scheduler/try-runtime" ] diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml index 2a57c69e18e89..263f1d7bfe196 100644 --- a/substrate/frame/revive/Cargo.toml +++ b/substrate/frame/revive/Cargo.toml @@ -110,6 +110,8 @@ std = [ "subxt-signer", "xcm-builder/std", "xcm/std", + "secp256k1/std", + "serde_json/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", @@ -120,6 +122,11 @@ runtime-benchmarks = [ "pallet-transaction-payment/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks", + "pallet-proxy/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", + "pallet-utility/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", @@ -127,4 +134,9 @@ try-runtime = [ "pallet-balances/try-runtime", "pallet-transaction-payment/try-runtime", "sp-runtime/try-runtime", + "pallet-assets/try-runtime", + "pallet-message-queue/try-runtime", + "pallet-proxy/try-runtime", + "pallet-timestamp/try-runtime", + "pallet-utility/try-runtime" ] diff --git a/substrate/frame/revive/mock-network/Cargo.toml b/substrate/frame/revive/mock-network/Cargo.toml index 8535372c8a2a7..4bb68d0d2ee3f 100644 --- a/substrate/frame/revive/mock-network/Cargo.toml +++ b/substrate/frame/revive/mock-network/Cargo.toml @@ -84,6 +84,7 @@ std = [ "sp-runtime/std", "xcm-executor/std", "xcm/std", + "pallet-revive-fixtures/std" ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", diff --git a/substrate/frame/root-offences/Cargo.toml b/substrate/frame/root-offences/Cargo.toml index 25fbf3868558d..6f1f3e965dde4 100644 --- a/substrate/frame/root-offences/Cargo.toml +++ b/substrate/frame/root-offences/Cargo.toml @@ -43,6 +43,9 @@ runtime-benchmarks = [ "pallet-staking/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "frame-election-provider-support/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", @@ -50,6 +53,9 @@ try-runtime = [ "pallet-session/try-runtime", "pallet-staking/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "frame-election-provider-support/try-runtime", + "pallet-timestamp/try-runtime" ] default = ["std"] std = [ @@ -61,4 +67,5 @@ std = [ "scale-info/std", "sp-runtime/std", "sp-staking/std", + "sp-io/std" ] diff --git a/substrate/frame/scheduler/Cargo.toml b/substrate/frame/scheduler/Cargo.toml index 93457d27a00f0..5c120ad995176 100644 --- a/substrate/frame/scheduler/Cargo.toml +++ b/substrate/frame/scheduler/Cargo.toml @@ -37,6 +37,7 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-preimage/runtime-benchmarks" ] std = [ "codec/std", @@ -48,9 +49,11 @@ std = [ "sp-io/std", "sp-runtime/std", "sp-weights/std", + "sp-core/std" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-preimage/try-runtime" ] diff --git a/substrate/frame/scored-pool/Cargo.toml b/substrate/frame/scored-pool/Cargo.toml index 1e3221b381de6..d5c17226942c1 100644 --- a/substrate/frame/scored-pool/Cargo.toml +++ b/substrate/frame/scored-pool/Cargo.toml @@ -41,4 +41,5 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/session/benchmarking/Cargo.toml b/substrate/frame/session/benchmarking/Cargo.toml index 97316c654af7f..ffd311dd753eb 100644 --- a/substrate/frame/session/benchmarking/Cargo.toml +++ b/substrate/frame/session/benchmarking/Cargo.toml @@ -55,4 +55,7 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "pallet-staking/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "frame-election-provider-support/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] diff --git a/substrate/frame/society/Cargo.toml b/substrate/frame/society/Cargo.toml index 1227859ed3f13..52f6be678eccf 100644 --- a/substrate/frame/society/Cargo.toml +++ b/substrate/frame/society/Cargo.toml @@ -54,9 +54,12 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "frame-support-test/try-runtime" ] diff --git a/substrate/frame/staking/Cargo.toml b/substrate/frame/staking/Cargo.toml index da0385ebcbf0e..25b227ebeb1c2 100644 --- a/substrate/frame/staking/Cargo.toml +++ b/substrate/frame/staking/Cargo.toml @@ -74,6 +74,9 @@ runtime-benchmarks = [ "rand_chacha", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "pallet-bags-list/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] try-runtime = [ "frame-election-provider-support/try-runtime", @@ -82,4 +85,7 @@ try-runtime = [ "pallet-authorship/try-runtime", "pallet-session/try-runtime", "sp-runtime/try-runtime", + "pallet-bags-list/try-runtime", + "pallet-balances/try-runtime", + "pallet-timestamp/try-runtime" ] diff --git a/substrate/frame/state-trie-migration/Cargo.toml b/substrate/frame/state-trie-migration/Cargo.toml index 58f28e06d448f..de5f3c63820af 100644 --- a/substrate/frame/state-trie-migration/Cargo.toml +++ b/substrate/frame/state-trie-migration/Cargo.toml @@ -55,11 +55,13 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] remote-test = [ "remote-externalities", diff --git a/substrate/frame/statement/Cargo.toml b/substrate/frame/statement/Cargo.toml index 7c2a792414bcf..c641135c5f962 100644 --- a/substrate/frame/statement/Cargo.toml +++ b/substrate/frame/statement/Cargo.toml @@ -47,4 +47,5 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/support/Cargo.toml b/substrate/frame/support/Cargo.toml index a7072cb03a29a..15ef46e2f4d36 100644 --- a/substrate/frame/support/Cargo.toml +++ b/substrate/frame/support/Cargo.toml @@ -99,14 +99,17 @@ std = [ "sp-tracing/std", "sp-trie/std", "sp-weights/std", + "sp-timestamp/std" ] runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + "frame-system/runtime-benchmarks" ] try-runtime = [ "sp-debug-derive/force-debug", "sp-runtime/try-runtime", + "frame-system/try-runtime" ] experimental = ["frame-support-procedural/experimental"] # By default some types have documentation, `no-metadata-docs` allows to reduce the documentation diff --git a/substrate/frame/support/procedural/Cargo.toml b/substrate/frame/support/procedural/Cargo.toml index aa7448baac416..efe0d7b176202 100644 --- a/substrate/frame/support/procedural/Cargo.toml +++ b/substrate/frame/support/procedural/Cargo.toml @@ -53,6 +53,14 @@ static_assertions = { workspace = true } default = ["std"] std = [ "sp-crypto-hashing/std", + "frame-support/std", + "frame-system/std", + "sp-core/std", + "sp-io/std", + "sp-metadata-ir/std", + "sp-runtime/std", + "codec/std", + "scale-info/std" ] no-metadata-docs = [] experimental = [] diff --git a/substrate/frame/tips/Cargo.toml b/substrate/frame/tips/Cargo.toml index f897244757df9..8a4629f80e156 100644 --- a/substrate/frame/tips/Cargo.toml +++ b/substrate/frame/tips/Cargo.toml @@ -53,10 +53,12 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-treasury/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/transaction-payment/Cargo.toml b/substrate/frame/transaction-payment/Cargo.toml index 85a4340b14296..72f7ee01698d5 100644 --- a/substrate/frame/transaction-payment/Cargo.toml +++ b/substrate/frame/transaction-payment/Cargo.toml @@ -50,9 +50,11 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml index 4dfd8178d2aa9..03edb1921768a 100644 --- a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml +++ b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml @@ -43,6 +43,9 @@ std = [ "pallet-transaction-payment/std", "scale-info/std", "sp-runtime/std", + "sp-core/std", + "sp-io/std", + "sp-storage/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", @@ -51,6 +54,8 @@ runtime-benchmarks = [ "pallet-asset-conversion/runtime-benchmarks", "pallet-transaction-payment/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", @@ -58,4 +63,6 @@ try-runtime = [ "pallet-asset-conversion/try-runtime", "pallet-transaction-payment/try-runtime", "sp-runtime/try-runtime", + "pallet-assets/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml index 7c6f578cc6ee9..a1074e935848c 100644 --- a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml +++ b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml @@ -51,6 +51,7 @@ std = [ "sp-core/std", "sp-io/std", "sp-runtime/std", + "sp-storage/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", @@ -58,10 +59,15 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "pallet-transaction-payment/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-transaction-payment/try-runtime", "sp-runtime/try-runtime", + "pallet-assets/try-runtime", + "pallet-authorship/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/transaction-storage/Cargo.toml b/substrate/frame/transaction-storage/Cargo.toml index c4ffa7c05ba6c..ca11494899c16 100644 --- a/substrate/frame/transaction-storage/Cargo.toml +++ b/substrate/frame/transaction-storage/Cargo.toml @@ -57,6 +57,7 @@ std = [ "sp-io/std", "sp-runtime/std", "sp-transaction-storage-proof/std", + "sp-core/std" ] try-runtime = [ "frame-support/try-runtime", diff --git a/substrate/frame/treasury/Cargo.toml b/substrate/frame/treasury/Cargo.toml index 4831b5dcd3be3..e3bdc2d360d20 100644 --- a/substrate/frame/treasury/Cargo.toml +++ b/substrate/frame/treasury/Cargo.toml @@ -58,10 +58,12 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-utility/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-balances/try-runtime", "sp-runtime/try-runtime", + "pallet-utility/try-runtime" ] diff --git a/substrate/frame/uniques/Cargo.toml b/substrate/frame/uniques/Cargo.toml index 2d1e344b5478b..bb479caf024d5 100644 --- a/substrate/frame/uniques/Cargo.toml +++ b/substrate/frame/uniques/Cargo.toml @@ -46,9 +46,11 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/utility/Cargo.toml b/substrate/frame/utility/Cargo.toml index 9ae791c6c02ac..2714c38f3f309 100644 --- a/substrate/frame/utility/Cargo.toml +++ b/substrate/frame/utility/Cargo.toml @@ -49,9 +49,16 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-collective/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "pallet-collective/try-runtime", + "pallet-root-testing/try-runtime", + "pallet-timestamp/try-runtime" ] diff --git a/substrate/frame/verify-signature/Cargo.toml b/substrate/frame/verify-signature/Cargo.toml index 5c7e30c92f1cd..2460416774fb0 100644 --- a/substrate/frame/verify-signature/Cargo.toml +++ b/substrate/frame/verify-signature/Cargo.toml @@ -51,9 +51,16 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-collective/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "pallet-collective/try-runtime", + "pallet-root-testing/try-runtime", + "pallet-timestamp/try-runtime" ] diff --git a/substrate/frame/vesting/Cargo.toml b/substrate/frame/vesting/Cargo.toml index 38ce000b80113..44fbd48a1b67a 100644 --- a/substrate/frame/vesting/Cargo.toml +++ b/substrate/frame/vesting/Cargo.toml @@ -41,15 +41,18 @@ std = [ "log/std", "scale-info/std", "sp-runtime/std", + "sp-io/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime" ] diff --git a/substrate/frame/whitelist/Cargo.toml b/substrate/frame/whitelist/Cargo.toml index 44a33c4b9367e..c97e8b2d26a6c 100644 --- a/substrate/frame/whitelist/Cargo.toml +++ b/substrate/frame/whitelist/Cargo.toml @@ -46,9 +46,13 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-preimage/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", + "pallet-balances/try-runtime", + "pallet-preimage/try-runtime" ] diff --git a/substrate/test-utils/runtime/Cargo.toml b/substrate/test-utils/runtime/Cargo.toml index d04b6c1cf29df..f851333a06b8c 100644 --- a/substrate/test-utils/runtime/Cargo.toml +++ b/substrate/test-utils/runtime/Cargo.toml @@ -111,6 +111,7 @@ std = [ "substrate-wasm-builder", "tracing/std", "trie-db/std", + "serde/std" ] # Special feature to disable logging diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml index baa1030b39ce4..89f069c233da9 100644 --- a/substrate/utils/frame/benchmarking-cli/Cargo.toml +++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml @@ -118,5 +118,6 @@ runtime-benchmarks = [ "sc-client-db/runtime-benchmarks", "sc-service/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "westend-runtime/runtime-benchmarks" ] rocksdb = ["sc-cli/rocksdb", "sc-client-db/rocksdb"] diff --git a/templates/solochain/pallets/template/Cargo.toml b/templates/solochain/pallets/template/Cargo.toml index 9de9cdf7557d6..b58657590cc71 100644 --- a/templates/solochain/pallets/template/Cargo.toml +++ b/templates/solochain/pallets/template/Cargo.toml @@ -41,8 +41,10 @@ runtime-benchmarks = [ "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" ] From 325b2c2e9cdf3eaf5248c21d21180cecc73f7471 Mon Sep 17 00:00:00 2001 From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Mar 2025 08:29:50 +0000 Subject: [PATCH 18/25] Update from github-actions[bot] running command 'prdoc' --- prdoc/pr_7894.prdoc | 251 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) create mode 100644 prdoc/pr_7894.prdoc diff --git a/prdoc/pr_7894.prdoc b/prdoc/pr_7894.prdoc new file mode 100644 index 0000000000000..b1d5d3205edd8 --- /dev/null +++ b/prdoc/pr_7894.prdoc @@ -0,0 +1,251 @@ +title: '[stable2412] pallet-revive: remove related crates from umbrella' +doc: +- audience: Todo + description: |- + # Description + + When building `polkadot-sdk-parachain-template` workspace (`cargo build --workspace --all-features`), based on `stable2412` dependencies (https://github.com/paritytech/polkadot-sdk-parachain-template/pull/26), it fails with an error like below. +
+ error message + error[E0080]: evaluation of constant value failed + --> /home/ubuntu/.cargo/registry/src/index.crates.io-6f17d22bba15001f/sc-network-0.47.0/src/protocol/message.rs:79:40 + | + 79 | #[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)] + | ^^^^^^ the evaluated program panicked at 'Found variants that have duplicate indexes. Both `Consensus` and `RemoteCallResponse` have the index `6`. Use different indexes for each variant.', /home/ubuntu/.cargo/registry/src/index.crates.io-6f17d22bba15001f/sc-network-0.47.0/src/protocol/message.rs:79:43 + | + = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `::core::panic` (in Nightly builds, run with -Z macro-backtrace for more info) + + error[E0080]: evaluation of constant value failed + --> /home/ubuntu/.cargo/registry/src/index.crates.io-6f17d22bba15001f/sc-network-0.47.0/src/protocol/message.rs:79:48 + | + 79 | #[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)] + | ^^^^^^ the evaluated program panicked at 'Found variants that have duplicate indexes. Both `Consensus` and `RemoteCallResponse` have the index `6`. Use different indexes for each variant.', /home/ubuntu/.cargo/registry/src/index.crates.io-6f17d22bba15001f/sc-network-0.47.0/src/protocol/message.rs:79:51 + | + = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `::core::panic` (in Nightly builds, run with -Z macro-backtrace for more info) + + For more information about this error, try `rustc --explain E0080`. + error: could not compile `sc-network` (lib) due to 2 previous errors +
+ + The root cause is `sc-network 0.47.0` (which builds fine when >=0.48.0), a dependency of `pallet-revive-eth-rpc 0.2.0`, which is a dependency of `polkadot-sdk 0.12.1`, used for various things in `polkadot-sdk-parachain-template` repo. While investigating how to fix the issue on `stable2412`, I discovered a few things: + + 1. `pallet-revive 0.3.1` can not build with `runtime-benchmarks` based on latest `stable2412`, and it is also a dependency of `pallet-revive-eth-rpc 0.2.0`, and pulled by `polkadot-sdk 0.12.1` for its `runtime-benchmarks` feature. + + 2. Based on some chats started here: https://github.com/paritytech/polkadot-sdk/pull/7844#issuecomment-2714856647, we identified that `pallet-revive/pallet-revive-eth-rpc` were set with `publish = false` for a good reason and it shouldn't have changed here: https://github.com/paritytech/polkadot-sdk/commit/31b5923aba564b8fdf280e514171cb0a102faa9a. We also identified as a potential fix what this PR does, meaning removing the `pallet-revive/pallet-revive-eth-rpc` dependency of `polkadot-sdk`. I removed the other dependencies as well since I feel it does not make sense to still keep them once `pallet-revive` is out. + + 3. Releasing correct crates for `pallet-revive*` and use them in `polkadot-sdk` isn't yet necessary IMO, since some things still need to be polished, and given their builds fail when building certain features, they are not usable by users fully, so maybe not worth keeping partial working functionality around just for the sake of having the crates in `polkadot-sdk` - please challenge this if you think differently. Ideally, we will make these pallets available for developers to use via `polkadot-sdk` when all builds correctly with all features. + + ## Integration + + Runtime/Node devs will not be able to reference `pallet-revive*` pallets anymore via `polkadot-sdk`, so this is a breaking change, but if their usage is close to zero by polkadot devs we can tune it down and consider it a minor change for `polkadot-sdk`. + + ## Review Notes + + 1. If we think this requires a major bump for `polkadot-sdk`.. then we can't look at the PR as a fix for `stable2412` and associated published `polkadot-sdk` version. If we consider `pallet-revive` logic not being necessarily used by polkadot devs so not very breaking from usage perspective, then we can go with a minor bump and finally have a working `polkadot-sdk` for `stable2412. + + 2. We also considered fixing `pallet-revive` & `pallet-revive-eth-rpc` on `stable2412`, and publish correct versions on `crates.io`, and then follow with a `polkadot-sdk` publish that depends on them, and in the end `polkadot-sdk-parachain-template` workspace would build successfully based on `stable2412` crates, but this is more work which could've been done by now if it was necessary - e.g. in a scenario where actual developers were using them (instead of setting the crates with `publish = false`), so I think it makes sense to remove them for now from `polkadot-sdk`. + + 3. ~IMO this PR should be backported to stable2503 too. Releasing `polkadot-sdk` with `pallet-revive*` dependencies can be done with the June release if things are more stable by then.~ We actually want to fix `pallet-revive*` crates for stable2503, so must be kept in master and 2503 branch. +crates: +- name: polkadot-sdk + bump: major +- name: asset-hub-westend-runtime + bump: major +- name: pallet-xcm-benchmarks + bump: major +- name: polkadot-overseer + bump: major +- name: polkadot + bump: major +- name: bridge-runtime-common + bump: major +- name: pallet-bridge-messages + bump: major +- name: pallet-bridge-relayers + bump: major +- name: pallet-xcm-bridge-hub + bump: major +- name: snowbridge-pallet-inbound-queue + bump: major +- name: snowbridge-pallet-outbound-queue + bump: major +- name: snowbridge-pallet-system + bump: major +- name: snowbridge-core + bump: major +- name: pallet-collator-selection + bump: major +- name: cumulus-pallet-parachain-system + bump: major +- name: cumulus-pallet-xcmp-queue + bump: major +- name: pallet-collective-content + bump: major +- name: asset-hub-rococo-runtime + bump: major +- name: bridge-hub-rococo-runtime + bump: major +- name: bridge-hub-westend-runtime + bump: major +- name: collectives-westend-runtime + bump: major +- name: coretime-rococo-runtime + bump: major +- name: coretime-westend-runtime + bump: major +- name: people-rococo-runtime + bump: major +- name: people-westend-runtime + bump: major +- name: cumulus-primitives-storage-weight-reclaim + bump: major +- name: polkadot-node-metrics + bump: major +- name: polkadot-service + bump: major +- name: polkadot-runtime-common + bump: major +- name: polkadot-runtime-parachains + bump: major +- name: rococo-runtime + bump: major +- name: westend-runtime + bump: major +- name: pallet-xcm + bump: major +- name: staging-xcm-builder + bump: major +- name: xcm-runtime-apis + bump: major +- name: sc-client-db + bump: major +- name: polkadot-sdk-frame + bump: major +- name: pallet-alliance + bump: major +- name: pallet-asset-conversion + bump: major +- name: pallet-asset-conversion-ops + bump: major +- name: pallet-asset-rate + bump: major +- name: pallet-assets-freezer + bump: major +- name: pallet-assets + bump: major +- name: pallet-atomic-swap + bump: major +- name: pallet-aura + bump: major +- name: pallet-babe + bump: major +- name: pallet-balances + bump: major +- name: pallet-beefy-mmr + bump: major +- name: pallet-beefy + bump: major +- name: pallet-bounties + bump: major +- name: pallet-child-bounties + bump: major +- name: pallet-collective + bump: major +- name: pallet-contracts + bump: major +- name: pallet-conviction-voting + bump: major +- name: pallet-delegated-staking + bump: major +- name: pallet-democracy + bump: major +- name: pallet-election-provider-multi-phase + bump: major +- name: pallet-elections-phragmen + bump: major +- name: pallet-dev-mode + bump: major +- name: frame-executive + bump: major +- name: pallet-fast-unstake + bump: major +- name: pallet-glutton + bump: major +- name: pallet-grandpa + bump: major +- name: pallet-identity + bump: major +- name: pallet-im-online + bump: major +- name: pallet-indices + bump: major +- name: pallet-lottery + bump: major +- name: pallet-migrations + bump: major +- name: pallet-multisig + bump: major +- name: pallet-nft-fractionalization + bump: major +- name: pallet-nfts + bump: major +- name: pallet-nis + bump: major +- name: pallet-nomination-pools-benchmarking + bump: major +- name: pallet-offences-benchmarking + bump: major +- name: pallet-parameters + bump: major +- name: pallet-preimage + bump: major +- name: pallet-proxy + bump: major +- name: pallet-recovery + bump: major +- name: pallet-referenda + bump: major +- name: pallet-root-offences + bump: major +- name: pallet-scheduler + bump: major +- name: pallet-scored-pool + bump: major +- name: pallet-session-benchmarking + bump: major +- name: pallet-society + bump: major +- name: pallet-staking + bump: major +- name: pallet-state-trie-migration + bump: major +- name: pallet-statement + bump: major +- name: frame-support + bump: major +- name: frame-support-procedural + bump: major +- name: pallet-tips + bump: major +- name: pallet-transaction-payment + bump: major +- name: pallet-asset-conversion-tx-payment + bump: major +- name: pallet-asset-tx-payment + bump: major +- name: pallet-transaction-storage + bump: major +- name: pallet-treasury + bump: major +- name: pallet-uniques + bump: major +- name: pallet-utility + bump: major +- name: pallet-verify-signature + bump: major +- name: pallet-vesting + bump: major +- name: pallet-whitelist + bump: major +- name: frame-benchmarking-cli + bump: major From d47129805d99d4117080879da502afec84f6763f Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Thu, 20 Mar 2025 10:47:40 +0200 Subject: [PATCH 19/25] tune down prdoc Signed-off-by: Iulian Barbu --- prdoc/pr_7894.prdoc | 250 +++++++++++++++++++------------------------- 1 file changed, 105 insertions(+), 145 deletions(-) diff --git a/prdoc/pr_7894.prdoc b/prdoc/pr_7894.prdoc index b1d5d3205edd8..038b359d75fc0 100644 --- a/prdoc/pr_7894.prdoc +++ b/prdoc/pr_7894.prdoc @@ -2,250 +2,210 @@ title: '[stable2412] pallet-revive: remove related crates from umbrella' doc: - audience: Todo description: |- - # Description - - When building `polkadot-sdk-parachain-template` workspace (`cargo build --workspace --all-features`), based on `stable2412` dependencies (https://github.com/paritytech/polkadot-sdk-parachain-template/pull/26), it fails with an error like below. -
- error message - error[E0080]: evaluation of constant value failed - --> /home/ubuntu/.cargo/registry/src/index.crates.io-6f17d22bba15001f/sc-network-0.47.0/src/protocol/message.rs:79:40 - | - 79 | #[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)] - | ^^^^^^ the evaluated program panicked at 'Found variants that have duplicate indexes. Both `Consensus` and `RemoteCallResponse` have the index `6`. Use different indexes for each variant.', /home/ubuntu/.cargo/registry/src/index.crates.io-6f17d22bba15001f/sc-network-0.47.0/src/protocol/message.rs:79:43 - | - = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `::core::panic` (in Nightly builds, run with -Z macro-backtrace for more info) - - error[E0080]: evaluation of constant value failed - --> /home/ubuntu/.cargo/registry/src/index.crates.io-6f17d22bba15001f/sc-network-0.47.0/src/protocol/message.rs:79:48 - | - 79 | #[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)] - | ^^^^^^ the evaluated program panicked at 'Found variants that have duplicate indexes. Both `Consensus` and `RemoteCallResponse` have the index `6`. Use different indexes for each variant.', /home/ubuntu/.cargo/registry/src/index.crates.io-6f17d22bba15001f/sc-network-0.47.0/src/protocol/message.rs:79:51 - | - = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `::core::panic` (in Nightly builds, run with -Z macro-backtrace for more info) - - For more information about this error, try `rustc --explain E0080`. - error: could not compile `sc-network` (lib) due to 2 previous errors -
- - The root cause is `sc-network 0.47.0` (which builds fine when >=0.48.0), a dependency of `pallet-revive-eth-rpc 0.2.0`, which is a dependency of `polkadot-sdk 0.12.1`, used for various things in `polkadot-sdk-parachain-template` repo. While investigating how to fix the issue on `stable2412`, I discovered a few things: - - 1. `pallet-revive 0.3.1` can not build with `runtime-benchmarks` based on latest `stable2412`, and it is also a dependency of `pallet-revive-eth-rpc 0.2.0`, and pulled by `polkadot-sdk 0.12.1` for its `runtime-benchmarks` feature. - - 2. Based on some chats started here: https://github.com/paritytech/polkadot-sdk/pull/7844#issuecomment-2714856647, we identified that `pallet-revive/pallet-revive-eth-rpc` were set with `publish = false` for a good reason and it shouldn't have changed here: https://github.com/paritytech/polkadot-sdk/commit/31b5923aba564b8fdf280e514171cb0a102faa9a. We also identified as a potential fix what this PR does, meaning removing the `pallet-revive/pallet-revive-eth-rpc` dependency of `polkadot-sdk`. I removed the other dependencies as well since I feel it does not make sense to still keep them once `pallet-revive` is out. - - 3. Releasing correct crates for `pallet-revive*` and use them in `polkadot-sdk` isn't yet necessary IMO, since some things still need to be polished, and given their builds fail when building certain features, they are not usable by users fully, so maybe not worth keeping partial working functionality around just for the sake of having the crates in `polkadot-sdk` - please challenge this if you think differently. Ideally, we will make these pallets available for developers to use via `polkadot-sdk` when all builds correctly with all features. - - ## Integration - - Runtime/Node devs will not be able to reference `pallet-revive*` pallets anymore via `polkadot-sdk`, so this is a breaking change, but if their usage is close to zero by polkadot devs we can tune it down and consider it a minor change for `polkadot-sdk`. - - ## Review Notes - - 1. If we think this requires a major bump for `polkadot-sdk`.. then we can't look at the PR as a fix for `stable2412` and associated published `polkadot-sdk` version. If we consider `pallet-revive` logic not being necessarily used by polkadot devs so not very breaking from usage perspective, then we can go with a minor bump and finally have a working `polkadot-sdk` for `stable2412. - - 2. We also considered fixing `pallet-revive` & `pallet-revive-eth-rpc` on `stable2412`, and publish correct versions on `crates.io`, and then follow with a `polkadot-sdk` publish that depends on them, and in the end `polkadot-sdk-parachain-template` workspace would build successfully based on `stable2412` crates, but this is more work which could've been done by now if it was necessary - e.g. in a scenario where actual developers were using them (instead of setting the crates with `publish = false`), so I think it makes sense to remove them for now from `polkadot-sdk`. - - 3. ~IMO this PR should be backported to stable2503 too. Releasing `polkadot-sdk` with `pallet-revive*` dependencies can be done with the June release if things are more stable by then.~ We actually want to fix `pallet-revive*` crates for stable2503, so must be kept in master and 2503 branch. + Fixes `polkadot-sdk` building for `stable2412`. It removes its dependency on `pallet-revive*` crates, which + aren't publishable as part of `stable2412` release & patch releases. Minor updates were brought to a bunch + of other crates to allow their compilation in test profile, to enable granular testing and rapid feedback + of crates for next `stable2412` patch releases. crates: - name: polkadot-sdk - bump: major + bump: minor - name: asset-hub-westend-runtime - bump: major + bump: minor - name: pallet-xcm-benchmarks - bump: major + bump: minor - name: polkadot-overseer - bump: major + bump: minor - name: polkadot - bump: major + bump: minor - name: bridge-runtime-common - bump: major + bump: minor - name: pallet-bridge-messages - bump: major + bump: minor - name: pallet-bridge-relayers - bump: major + bump: minor - name: pallet-xcm-bridge-hub - bump: major + bump: minor - name: snowbridge-pallet-inbound-queue - bump: major + bump: minor - name: snowbridge-pallet-outbound-queue - bump: major + bump: minor - name: snowbridge-pallet-system - bump: major + bump: minor - name: snowbridge-core - bump: major + bump: minor - name: pallet-collator-selection - bump: major + bump: minor - name: cumulus-pallet-parachain-system - bump: major + bump: minor - name: cumulus-pallet-xcmp-queue - bump: major + bump: minor - name: pallet-collective-content - bump: major + bump: minor - name: asset-hub-rococo-runtime - bump: major + bump: minor - name: bridge-hub-rococo-runtime - bump: major + bump: minor - name: bridge-hub-westend-runtime - bump: major + bump: minor - name: collectives-westend-runtime - bump: major + bump: minor - name: coretime-rococo-runtime - bump: major + bump: minor - name: coretime-westend-runtime - bump: major + bump: minor - name: people-rococo-runtime - bump: major + bump: minor - name: people-westend-runtime - bump: major + bump: minor - name: cumulus-primitives-storage-weight-reclaim - bump: major + bump: minor - name: polkadot-node-metrics - bump: major + bump: minor - name: polkadot-service - bump: major + bump: minor - name: polkadot-runtime-common - bump: major + bump: minor - name: polkadot-runtime-parachains - bump: major + bump: minor - name: rococo-runtime - bump: major + bump: minor - name: westend-runtime - bump: major + bump: minor - name: pallet-xcm - bump: major + bump: minor - name: staging-xcm-builder - bump: major + bump: minor - name: xcm-runtime-apis - bump: major + bump: minor - name: sc-client-db - bump: major + bump: minor - name: polkadot-sdk-frame - bump: major + bump: minor - name: pallet-alliance - bump: major + bump: minor - name: pallet-asset-conversion - bump: major + bump: minor - name: pallet-asset-conversion-ops - bump: major + bump: minor - name: pallet-asset-rate - bump: major + bump: minor - name: pallet-assets-freezer - bump: major + bump: minor - name: pallet-assets - bump: major + bump: minor - name: pallet-atomic-swap - bump: major + bump: minor - name: pallet-aura - bump: major + bump: minor - name: pallet-babe - bump: major + bump: minor - name: pallet-balances - bump: major + bump: minor - name: pallet-beefy-mmr - bump: major + bump: minor - name: pallet-beefy - bump: major + bump: minor - name: pallet-bounties - bump: major + bump: minor - name: pallet-child-bounties - bump: major + bump: minor - name: pallet-collective - bump: major + bump: minor - name: pallet-contracts - bump: major + bump: minor - name: pallet-conviction-voting - bump: major + bump: minor - name: pallet-delegated-staking - bump: major + bump: minor - name: pallet-democracy - bump: major + bump: minor - name: pallet-election-provider-multi-phase - bump: major + bump: minor - name: pallet-elections-phragmen - bump: major + bump: minor - name: pallet-dev-mode - bump: major + bump: minor - name: frame-executive - bump: major + bump: minor - name: pallet-fast-unstake - bump: major + bump: minor - name: pallet-glutton - bump: major + bump: minor - name: pallet-grandpa - bump: major + bump: minor - name: pallet-identity - bump: major + bump: minor - name: pallet-im-online - bump: major + bump: minor - name: pallet-indices - bump: major + bump: minor - name: pallet-lottery - bump: major + bump: minor - name: pallet-migrations - bump: major + bump: minor - name: pallet-multisig - bump: major + bump: minor - name: pallet-nft-fractionalization - bump: major + bump: minor - name: pallet-nfts - bump: major + bump: minor - name: pallet-nis - bump: major + bump: minor - name: pallet-nomination-pools-benchmarking - bump: major + bump: minor - name: pallet-offences-benchmarking - bump: major + bump: minor - name: pallet-parameters - bump: major + bump: minor - name: pallet-preimage - bump: major + bump: minor - name: pallet-proxy - bump: major + bump: minor - name: pallet-recovery - bump: major + bump: minor - name: pallet-referenda - bump: major + bump: minor - name: pallet-root-offences - bump: major + bump: minor - name: pallet-scheduler - bump: major + bump: minor - name: pallet-scored-pool - bump: major + bump: minor - name: pallet-session-benchmarking - bump: major + bump: minor - name: pallet-society - bump: major + bump: minor - name: pallet-staking - bump: major + bump: minor - name: pallet-state-trie-migration - bump: major + bump: minor - name: pallet-statement - bump: major + bump: minor - name: frame-support - bump: major + bump: minor - name: frame-support-procedural - bump: major + bump: minor - name: pallet-tips - bump: major + bump: minor - name: pallet-transaction-payment - bump: major + bump: minor - name: pallet-asset-conversion-tx-payment - bump: major + bump: minor - name: pallet-asset-tx-payment - bump: major + bump: minor - name: pallet-transaction-storage - bump: major + bump: minor - name: pallet-treasury - bump: major + bump: minor - name: pallet-uniques - bump: major + bump: minor - name: pallet-utility - bump: major + bump: minor - name: pallet-verify-signature - bump: major + bump: minor - name: pallet-vesting - bump: major + bump: minor - name: pallet-whitelist - bump: major + bump: minor - name: frame-benchmarking-cli - bump: major + bump: minor From 0572772cc5ce201349cb46870730d8b8d376fd47 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Fri, 21 Mar 2025 15:28:29 +0200 Subject: [PATCH 20/25] try frame-omni-bencher check w/o forklift Signed-off-by: Iulian Barbu --- .github/workflows/check-frame-omni-bencher.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-frame-omni-bencher.yml b/.github/workflows/check-frame-omni-bencher.yml index 924a8b7f712fe..53c893edad646 100644 --- a/.github/workflows/check-frame-omni-bencher.yml +++ b/.github/workflows/check-frame-omni-bencher.yml @@ -37,8 +37,8 @@ jobs: uses: actions/checkout@v4 - name: script run: | - forklift cargo build --locked --quiet --release -p asset-hub-westend-runtime --features runtime-benchmarks - forklift cargo run --locked --release -p frame-omni-bencher --quiet -- v1 benchmark pallet --runtime target/release/wbuild/asset-hub-westend-runtime/asset_hub_westend_runtime.compact.compressed.wasm --all --steps 2 --repeat 1 --quiet + cargo build --locked --quiet --release -p asset-hub-westend-runtime --features runtime-benchmarks + cargo run --locked --release -p frame-omni-bencher --quiet -- v1 benchmark pallet --runtime target/release/wbuild/asset-hub-westend-runtime/asset_hub_westend_runtime.compact.compressed.wasm --all --steps 2 --repeat 1 --quiet runtime-matrix: runs-on: ubuntu-latest @@ -83,7 +83,7 @@ jobs: run: | RUNTIME_BLOB_NAME=$(echo $PACKAGE_NAME | sed 's/-/_/g').compact.compressed.wasm RUNTIME_BLOB_PATH=./target/release/wbuild/$PACKAGE_NAME/$RUNTIME_BLOB_NAME - forklift cargo build --release --locked -p $PACKAGE_NAME -p frame-omni-bencher --features=${{ matrix.runtime.bench_features }} --quiet + cargo build --release --locked -p $PACKAGE_NAME -p frame-omni-bencher --features=${{ matrix.runtime.bench_features }} --quiet echo "Running short benchmarking for PACKAGE_NAME=$PACKAGE_NAME and RUNTIME_BLOB_PATH=$RUNTIME_BLOB_PATH" ls -lrt $RUNTIME_BLOB_PATH From 5408a10e8c799af8364119158ba3cb09bb586d30 Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Fri, 21 Mar 2025 17:03:41 +0200 Subject: [PATCH 21/25] Revert "try frame-omni-bencher check w/o forklift" This reverts commit 0572772cc5ce201349cb46870730d8b8d376fd47. --- .github/workflows/check-frame-omni-bencher.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-frame-omni-bencher.yml b/.github/workflows/check-frame-omni-bencher.yml index 53c893edad646..924a8b7f712fe 100644 --- a/.github/workflows/check-frame-omni-bencher.yml +++ b/.github/workflows/check-frame-omni-bencher.yml @@ -37,8 +37,8 @@ jobs: uses: actions/checkout@v4 - name: script run: | - cargo build --locked --quiet --release -p asset-hub-westend-runtime --features runtime-benchmarks - cargo run --locked --release -p frame-omni-bencher --quiet -- v1 benchmark pallet --runtime target/release/wbuild/asset-hub-westend-runtime/asset_hub_westend_runtime.compact.compressed.wasm --all --steps 2 --repeat 1 --quiet + forklift cargo build --locked --quiet --release -p asset-hub-westend-runtime --features runtime-benchmarks + forklift cargo run --locked --release -p frame-omni-bencher --quiet -- v1 benchmark pallet --runtime target/release/wbuild/asset-hub-westend-runtime/asset_hub_westend_runtime.compact.compressed.wasm --all --steps 2 --repeat 1 --quiet runtime-matrix: runs-on: ubuntu-latest @@ -83,7 +83,7 @@ jobs: run: | RUNTIME_BLOB_NAME=$(echo $PACKAGE_NAME | sed 's/-/_/g').compact.compressed.wasm RUNTIME_BLOB_PATH=./target/release/wbuild/$PACKAGE_NAME/$RUNTIME_BLOB_NAME - cargo build --release --locked -p $PACKAGE_NAME -p frame-omni-bencher --features=${{ matrix.runtime.bench_features }} --quiet + forklift cargo build --release --locked -p $PACKAGE_NAME -p frame-omni-bencher --features=${{ matrix.runtime.bench_features }} --quiet echo "Running short benchmarking for PACKAGE_NAME=$PACKAGE_NAME and RUNTIME_BLOB_PATH=$RUNTIME_BLOB_PATH" ls -lrt $RUNTIME_BLOB_PATH From 16ae3fabae76b3e792fe498cf4924d4298a62d2d Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Sat, 22 Mar 2025 01:54:41 +0200 Subject: [PATCH 22/25] add missing runtime-benchmarks dep? Signed-off-by: Iulian Barbu --- polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml index 502c5721203c8..cb005103e5239 100644 --- a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml +++ b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml @@ -54,12 +54,13 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", + "polkadot-primitives/runtime-benchmarks", + "polkadot-runtime-common/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "polkadot-primitives/runtime-benchmarks", - "polkadot-runtime-common/runtime-benchmarks", - "pallet-xcm/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" + "xcm/runtime-benchmarks", ] From cba07113c51d7a6699351318fe363895f238da4d Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Mon, 24 Mar 2025 08:14:00 +0000 Subject: [PATCH 23/25] Revert "add missing runtime-benchmarks dep?" This reverts commit 16ae3fabae76b3e792fe498cf4924d4298a62d2d. --- polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml index cb005103e5239..502c5721203c8 100644 --- a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml +++ b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml @@ -54,13 +54,12 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "pallet-xcm/runtime-benchmarks", - "polkadot-primitives/runtime-benchmarks", - "polkadot-runtime-common/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "xcm/runtime-benchmarks", + "polkadot-primitives/runtime-benchmarks", + "polkadot-runtime-common/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks" ] From e67fcd1ef43e2217f48eaadeee297151de9b40c4 Mon Sep 17 00:00:00 2001 From: Francisco Aguirre Date: Mon, 24 Mar 2025 11:10:32 -0300 Subject: [PATCH 24/25] fix(pallet-xcm-benchmarks): remove broken delivery helper --- .../pallet-xcm-benchmarks/src/fungible/benchmarking.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/benchmarking.rs b/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/benchmarking.rs index 9f7e179a36573..2cd8c47f55bad 100644 --- a/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/benchmarking.rs +++ b/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/benchmarking.rs @@ -261,15 +261,6 @@ benchmarks_instance_pallet! { // Add our asset to the holding. holding.push(asset.clone()); - let dest_location = T::valid_destination()?; - - // Ensure that origin can send to destination (e.g. setup delivery fees, ensure router setup, ...) - let (_, _) = T::DeliveryHelper::ensure_successful_delivery( - &Default::default(), - &dest_location, - FeeReason::ChargeFees, - ); - let mut executor = new_executor::(Default::default()); executor.set_holding(holding.into()); let instruction = Instruction::>::InitiateTeleport { From e9e6aeacdb408390894efda798bcdeea13ba26aa Mon Sep 17 00:00:00 2001 From: Iulian Barbu Date: Tue, 25 Mar 2025 14:42:37 +0000 Subject: [PATCH 25/25] taplo fmt Signed-off-by: Iulian Barbu --- bridges/bin/runtime-common/Cargo.toml | 8 +++---- bridges/modules/beefy/Cargo.toml | 4 ++-- bridges/modules/messages/Cargo.toml | 18 +++++++------- bridges/modules/relayers/Cargo.toml | 20 ++++++++-------- bridges/modules/xcm-bridge-hub/Cargo.toml | 22 ++++++++--------- .../pallets/inbound-queue/Cargo.toml | 4 ++-- .../pallets/outbound-queue/Cargo.toml | 6 ++--- bridges/snowbridge/pallets/system/Cargo.toml | 14 +++++------ bridges/snowbridge/primitives/core/Cargo.toml | 6 ++--- cumulus/pallets/collator-selection/Cargo.toml | 6 ++--- cumulus/pallets/parachain-system/Cargo.toml | 2 +- cumulus/pallets/xcmp-queue/Cargo.toml | 8 +++---- .../pallets/collective-content/Cargo.toml | 2 +- .../bridge-hubs/bridge-hub-rococo/Cargo.toml | 2 +- .../bridge-hubs/bridge-hub-westend/Cargo.toml | 2 +- cumulus/polkadot-parachain/Cargo.toml | 10 ++++---- .../storage-weight-reclaim/Cargo.toml | 4 ++-- cumulus/test/service/Cargo.toml | 2 +- polkadot/node/metrics/Cargo.toml | 2 +- polkadot/node/service/Cargo.toml | 2 +- polkadot/runtime/common/Cargo.toml | 2 +- polkadot/runtime/parachains/Cargo.toml | 2 +- polkadot/runtime/rococo/Cargo.toml | 2 +- polkadot/runtime/westend/Cargo.toml | 2 +- polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml | 10 ++++---- polkadot/xcm/pallet-xcm/Cargo.toml | 10 ++++---- polkadot/xcm/xcm-builder/Cargo.toml | 14 +++++------ polkadot/xcm/xcm-runtime-apis/Cargo.toml | 24 +++++++++---------- substrate/bin/node/cli/Cargo.toml | 2 +- substrate/client/db/Cargo.toml | 2 +- substrate/frame/Cargo.toml | 2 +- substrate/frame/alliance/Cargo.toml | 4 ++-- substrate/frame/asset-conversion/Cargo.toml | 10 ++++---- .../frame/asset-conversion/ops/Cargo.toml | 10 ++++---- substrate/frame/asset-rate/Cargo.toml | 4 ++-- substrate/frame/assets-freezer/Cargo.toml | 10 ++++---- substrate/frame/assets/Cargo.toml | 4 ++-- substrate/frame/atomic-swap/Cargo.toml | 2 +- substrate/frame/aura/Cargo.toml | 2 +- substrate/frame/babe/Cargo.toml | 16 ++++++------- substrate/frame/balances/Cargo.toml | 4 ++-- substrate/frame/beefy-mmr/Cargo.toml | 2 +- substrate/frame/beefy/Cargo.toml | 10 ++++---- substrate/frame/bounties/Cargo.toml | 4 ++-- substrate/frame/child-bounties/Cargo.toml | 4 ++-- substrate/frame/collective/Cargo.toml | 6 ++--- substrate/frame/contracts/Cargo.toml | 16 ++++++------- substrate/frame/conviction-voting/Cargo.toml | 8 +++---- substrate/frame/delegated-staking/Cargo.toml | 16 ++++++------- substrate/frame/democracy/Cargo.toml | 8 +++---- .../election-provider-multi-phase/Cargo.toml | 4 ++-- .../test-staking-e2e/Cargo.toml | 8 +++---- substrate/frame/elections-phragmen/Cargo.toml | 4 ++-- .../authorization-tx-extension/Cargo.toml | 8 +++---- substrate/frame/examples/basic/Cargo.toml | 2 +- substrate/frame/examples/dev-mode/Cargo.toml | 2 +- .../frame/examples/kitchensink/Cargo.toml | 2 +- substrate/frame/examples/split/Cargo.toml | 2 +- substrate/frame/executive/Cargo.toml | 4 ++-- substrate/frame/fast-unstake/Cargo.toml | 12 +++++----- substrate/frame/glutton/Cargo.toml | 4 ++-- substrate/frame/grandpa/Cargo.toml | 16 ++++++------- substrate/frame/identity/Cargo.toml | 4 ++-- substrate/frame/im-online/Cargo.toml | 2 +- substrate/frame/indices/Cargo.toml | 4 ++-- substrate/frame/lottery/Cargo.toml | 6 ++--- substrate/frame/migrations/Cargo.toml | 2 +- substrate/frame/multisig/Cargo.toml | 4 ++-- .../frame/nft-fractionalization/Cargo.toml | 4 ++-- substrate/frame/nfts/Cargo.toml | 4 ++-- substrate/frame/nis/Cargo.toml | 4 ++-- .../nomination-pools/benchmarking/Cargo.toml | 6 ++--- .../frame/offences/benchmarking/Cargo.toml | 2 +- substrate/frame/parameters/Cargo.toml | 8 +++---- substrate/frame/preimage/Cargo.toml | 4 ++-- substrate/frame/proxy/Cargo.toml | 4 ++-- substrate/frame/recovery/Cargo.toml | 4 ++-- substrate/frame/referenda/Cargo.toml | 8 +++---- substrate/frame/revive/Cargo.toml | 22 ++++++++--------- .../frame/revive/mock-network/Cargo.toml | 2 +- substrate/frame/root-offences/Cargo.toml | 14 +++++------ substrate/frame/scheduler/Cargo.toml | 6 ++--- substrate/frame/scored-pool/Cargo.toml | 2 +- .../frame/session/benchmarking/Cargo.toml | 6 ++--- substrate/frame/society/Cargo.toml | 6 ++--- substrate/frame/staking/Cargo.toml | 12 +++++----- .../frame/state-trie-migration/Cargo.toml | 4 ++-- substrate/frame/statement/Cargo.toml | 2 +- substrate/frame/support/Cargo.toml | 6 ++--- substrate/frame/support/procedural/Cargo.toml | 6 ++--- substrate/frame/tips/Cargo.toml | 4 ++-- .../frame/transaction-payment/Cargo.toml | 4 ++-- .../asset-conversion-tx-payment/Cargo.toml | 12 +++++----- .../asset-tx-payment/Cargo.toml | 12 +++++----- .../frame/transaction-storage/Cargo.toml | 2 +- substrate/frame/treasury/Cargo.toml | 4 ++-- substrate/frame/uniques/Cargo.toml | 4 ++-- substrate/frame/utility/Cargo.toml | 8 +++---- substrate/frame/verify-signature/Cargo.toml | 8 +++---- substrate/frame/vesting/Cargo.toml | 6 ++--- substrate/frame/whitelist/Cargo.toml | 8 +++---- substrate/test-utils/runtime/Cargo.toml | 2 +- .../utils/frame/benchmarking-cli/Cargo.toml | 2 +- .../solochain/pallets/template/Cargo.toml | 4 ++-- 104 files changed, 331 insertions(+), 331 deletions(-) diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml index 57d5bcb85d70f..59eca1f79788c 100644 --- a/bridges/bin/runtime-common/Cargo.toml +++ b/bridges/bin/runtime-common/Cargo.toml @@ -52,10 +52,12 @@ std = [ "bp-polkadot-core/std", "bp-relayers/std", "bp-runtime/std", + "bp-test-utils/std", "codec/std", "frame-support/std", "frame-system/std", "log/std", + "pallet-balances/std", "pallet-bridge-grandpa/std", "pallet-bridge-messages/std", "pallet-bridge-parachains/std", @@ -63,6 +65,7 @@ std = [ "pallet-transaction-payment/std", "pallet-utility/std", "scale-info/std", + "sp-core/std", "sp-io/std", "sp-runtime/std", "sp-std/std", @@ -70,14 +73,12 @@ std = [ "sp-weights/std", "tuplex/std", "xcm/std", - "bp-test-utils/std", - "pallet-balances/std", - "sp-core/std" ] runtime-benchmarks = [ "bp-runtime/test-helpers", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-bridge-grandpa/runtime-benchmarks", "pallet-bridge-messages/runtime-benchmarks", "pallet-bridge-messages/test-helpers", @@ -87,7 +88,6 @@ runtime-benchmarks = [ "pallet-utility/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-trie", - "pallet-balances/runtime-benchmarks" ] integrity-test = ["static_assertions"] test-helpers = ["bp-runtime/test-helpers", "sp-trie"] diff --git a/bridges/modules/beefy/Cargo.toml b/bridges/modules/beefy/Cargo.toml index 55e6c1bb3d63c..21bacdf77b485 100644 --- a/bridges/modules/beefy/Cargo.toml +++ b/bridges/modules/beefy/Cargo.toml @@ -51,7 +51,7 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-beefy-mmr/try-runtime", - "pallet-mmr/try-runtime" + "pallet-mmr/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml index 57e31e734c759..0acea8b817747 100644 --- a/bridges/modules/messages/Cargo.toml +++ b/bridges/modules/messages/Cargo.toml @@ -38,35 +38,35 @@ std = [ "bp-header-chain/std", "bp-messages/std", "bp-runtime/std", + "bp-test-utils/std", "codec/std", "frame-benchmarking/std", "frame-support/std", "frame-system/std", "log/std", + "pallet-balances/std", + "pallet-bridge-grandpa/std", "scale-info/std", + "sp-core/std", + "sp-io/std", "sp-runtime/std", "sp-std/std", "sp-trie/std", - "pallet-bridge-grandpa/std", - "bp-test-utils/std", - "pallet-balances/std", - "sp-core/std", - "sp-io/std" ] runtime-benchmarks = [ "bp-runtime/test-helpers", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-bridge-grandpa/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", + "pallet-balances/try-runtime", "pallet-bridge-grandpa/try-runtime", - "pallet-balances/try-runtime" + "sp-runtime/try-runtime", ] test-helpers = ["bp-runtime/test-helpers", "sp-trie"] diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml index cbcc424b9f260..1ebb6490a3676 100644 --- a/bridges/modules/relayers/Cargo.toml +++ b/bridges/modules/relayers/Cargo.toml @@ -45,8 +45,11 @@ default = ["std"] std = [ "bp-header-chain/std", "bp-messages/std", + "bp-parachains/std", + "bp-polkadot-core/std", "bp-relayers/std", "bp-runtime/std", + "bp-test-utils/std", "codec/std", "frame-benchmarking/std", "frame-support/std", @@ -56,38 +59,35 @@ std = [ "pallet-bridge-messages/std", "pallet-bridge-parachains/std", "pallet-transaction-payment/std", + "pallet-utility/std", "scale-info/std", "sp-arithmetic/std", + "sp-core/std", + "sp-io/std", "sp-runtime/std", "sp-std/std", - "bp-parachains/std", - "bp-polkadot-core/std", - "bp-test-utils/std", - "pallet-utility/std", - "sp-core/std", - "sp-io/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-bridge-grandpa/runtime-benchmarks", "pallet-bridge-messages/runtime-benchmarks", "pallet-bridge-parachains/runtime-benchmarks", "pallet-transaction-payment/runtime-benchmarks", + "pallet-utility/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "pallet-utility/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "pallet-bridge-grandpa/try-runtime", "pallet-bridge-messages/try-runtime", "pallet-bridge-parachains/try-runtime", "pallet-transaction-payment/try-runtime", + "pallet-utility/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime", - "pallet-utility/try-runtime" ] integrity-test = [] diff --git a/bridges/modules/xcm-bridge-hub/Cargo.toml b/bridges/modules/xcm-bridge-hub/Cargo.toml index af15bb9c17cc8..4d4d403ddc06e 100644 --- a/bridges/modules/xcm-bridge-hub/Cargo.toml +++ b/bridges/modules/xcm-bridge-hub/Cargo.toml @@ -39,44 +39,44 @@ polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default- [features] default = ["std"] std = [ + "bp-header-chain/std", "bp-messages/std", "bp-runtime/std", + "bp-xcm-bridge-hub-router/std", "bp-xcm-bridge-hub/std", "codec/std", "frame-support/std", "frame-system/std", "log/std", + "pallet-balances/std", "pallet-bridge-messages/std", + "pallet-xcm-bridge-hub-router/std", + "polkadot-parachain-primitives/std", "scale-info/std", "sp-core/std", + "sp-io/std", "sp-runtime/std", "sp-std/std", "xcm-builder/std", "xcm-executor/std", "xcm/std", - "pallet-xcm-bridge-hub-router/std", - "bp-header-chain/std", - "bp-xcm-bridge-hub-router/std", - "polkadot-parachain-primitives/std", - "pallet-balances/std", - "sp-io/std" ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-bridge-messages/runtime-benchmarks", + "pallet-xcm-bridge-hub-router/runtime-benchmarks", + "polkadot-parachain-primitives/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "pallet-xcm-bridge-hub-router/runtime-benchmarks", - "polkadot-parachain-primitives/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "pallet-bridge-messages/try-runtime", - "sp-runtime/try-runtime", "pallet-xcm-bridge-hub-router/try-runtime", - "pallet-balances/try-runtime" + "sp-runtime/try-runtime", ] diff --git a/bridges/snowbridge/pallets/inbound-queue/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml index 3f9a79b9e93e7..135a31d41d67c 100644 --- a/bridges/snowbridge/pallets/inbound-queue/Cargo.toml +++ b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml @@ -75,16 +75,16 @@ runtime-benchmarks = [ "hex-literal", "pallet-balances/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", + "snowbridge-pallet-ethereum-client/runtime-benchmarks", "snowbridge-pallet-inbound-queue-fixtures/runtime-benchmarks", "snowbridge-router-primitives/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "snowbridge-pallet-ethereum-client/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-balances/try-runtime", + "snowbridge-pallet-ethereum-client/try-runtime", "sp-runtime/try-runtime", - "snowbridge-pallet-ethereum-client/try-runtime" ] diff --git a/bridges/snowbridge/pallets/outbound-queue/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml index a14cbfa8a595a..8c8ab0b84d5b4 100644 --- a/bridges/snowbridge/pallets/outbound-queue/Cargo.toml +++ b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml @@ -44,6 +44,7 @@ std = [ "frame-benchmarking/std", "frame-support/std", "frame-system/std", + "pallet-message-queue/std", "scale-info/std", "serde/std", "snowbridge-core/std", @@ -53,7 +54,6 @@ std = [ "sp-io/std", "sp-runtime/std", "sp-std/std", - "pallet-message-queue/std" ] runtime-benchmarks = [ "bridge-hub-common/runtime-benchmarks", @@ -61,13 +61,13 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-message-queue/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-message-queue/try-runtime", "sp-runtime/try-runtime", - "pallet-message-queue/try-runtime" ] diff --git a/bridges/snowbridge/pallets/system/Cargo.toml b/bridges/snowbridge/pallets/system/Cargo.toml index 1dee989963714..6bb776e952222 100644 --- a/bridges/snowbridge/pallets/system/Cargo.toml +++ b/bridges/snowbridge/pallets/system/Cargo.toml @@ -61,19 +61,19 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks", + "polkadot-primitives/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", + "snowbridge-pallet-outbound-queue/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "snowbridge-pallet-outbound-queue/runtime-benchmarks", - "polkadot-primitives/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "pallet-message-queue/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", - "snowbridge-pallet-outbound-queue/try-runtime", "pallet-balances/try-runtime", - "pallet-message-queue/try-runtime" + "pallet-message-queue/try-runtime", + "snowbridge-pallet-outbound-queue/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/bridges/snowbridge/primitives/core/Cargo.toml b/bridges/snowbridge/primitives/core/Cargo.toml index 9160285f24ed9..cd70a1e8b52aa 100644 --- a/bridges/snowbridge/primitives/core/Cargo.toml +++ b/bridges/snowbridge/primitives/core/Cargo.toml @@ -55,10 +55,10 @@ std = [ ] serde = ["dep:serde", "scale-info/serde"] runtime-benchmarks = [ + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", "polkadot-parachain-primitives/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "frame-support/runtime-benchmarks", - "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks" ] diff --git a/cumulus/pallets/collator-selection/Cargo.toml b/cumulus/pallets/collator-selection/Cargo.toml index c3eb2bf4274e0..bac209f1417aa 100644 --- a/cumulus/pallets/collator-selection/Cargo.toml +++ b/cumulus/pallets/collator-selection/Cargo.toml @@ -45,9 +45,9 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-balances/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" ] std = [ "codec/std", @@ -67,10 +67,10 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-aura/try-runtime", "pallet-authorship/try-runtime", "pallet-balances/try-runtime", "pallet-session/try-runtime", + "pallet-timestamp/try-runtime", "sp-runtime/try-runtime", - "pallet-aura/try-runtime", - "pallet-timestamp/try-runtime" ] diff --git a/cumulus/pallets/parachain-system/Cargo.toml b/cumulus/pallets/parachain-system/Cargo.toml index 37479dbbfca86..9f9fc24da2ca9 100644 --- a/cumulus/pallets/parachain-system/Cargo.toml +++ b/cumulus/pallets/parachain-system/Cargo.toml @@ -94,6 +94,7 @@ std = [ runtime-benchmarks = [ "cumulus-primitives-core/runtime-benchmarks", + "cumulus-test-client/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", @@ -103,7 +104,6 @@ runtime-benchmarks = [ "polkadot-runtime-parachains/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", - "cumulus-test-client/runtime-benchmarks" ] try-runtime = [ diff --git a/cumulus/pallets/xcmp-queue/Cargo.toml b/cumulus/pallets/xcmp-queue/Cargo.toml index 5a3d2f9570d33..196f6e7993a53 100644 --- a/cumulus/pallets/xcmp-queue/Cargo.toml +++ b/cumulus/pallets/xcmp-queue/Cargo.toml @@ -63,27 +63,27 @@ std = [ ] runtime-benchmarks = [ + "cumulus-pallet-parachain-system/runtime-benchmarks", "cumulus-primitives-core/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-message-queue/runtime-benchmarks", "polkadot-runtime-common/runtime-benchmarks", "polkadot-runtime-parachains/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-pallet-parachain-system/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ + "cumulus-pallet-parachain-system/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "pallet-message-queue/try-runtime", "polkadot-runtime-common/try-runtime", "polkadot-runtime-parachains/try-runtime", "sp-runtime/try-runtime", - "cumulus-pallet-parachain-system/try-runtime", - "pallet-balances/try-runtime" ] bridging = ["bp-xcm-bridge-hub-router"] diff --git a/cumulus/parachains/pallets/collective-content/Cargo.toml b/cumulus/parachains/pallets/collective-content/Cargo.toml index 2bd369494cacf..d5f1f6be8cad3 100644 --- a/cumulus/parachains/pallets/collective-content/Cargo.toml +++ b/cumulus/parachains/pallets/collective-content/Cargo.toml @@ -43,6 +43,6 @@ std = [ "frame-system/std", "scale-info/std", "sp-core/std", + "sp-io/std", "sp-runtime/std", - "sp-io/std" ] diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml index 344a5c725610c..448b8b7769ccf 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml @@ -245,11 +245,11 @@ runtime-benchmarks = [ "snowbridge-pallet-system/runtime-benchmarks", "snowbridge-router-primitives/runtime-benchmarks", "snowbridge-runtime-common/runtime-benchmarks", + "snowbridge-runtime-test-common/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", "xcm-runtime-apis/runtime-benchmarks", - "snowbridge-runtime-test-common/runtime-benchmarks" ] try-runtime = [ diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml index 4faebc49e1933..4b4ef5f40db28 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml @@ -244,11 +244,11 @@ runtime-benchmarks = [ "snowbridge-pallet-system/runtime-benchmarks", "snowbridge-router-primitives/runtime-benchmarks", "snowbridge-runtime-common/runtime-benchmarks", + "snowbridge-runtime-test-common/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", "xcm-runtime-apis/runtime-benchmarks", - "snowbridge-runtime-test-common/runtime-benchmarks" ] try-runtime = [ diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml index 4acc9c072d813..b5993351639b5 100644 --- a/cumulus/polkadot-parachain/Cargo.toml +++ b/cumulus/polkadot-parachain/Cargo.toml @@ -64,7 +64,6 @@ substrate-build-script-utils.default-features = true [features] default = [] runtime-benchmarks = [ - "parachains-common/runtime-benchmarks", "asset-hub-rococo-runtime/runtime-benchmarks", "asset-hub-westend-runtime/runtime-benchmarks", "bridge-hub-rococo-runtime/runtime-benchmarks", @@ -73,14 +72,15 @@ runtime-benchmarks = [ "contracts-rococo-runtime/runtime-benchmarks", "coretime-rococo-runtime/runtime-benchmarks", "coretime-westend-runtime/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", "glutton-westend-runtime/runtime-benchmarks", + "parachains-common/runtime-benchmarks", + "penpal-runtime/runtime-benchmarks", "people-rococo-runtime/runtime-benchmarks", "people-westend-runtime/runtime-benchmarks", - "penpal-runtime/runtime-benchmarks", - "rococo-parachain-runtime/runtime-benchmarks", "polkadot-omni-node-lib/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks", - "sc-service/runtime-benchmarks" + "rococo-parachain-runtime/runtime-benchmarks", + "sc-service/runtime-benchmarks", ] try-runtime = [ "polkadot-omni-node-lib/try-runtime", diff --git a/cumulus/primitives/storage-weight-reclaim/Cargo.toml b/cumulus/primitives/storage-weight-reclaim/Cargo.toml index 2a662effc4eb3..b48ab5756e48e 100644 --- a/cumulus/primitives/storage-weight-reclaim/Cargo.toml +++ b/cumulus/primitives/storage-weight-reclaim/Cargo.toml @@ -37,7 +37,7 @@ std = [ "frame-system/std", "log/std", "scale-info/std", - "sp-runtime/std", "sp-io/std", - "sp-trie/std" + "sp-runtime/std", + "sp-trie/std", ] diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml index 1e6cfd56b6860..1e3f676d95739 100644 --- a/cumulus/test/service/Cargo.toml +++ b/cumulus/test/service/Cargo.toml @@ -155,6 +155,7 @@ substrate-test-utils = { path = "../../../substrate/test-utils" } runtime-benchmarks = [ "cumulus-pallet-parachain-system/runtime-benchmarks", "cumulus-primitives-core/runtime-benchmarks", + "cumulus-test-client/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-transaction-payment/runtime-benchmarks", @@ -165,7 +166,6 @@ runtime-benchmarks = [ "polkadot-test-service/runtime-benchmarks", "sc-service/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "cumulus-test-client/runtime-benchmarks" ] [[bench]] diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml index 5cb181d545826..0ca7c12b52193 100644 --- a/polkadot/node/metrics/Cargo.toml +++ b/polkadot/node/metrics/Cargo.toml @@ -48,6 +48,6 @@ default = [] runtime-metrics = [] runtime-benchmarks = [ "polkadot-primitives/runtime-benchmarks", + "polkadot-test-service/runtime-benchmarks", "sc-service/runtime-benchmarks", - "polkadot-test-service/runtime-benchmarks" ] diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml index 7b43f11bbd9a7..257ddfe0e27cc 100644 --- a/polkadot/node/service/Cargo.toml +++ b/polkadot/node/service/Cargo.toml @@ -248,12 +248,12 @@ runtime-benchmarks = [ "pallet-transaction-payment/runtime-benchmarks", "polkadot-primitives/runtime-benchmarks", "polkadot-runtime-parachains/runtime-benchmarks", + "polkadot-test-client/runtime-benchmarks", "rococo-runtime?/runtime-benchmarks", "sc-service/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "westend-runtime?/runtime-benchmarks", "xcm-runtime-apis/runtime-benchmarks", - "polkadot-test-client/runtime-benchmarks" ] try-runtime = [ "frame-system/try-runtime", diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml index af2325ad2aa1b..91fd669fd8873 100644 --- a/polkadot/runtime/common/Cargo.toml +++ b/polkadot/runtime/common/Cargo.toml @@ -138,6 +138,7 @@ runtime-benchmarks = [ ] try-runtime = [ "frame-election-provider-support/try-runtime", + "frame-support-test/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", "pallet-asset-rate/try-runtime", @@ -156,5 +157,4 @@ try-runtime = [ "pallet-vesting/try-runtime", "polkadot-runtime-parachains/try-runtime", "sp-runtime/try-runtime", - "frame-support-test/try-runtime" ] diff --git a/polkadot/runtime/parachains/Cargo.toml b/polkadot/runtime/parachains/Cargo.toml index 852ac94c76a0d..793b59d876c26 100644 --- a/polkadot/runtime/parachains/Cargo.toml +++ b/polkadot/runtime/parachains/Cargo.toml @@ -137,6 +137,7 @@ runtime-benchmarks = [ "xcm-executor/runtime-benchmarks", ] try-runtime = [ + "frame-support-test/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", "pallet-authority-discovery/try-runtime", @@ -151,7 +152,6 @@ try-runtime = [ "pallet-timestamp/try-runtime", "pallet-vesting/try-runtime", "sp-runtime/try-runtime", - "frame-support-test/try-runtime" ] runtime-metrics = [ "polkadot-runtime-metrics/runtime-metrics", diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml index 2fc4550c904cd..ed8efd43e691c 100644 --- a/polkadot/runtime/rococo/Cargo.toml +++ b/polkadot/runtime/rococo/Cargo.toml @@ -207,6 +207,7 @@ std = [ "sp-session/std", "sp-staking/std", "sp-storage/std", + "sp-tracing/std", "sp-transaction-pool/std", "sp-version/std", "substrate-wasm-builder", @@ -214,7 +215,6 @@ std = [ "xcm-executor/std", "xcm-runtime-apis/std", "xcm/std", - "sp-tracing/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml index ecb5fc99ba0dc..ca877a520609f 100644 --- a/polkadot/runtime/westend/Cargo.toml +++ b/polkadot/runtime/westend/Cargo.toml @@ -224,6 +224,7 @@ std = [ "sp-session/std", "sp-staking/std", "sp-storage/std", + "sp-tracing/std", "sp-transaction-pool/std", "sp-version/std", "westend-runtime-constants/std", @@ -231,7 +232,6 @@ std = [ "xcm-executor/std", "xcm-runtime-apis/std", "xcm/std", - "sp-tracing/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml index 502c5721203c8..5c335b05b87b1 100644 --- a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml +++ b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml @@ -54,12 +54,12 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", + "polkadot-primitives/runtime-benchmarks", + "polkadot-runtime-common/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "polkadot-primitives/runtime-benchmarks", - "polkadot-runtime-common/runtime-benchmarks", - "pallet-xcm/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] diff --git a/polkadot/xcm/pallet-xcm/Cargo.toml b/polkadot/xcm/pallet-xcm/Cargo.toml index cd31aa40293cd..0386e706a2288 100644 --- a/polkadot/xcm/pallet-xcm/Cargo.toml +++ b/polkadot/xcm/pallet-xcm/Cargo.toml @@ -56,20 +56,20 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", "pallet-balances/runtime-benchmarks", + "polkadot-parachain-primitives/runtime-benchmarks", + "polkadot-runtime-parachains/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", "xcm-runtime-apis/runtime-benchmarks", - "polkadot-parachain-primitives/runtime-benchmarks", - "polkadot-runtime-parachains/runtime-benchmarks", - "pallet-assets/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-assets/try-runtime", "pallet-balances/try-runtime", - "sp-runtime/try-runtime", "polkadot-runtime-parachains/try-runtime", - "pallet-assets/try-runtime" + "sp-runtime/try-runtime", ] diff --git a/polkadot/xcm/xcm-builder/Cargo.toml b/polkadot/xcm/xcm-builder/Cargo.toml index f886eb57875c1..bc0392c1c97c7 100644 --- a/polkadot/xcm/xcm-builder/Cargo.toml +++ b/polkadot/xcm/xcm-builder/Cargo.toml @@ -44,17 +44,17 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-asset-conversion/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-salary/runtime-benchmarks", "pallet-transaction-payment/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", "polkadot-parachain-primitives/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", - "xcm-executor/runtime-benchmarks", "polkadot-primitives/runtime-benchmarks", "polkadot-runtime-parachains/runtime-benchmarks", "polkadot-test-runtime/runtime-benchmarks", - "pallet-xcm/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "pallet-salary/runtime-benchmarks" + "sp-runtime/runtime-benchmarks", + "xcm-executor/runtime-benchmarks", ] std = [ "codec/std", @@ -64,6 +64,7 @@ std = [ "pallet-asset-conversion/std", "pallet-transaction-payment/std", "polkadot-parachain-primitives/std", + "primitive-types/std", "scale-info/std", "sp-arithmetic/std", "sp-io/std", @@ -71,5 +72,4 @@ std = [ "sp-weights/std", "xcm-executor/std", "xcm/std", - "primitive-types/std" ] diff --git a/polkadot/xcm/xcm-runtime-apis/Cargo.toml b/polkadot/xcm/xcm-runtime-apis/Cargo.toml index ba87fa38a4b1f..034056346edf2 100644 --- a/polkadot/xcm/xcm-runtime-apis/Cargo.toml +++ b/polkadot/xcm/xcm-runtime-apis/Cargo.toml @@ -36,27 +36,27 @@ sp-tracing = { default-features = true, path = "../../../substrate/primitives/tr default = ["std"] std = [ "codec/std", + "frame-executive/std", "frame-support/std", + "frame-system/std", + "log/std", + "pallet-assets/std", + "pallet-balances/std", + "pallet-xcm/std", "scale-info/std", "sp-api/std", + "sp-io/std", "sp-weights/std", + "xcm-builder/std", "xcm-executor/std", "xcm/std", - "pallet-xcm/std", - "xcm-builder/std", - "pallet-assets/std", - "pallet-balances/std", - "frame-executive/std", - "frame-system/std", - "sp-io/std", - "log/std" ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", - "xcm-executor/runtime-benchmarks", - "pallet-xcm/runtime-benchmarks", - "xcm-builder/runtime-benchmarks", + "frame-system/runtime-benchmarks", "pallet-assets/runtime-benchmarks", "pallet-balances/runtime-benchmarks", - "frame-system/runtime-benchmarks" + "pallet-xcm/runtime-benchmarks", + "xcm-builder/runtime-benchmarks", + "xcm-executor/runtime-benchmarks", ] diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml index 3f3654472aa83..c08a85b1b51be 100644 --- a/substrate/bin/node/cli/Cargo.toml +++ b/substrate/bin/node/cli/Cargo.toml @@ -94,7 +94,7 @@ runtime-benchmarks = [ try-runtime = [ "kitchensink-runtime/try-runtime", "polkadot-sdk/try-runtime", - "substrate-cli-test-utils/try-runtime" + "substrate-cli-test-utils/try-runtime", ] [[bench]] diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml index 9c3d9a1877db5..d27c72de24489 100644 --- a/substrate/client/db/Cargo.toml +++ b/substrate/client/db/Cargo.toml @@ -62,8 +62,8 @@ array-bytes = { workspace = true, default-features = true } default = [] test-helpers = [] runtime-benchmarks = [ + "kitchensink-runtime/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "kitchensink-runtime/runtime-benchmarks" ] rocksdb = ["kvdb-rocksdb"] diff --git a/substrate/frame/Cargo.toml b/substrate/frame/Cargo.toml index 2692b7a9a6caa..bbfb61fec3fd7 100644 --- a/substrate/frame/Cargo.toml +++ b/substrate/frame/Cargo.toml @@ -113,6 +113,6 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "frame-try-runtime/try-runtime", + "pallet-examples/try-runtime", "sp-runtime/try-runtime", - "pallet-examples/try-runtime" ] diff --git a/substrate/frame/alliance/Cargo.toml b/substrate/frame/alliance/Cargo.toml index ae692bb78eb7e..fcc8df2e8a0e7 100644 --- a/substrate/frame/alliance/Cargo.toml +++ b/substrate/frame/alliance/Cargo.toml @@ -58,17 +58,17 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-collective/runtime-benchmarks", "pallet-identity/runtime-benchmarks", "sp-crypto-hashing", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "pallet-collective?/try-runtime", "pallet-identity/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/asset-conversion/Cargo.toml b/substrate/frame/asset-conversion/Cargo.toml index e29f549e90d67..cf3ce3e258250 100644 --- a/substrate/frame/asset-conversion/Cargo.toml +++ b/substrate/frame/asset-conversion/Cargo.toml @@ -41,26 +41,26 @@ std = [ "frame-support/std", "frame-system/std", "log/std", + "primitive-types/std", "scale-info/std", "sp-api/std", "sp-arithmetic/std", "sp-core/std", "sp-io/std", "sp-runtime/std", - "primitive-types/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" + "pallet-balances/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-assets/try-runtime", - "pallet-balances/try-runtime" + "pallet-balances/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/asset-conversion/ops/Cargo.toml b/substrate/frame/asset-conversion/ops/Cargo.toml index 4778f973b1504..d72275868d58b 100644 --- a/substrate/frame/asset-conversion/ops/Cargo.toml +++ b/substrate/frame/asset-conversion/ops/Cargo.toml @@ -41,27 +41,27 @@ std = [ "frame-system/std", "log/std", "pallet-asset-conversion/std", + "primitive-types/std", "scale-info/std", "sp-arithmetic/std", "sp-core/std", "sp-io/std", "sp-runtime/std", - "primitive-types/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-asset-conversion/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" + "pallet-balances/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-asset-conversion/try-runtime", - "sp-runtime/try-runtime", "pallet-assets/try-runtime", - "pallet-balances/try-runtime" + "pallet-balances/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/asset-rate/Cargo.toml b/substrate/frame/asset-rate/Cargo.toml index f08e98dd0825b..cf186342df476 100644 --- a/substrate/frame/asset-rate/Cargo.toml +++ b/substrate/frame/asset-rate/Cargo.toml @@ -45,13 +45,13 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-core", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/assets-freezer/Cargo.toml b/substrate/frame/assets-freezer/Cargo.toml index 4826fcfa298ed..b784f2f34b03a 100644 --- a/substrate/frame/assets-freezer/Cargo.toml +++ b/substrate/frame/assets-freezer/Cargo.toml @@ -38,24 +38,24 @@ std = [ "frame-system/std", "log/std", "pallet-assets/std", - "scale-info/std", - "sp-runtime/std", "pallet-balances/std", + "scale-info/std", "sp-core/std", - "sp-io/std" + "sp-io/std", + "sp-runtime/std", ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-assets/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/assets/Cargo.toml b/substrate/frame/assets/Cargo.toml index d80885db7aa0e..929ffb4f0d309 100644 --- a/substrate/frame/assets/Cargo.toml +++ b/substrate/frame/assets/Cargo.toml @@ -46,12 +46,12 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/atomic-swap/Cargo.toml b/substrate/frame/atomic-swap/Cargo.toml index 6101ee92d240c..680ac04fee9cc 100644 --- a/substrate/frame/atomic-swap/Cargo.toml +++ b/substrate/frame/atomic-swap/Cargo.toml @@ -41,6 +41,6 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/aura/Cargo.toml b/substrate/frame/aura/Cargo.toml index f28ba8095e7eb..46100bbab2215 100644 --- a/substrate/frame/aura/Cargo.toml +++ b/substrate/frame/aura/Cargo.toml @@ -41,8 +41,8 @@ std = [ "scale-info/std", "sp-application-crypto/std", "sp-consensus-aura/std", + "sp-core/std", "sp-runtime/std", - "sp-core/std" ] try-runtime = [ "frame-support/try-runtime", diff --git a/substrate/frame/babe/Cargo.toml b/substrate/frame/babe/Cargo.toml index e48ccaf7718cc..4083409c45103 100644 --- a/substrate/frame/babe/Cargo.toml +++ b/substrate/frame/babe/Cargo.toml @@ -63,25 +63,25 @@ std = [ ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", + "frame-election-provider-support/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-offences/runtime-benchmarks", + "pallet-staking/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "frame-election-provider-support/runtime-benchmarks", - "pallet-offences/runtime-benchmarks", - "pallet-staking/runtime-benchmarks" ] try-runtime = [ + "frame-election-provider-support/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", "pallet-authorship/try-runtime", + "pallet-balances/try-runtime", + "pallet-offences/try-runtime", "pallet-session/try-runtime", + "pallet-staking/try-runtime", "pallet-timestamp/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime", - "frame-election-provider-support/try-runtime", - "pallet-offences/try-runtime", - "pallet-staking/try-runtime" ] diff --git a/substrate/frame/balances/Cargo.toml b/substrate/frame/balances/Cargo.toml index 10f310efc4859..1c0590066f496 100644 --- a/substrate/frame/balances/Cargo.toml +++ b/substrate/frame/balances/Cargo.toml @@ -49,12 +49,12 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-transaction-payment/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-transaction-payment/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-transaction-payment/try-runtime", "sp-runtime/try-runtime", - "pallet-transaction-payment/try-runtime" ] diff --git a/substrate/frame/beefy-mmr/Cargo.toml b/substrate/frame/beefy-mmr/Cargo.toml index 489ed809363c9..487f4b3e913e1 100644 --- a/substrate/frame/beefy-mmr/Cargo.toml +++ b/substrate/frame/beefy-mmr/Cargo.toml @@ -71,5 +71,5 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "pallet-mmr/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "sp-staking/runtime-benchmarks" + "sp-staking/runtime-benchmarks", ] diff --git a/substrate/frame/beefy/Cargo.toml b/substrate/frame/beefy/Cargo.toml index 6a4f0c083670c..7e161069fa8a0 100644 --- a/substrate/frame/beefy/Cargo.toml +++ b/substrate/frame/beefy/Cargo.toml @@ -52,17 +52,17 @@ std = [ "sp-runtime/std", "sp-session/std", "sp-staking/std", - "sp-state-machine/std" + "sp-state-machine/std", ] try-runtime = [ + "frame-election-provider-support/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", "pallet-authorship/try-runtime", - "pallet-session/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", - "frame-election-provider-support/try-runtime", "pallet-offences/try-runtime", + "pallet-session/try-runtime", "pallet-staking/try-runtime", - "pallet-timestamp/try-runtime" + "pallet-timestamp/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/bounties/Cargo.toml b/substrate/frame/bounties/Cargo.toml index 528772bd8cf70..52be04034581e 100644 --- a/substrate/frame/bounties/Cargo.toml +++ b/substrate/frame/bounties/Cargo.toml @@ -50,14 +50,14 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "pallet-treasury/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/child-bounties/Cargo.toml b/substrate/frame/child-bounties/Cargo.toml index f244892a041fe..b83715ae8a1c9 100644 --- a/substrate/frame/child-bounties/Cargo.toml +++ b/substrate/frame/child-bounties/Cargo.toml @@ -53,16 +53,16 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-bounties/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "pallet-bounties/try-runtime", "pallet-treasury/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/collective/Cargo.toml b/substrate/frame/collective/Cargo.toml index 29a14f2843201..f09280ff309d3 100644 --- a/substrate/frame/collective/Cargo.toml +++ b/substrate/frame/collective/Cargo.toml @@ -38,22 +38,22 @@ std = [ "frame-support/std", "frame-system/std", "log/std", + "pallet-balances/std", "scale-info/std", "sp-core/std", "sp-io/std", "sp-runtime/std", - "pallet-balances/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml index bb4ebe268b1ad..185f46cb8038c 100644 --- a/substrate/frame/contracts/Cargo.toml +++ b/substrate/frame/contracts/Cargo.toml @@ -104,27 +104,27 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", "pallet-balances/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks", + "pallet-proxy/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", + "pallet-utility/runtime-benchmarks", "rand", "rand_pcg", "sp-runtime/runtime-benchmarks", "wasm-instrument", "xcm-builder/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", - "pallet-message-queue/runtime-benchmarks", - "pallet-proxy/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks", - "pallet-utility/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "pallet-balances/try-runtime", - "sp-runtime/try-runtime", "pallet-assets/try-runtime", + "pallet-balances/try-runtime", "pallet-insecure-randomness-collective-flip/try-runtime", "pallet-message-queue/try-runtime", "pallet-proxy/try-runtime", "pallet-timestamp/try-runtime", - "pallet-utility/try-runtime" + "pallet-utility/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/conviction-voting/Cargo.toml b/substrate/frame/conviction-voting/Cargo.toml index 2be20b9c7cd16..94a8d39954577 100644 --- a/substrate/frame/conviction-voting/Cargo.toml +++ b/substrate/frame/conviction-voting/Cargo.toml @@ -50,14 +50,14 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", "pallet-balances/runtime-benchmarks", - "pallet-scheduler/runtime-benchmarks" + "pallet-scheduler/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", - "pallet-scheduler/try-runtime" + "pallet-scheduler/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/delegated-staking/Cargo.toml b/substrate/frame/delegated-staking/Cargo.toml index 6df75ec589699..e0a8b1775e844 100644 --- a/substrate/frame/delegated-staking/Cargo.toml +++ b/substrate/frame/delegated-staking/Cargo.toml @@ -37,6 +37,7 @@ frame-election-provider-support = { path = "../election-provider-support", defau default = ["std"] std = [ "codec/std", + "frame-election-provider-support/std", "frame-support/std", "frame-system/std", "log/std", @@ -44,26 +45,25 @@ std = [ "sp-io/std", "sp-runtime/std", "sp-staking/std", - "frame-election-provider-support/std" ] runtime-benchmarks = [ + "frame-election-provider-support/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", - "sp-staking/runtime-benchmarks", "pallet-balances/runtime-benchmarks", - "frame-election-provider-support/runtime-benchmarks", "pallet-nomination-pools/runtime-benchmarks", "pallet-staking/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" + "pallet-timestamp/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", + "sp-staking/runtime-benchmarks", ] try-runtime = [ + "frame-election-provider-support/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", - "frame-election-provider-support/try-runtime", "pallet-nomination-pools/try-runtime", "pallet-staking/try-runtime", - "pallet-timestamp/try-runtime" + "pallet-timestamp/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/democracy/Cargo.toml b/substrate/frame/democracy/Cargo.toml index 49d448fb1c82d..e8c792eb84f8e 100644 --- a/substrate/frame/democracy/Cargo.toml +++ b/substrate/frame/democracy/Cargo.toml @@ -52,16 +52,16 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-preimage/runtime-benchmarks", - "pallet-scheduler/runtime-benchmarks" + "pallet-scheduler/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", "pallet-preimage/try-runtime", - "pallet-scheduler/try-runtime" + "pallet-scheduler/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/election-provider-multi-phase/Cargo.toml b/substrate/frame/election-provider-multi-phase/Cargo.toml index f57f5bc140d9b..da3169fa1ddb7 100644 --- a/substrate/frame/election-provider-multi-phase/Cargo.toml +++ b/substrate/frame/election-provider-multi-phase/Cargo.toml @@ -69,16 +69,16 @@ runtime-benchmarks = [ "frame-election-provider-support/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-election-provider-support-benchmarking?/runtime-benchmarks", "rand", "sp-runtime/runtime-benchmarks", "strum", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-election-provider-support/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml b/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml index 47df71ecbdd2f..6bc699617ff22 100644 --- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml +++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml @@ -43,15 +43,15 @@ pallet-session = { default-features = true, path = "../../session" } [features] try-runtime = [ + "frame-election-provider-support/try-runtime", + "frame-support/try-runtime", + "frame-system/try-runtime", "pallet-bags-list/try-runtime", "pallet-balances/try-runtime", "pallet-election-provider-multi-phase/try-runtime", - "frame-election-provider-support/try-runtime", "pallet-nomination-pools/try-runtime", "pallet-session/try-runtime", "pallet-staking/try-runtime", - "frame-support/try-runtime", - "frame-system/try-runtime", "pallet-timestamp/try-runtime", - "sp-runtime/try-runtime" + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/elections-phragmen/Cargo.toml b/substrate/frame/elections-phragmen/Cargo.toml index bed130c26b7fa..d2b95a9a39cb2 100644 --- a/substrate/frame/elections-phragmen/Cargo.toml +++ b/substrate/frame/elections-phragmen/Cargo.toml @@ -55,13 +55,13 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/examples/authorization-tx-extension/Cargo.toml b/substrate/frame/examples/authorization-tx-extension/Cargo.toml index eef8ebb3848b5..a25d6eeee2c16 100644 --- a/substrate/frame/examples/authorization-tx-extension/Cargo.toml +++ b/substrate/frame/examples/authorization-tx-extension/Cargo.toml @@ -39,22 +39,22 @@ std = [ "frame-support/std", "frame-system/std", "log/std", + "pallet-verify-signature/std", "scale-info/std", + "sp-core/std", "sp-io/std", "sp-runtime/std", - "pallet-verify-signature/std", - "sp-core/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-verify-signature/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-verify-signature/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-verify-signature/try-runtime", "sp-runtime/try-runtime", - "pallet-verify-signature/try-runtime" ] diff --git a/substrate/frame/examples/basic/Cargo.toml b/substrate/frame/examples/basic/Cargo.toml index 0d8042d071318..1d19fc3243a74 100644 --- a/substrate/frame/examples/basic/Cargo.toml +++ b/substrate/frame/examples/basic/Cargo.toml @@ -40,9 +40,9 @@ std = [ "log/std", "pallet-balances/std", "scale-info/std", + "sp-core/std", "sp-io/std", "sp-runtime/std", - "sp-core/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/substrate/frame/examples/dev-mode/Cargo.toml b/substrate/frame/examples/dev-mode/Cargo.toml index 66b6d0ef206e5..fb491cf20ae86 100644 --- a/substrate/frame/examples/dev-mode/Cargo.toml +++ b/substrate/frame/examples/dev-mode/Cargo.toml @@ -37,9 +37,9 @@ std = [ "log/std", "pallet-balances/std", "scale-info/std", + "sp-core/std", "sp-io/std", "sp-runtime/std", - "sp-core/std" ] try-runtime = [ "frame-support/try-runtime", diff --git a/substrate/frame/examples/kitchensink/Cargo.toml b/substrate/frame/examples/kitchensink/Cargo.toml index 7a029b27d634f..5d0a491ff2fea 100644 --- a/substrate/frame/examples/kitchensink/Cargo.toml +++ b/substrate/frame/examples/kitchensink/Cargo.toml @@ -39,9 +39,9 @@ std = [ "log/std", "pallet-balances/std", "scale-info/std", + "sp-core/std", "sp-io/std", "sp-runtime/std", - "sp-core/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/substrate/frame/examples/split/Cargo.toml b/substrate/frame/examples/split/Cargo.toml index 62b753e28446c..9f0ec16e1edd4 100644 --- a/substrate/frame/examples/split/Cargo.toml +++ b/substrate/frame/examples/split/Cargo.toml @@ -37,8 +37,8 @@ std = [ "frame-system/std", "log/std", "scale-info/std", + "sp-core/std", "sp-io/std", - "sp-core/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/substrate/frame/executive/Cargo.toml b/substrate/frame/executive/Cargo.toml index 3cd73a07f127f..02978b74c3ee2 100644 --- a/substrate/frame/executive/Cargo.toml +++ b/substrate/frame/executive/Cargo.toml @@ -59,7 +59,7 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "frame-try-runtime/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", - "pallet-transaction-payment/try-runtime" + "pallet-transaction-payment/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/fast-unstake/Cargo.toml b/substrate/frame/fast-unstake/Cargo.toml index 75098cc33981a..18eaa6e186f41 100644 --- a/substrate/frame/fast-unstake/Cargo.toml +++ b/substrate/frame/fast-unstake/Cargo.toml @@ -47,28 +47,28 @@ std = [ "frame-system/std", "log/std", "scale-info/std", + "sp-core/std", "sp-io/std", "sp-runtime/std", "sp-staking/std", - "sp-core/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-election-provider-support/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", - "sp-staking/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-staking/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" + "pallet-timestamp/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", + "sp-staking/runtime-benchmarks", ] try-runtime = [ "frame-election-provider-support/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", "pallet-staking/try-runtime", - "pallet-timestamp/try-runtime" + "pallet-timestamp/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/glutton/Cargo.toml b/substrate/frame/glutton/Cargo.toml index 8a6127a243bc8..e2d261c50bcfc 100644 --- a/substrate/frame/glutton/Cargo.toml +++ b/substrate/frame/glutton/Cargo.toml @@ -49,14 +49,14 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml index 6b403708fc377..16b4b2244c371 100644 --- a/substrate/frame/grandpa/Cargo.toml +++ b/substrate/frame/grandpa/Cargo.toml @@ -64,25 +64,25 @@ std = [ ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", + "frame-election-provider-support/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", - "sp-staking/runtime-benchmarks", "pallet-balances/runtime-benchmarks", - "frame-election-provider-support/runtime-benchmarks", "pallet-offences/runtime-benchmarks", "pallet-staking/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" + "pallet-timestamp/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", + "sp-staking/runtime-benchmarks", ] try-runtime = [ + "frame-election-provider-support/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", "pallet-authorship/try-runtime", - "pallet-session/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", - "frame-election-provider-support/try-runtime", "pallet-offences/try-runtime", + "pallet-session/try-runtime", "pallet-staking/try-runtime", - "pallet-timestamp/try-runtime" + "pallet-timestamp/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/identity/Cargo.toml b/substrate/frame/identity/Cargo.toml index 9ce8d8a927862..d373e702d44b6 100644 --- a/substrate/frame/identity/Cargo.toml +++ b/substrate/frame/identity/Cargo.toml @@ -49,12 +49,12 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/im-online/Cargo.toml b/substrate/frame/im-online/Cargo.toml index f0b626922d598..693459f1cb763 100644 --- a/substrate/frame/im-online/Cargo.toml +++ b/substrate/frame/im-online/Cargo.toml @@ -59,6 +59,6 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-authorship/try-runtime", + "pallet-session/try-runtime", "sp-runtime/try-runtime", - "pallet-session/try-runtime" ] diff --git a/substrate/frame/indices/Cargo.toml b/substrate/frame/indices/Cargo.toml index 8af4a9141bdb6..8b77396baf21f 100644 --- a/substrate/frame/indices/Cargo.toml +++ b/substrate/frame/indices/Cargo.toml @@ -47,12 +47,12 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/lottery/Cargo.toml b/substrate/frame/lottery/Cargo.toml index d7ca697251261..9abd814a4d86f 100644 --- a/substrate/frame/lottery/Cargo.toml +++ b/substrate/frame/lottery/Cargo.toml @@ -44,13 +44,13 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ + "frame-support-test/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", - "frame-support-test/try-runtime" + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/migrations/Cargo.toml b/substrate/frame/migrations/Cargo.toml index c17012663d827..8843309df668c 100644 --- a/substrate/frame/migrations/Cargo.toml +++ b/substrate/frame/migrations/Cargo.toml @@ -55,8 +55,8 @@ runtime-benchmarks = [ ] try-runtime = [ + "frame-executive/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", "sp-runtime/try-runtime", - "frame-executive/try-runtime" ] diff --git a/substrate/frame/multisig/Cargo.toml b/substrate/frame/multisig/Cargo.toml index 93103ffebadaa..c24fec575fa08 100644 --- a/substrate/frame/multisig/Cargo.toml +++ b/substrate/frame/multisig/Cargo.toml @@ -36,9 +36,9 @@ std = [ ] runtime-benchmarks = [ "frame/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" + "pallet-balances/runtime-benchmarks", ] try-runtime = [ "frame/try-runtime", - "pallet-balances/try-runtime" + "pallet-balances/try-runtime", ] diff --git a/substrate/frame/nft-fractionalization/Cargo.toml b/substrate/frame/nft-fractionalization/Cargo.toml index 4a931e2834227..49238e10522f5 100644 --- a/substrate/frame/nft-fractionalization/Cargo.toml +++ b/substrate/frame/nft-fractionalization/Cargo.toml @@ -50,15 +50,15 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-nfts/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-assets/try-runtime", + "pallet-balances/try-runtime", "pallet-nfts/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/nfts/Cargo.toml b/substrate/frame/nfts/Cargo.toml index ab1b7da12753e..a82579d2f4ed9 100644 --- a/substrate/frame/nfts/Cargo.toml +++ b/substrate/frame/nfts/Cargo.toml @@ -49,12 +49,12 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/nis/Cargo.toml b/substrate/frame/nis/Cargo.toml index 63b3b856554a1..c980291fd38e1 100644 --- a/substrate/frame/nis/Cargo.toml +++ b/substrate/frame/nis/Cargo.toml @@ -45,12 +45,12 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/nomination-pools/benchmarking/Cargo.toml b/substrate/frame/nomination-pools/benchmarking/Cargo.toml index 37f6417932c8e..fe505ae2296dd 100644 --- a/substrate/frame/nomination-pools/benchmarking/Cargo.toml +++ b/substrate/frame/nomination-pools/benchmarking/Cargo.toml @@ -48,6 +48,7 @@ std = [ "frame-support/std", "frame-system/std", "pallet-bags-list/std", + "pallet-balances/std", "pallet-delegated-staking/std", "pallet-nomination-pools/std", "pallet-staking/std", @@ -55,7 +56,6 @@ std = [ "sp-runtime-interface/std", "sp-runtime/std", "sp-staking/std", - "pallet-balances/std" ] runtime-benchmarks = [ @@ -64,11 +64,11 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-bags-list/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-delegated-staking/runtime-benchmarks", "pallet-nomination-pools/runtime-benchmarks", "pallet-staking/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" ] diff --git a/substrate/frame/offences/benchmarking/Cargo.toml b/substrate/frame/offences/benchmarking/Cargo.toml index f80888328b46d..a53772c3887c5 100644 --- a/substrate/frame/offences/benchmarking/Cargo.toml +++ b/substrate/frame/offences/benchmarking/Cargo.toml @@ -71,7 +71,7 @@ runtime-benchmarks = [ "pallet-im-online/runtime-benchmarks", "pallet-offences/runtime-benchmarks", "pallet-staking/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" ] diff --git a/substrate/frame/parameters/Cargo.toml b/substrate/frame/parameters/Cargo.toml index 915c6b9ec0aab..02bc6eb385cdd 100644 --- a/substrate/frame/parameters/Cargo.toml +++ b/substrate/frame/parameters/Cargo.toml @@ -41,14 +41,14 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", "pallet-balances/runtime-benchmarks", - "pallet-example-basic/runtime-benchmarks" + "pallet-example-basic/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", - "pallet-example-basic/try-runtime" + "pallet-example-basic/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/preimage/Cargo.toml b/substrate/frame/preimage/Cargo.toml index 705b356054917..88ed7b93bf9ea 100644 --- a/substrate/frame/preimage/Cargo.toml +++ b/substrate/frame/preimage/Cargo.toml @@ -33,8 +33,8 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] std = [ "codec/std", @@ -50,6 +50,6 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/proxy/Cargo.toml b/substrate/frame/proxy/Cargo.toml index 8cb0aabb9b504..ab37372bc9cc6 100644 --- a/substrate/frame/proxy/Cargo.toml +++ b/substrate/frame/proxy/Cargo.toml @@ -34,10 +34,10 @@ std = [ runtime-benchmarks = [ "frame/runtime-benchmarks", "pallet-balances/runtime-benchmarks", - "pallet-utility/runtime-benchmarks" + "pallet-utility/runtime-benchmarks", ] try-runtime = [ "frame/try-runtime", "pallet-balances/try-runtime", - "pallet-utility/try-runtime" + "pallet-utility/try-runtime", ] diff --git a/substrate/frame/recovery/Cargo.toml b/substrate/frame/recovery/Cargo.toml index 11d9361ebb582..4256406e8bd2b 100644 --- a/substrate/frame/recovery/Cargo.toml +++ b/substrate/frame/recovery/Cargo.toml @@ -34,9 +34,9 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", 'frame-benchmarking', - "pallet-balances/runtime-benchmarks" ] std = [ "codec/std", @@ -50,6 +50,6 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/referenda/Cargo.toml b/substrate/frame/referenda/Cargo.toml index c53beb239c401..d8631bf0dd8ea 100644 --- a/substrate/frame/referenda/Cargo.toml +++ b/substrate/frame/referenda/Cargo.toml @@ -57,16 +57,16 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-preimage/runtime-benchmarks", - "pallet-scheduler/runtime-benchmarks" + "pallet-scheduler/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", "pallet-preimage/try-runtime", - "pallet-scheduler/try-runtime" + "pallet-scheduler/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml index 263f1d7bfe196..fcd88fde4c3f6 100644 --- a/substrate/frame/revive/Cargo.toml +++ b/substrate/frame/revive/Cargo.toml @@ -99,7 +99,9 @@ std = [ "polkavm/std", "rlp/std", "scale-info/std", + "secp256k1/std", "serde/std", + "serde_json/std", "sp-api/std", "sp-arithmetic/std", "sp-core/std", @@ -110,33 +112,31 @@ std = [ "subxt-signer", "xcm-builder/std", "xcm/std", - "secp256k1/std", - "serde_json/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", "pallet-balances/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks", + "pallet-proxy/runtime-benchmarks", "pallet-revive-fixtures", + "pallet-timestamp/runtime-benchmarks", "pallet-transaction-payment/runtime-benchmarks", + "pallet-utility/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", - "pallet-message-queue/runtime-benchmarks", - "pallet-proxy/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks", - "pallet-utility/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "pallet-balances/try-runtime", - "pallet-transaction-payment/try-runtime", - "sp-runtime/try-runtime", "pallet-assets/try-runtime", + "pallet-balances/try-runtime", "pallet-message-queue/try-runtime", "pallet-proxy/try-runtime", "pallet-timestamp/try-runtime", - "pallet-utility/try-runtime" + "pallet-transaction-payment/try-runtime", + "pallet-utility/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/revive/mock-network/Cargo.toml b/substrate/frame/revive/mock-network/Cargo.toml index 4bb68d0d2ee3f..705434b1f5a8e 100644 --- a/substrate/frame/revive/mock-network/Cargo.toml +++ b/substrate/frame/revive/mock-network/Cargo.toml @@ -72,6 +72,7 @@ std = [ "frame-system/std", "pallet-balances/std", "pallet-proxy/std", + "pallet-revive-fixtures/std", "pallet-revive/std", "pallet-timestamp/std", "pallet-utility/std", @@ -84,7 +85,6 @@ std = [ "sp-runtime/std", "xcm-executor/std", "xcm/std", - "pallet-revive-fixtures/std" ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", diff --git a/substrate/frame/root-offences/Cargo.toml b/substrate/frame/root-offences/Cargo.toml index 6f1f3e965dde4..838cbe87cdb97 100644 --- a/substrate/frame/root-offences/Cargo.toml +++ b/substrate/frame/root-offences/Cargo.toml @@ -38,24 +38,24 @@ frame-election-provider-support = { default-features = true, path = "../election [features] runtime-benchmarks = [ + "frame-election-provider-support/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-staking/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "frame-election-provider-support/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" ] try-runtime = [ + "frame-election-provider-support/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "pallet-session/try-runtime", "pallet-staking/try-runtime", + "pallet-timestamp/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime", - "frame-election-provider-support/try-runtime", - "pallet-timestamp/try-runtime" ] default = ["std"] std = [ @@ -65,7 +65,7 @@ std = [ "pallet-session/std", "pallet-staking/std", "scale-info/std", + "sp-io/std", "sp-runtime/std", "sp-staking/std", - "sp-io/std" ] diff --git a/substrate/frame/scheduler/Cargo.toml b/substrate/frame/scheduler/Cargo.toml index 5c120ad995176..19ace9275472f 100644 --- a/substrate/frame/scheduler/Cargo.toml +++ b/substrate/frame/scheduler/Cargo.toml @@ -36,8 +36,8 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-preimage/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-preimage/runtime-benchmarks" ] std = [ "codec/std", @@ -46,14 +46,14 @@ std = [ "frame-system/std", "log/std", "scale-info/std", + "sp-core/std", "sp-io/std", "sp-runtime/std", "sp-weights/std", - "sp-core/std" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-preimage/try-runtime", "sp-runtime/try-runtime", - "pallet-preimage/try-runtime" ] diff --git a/substrate/frame/scored-pool/Cargo.toml b/substrate/frame/scored-pool/Cargo.toml index d5c17226942c1..a9c986e6da3f0 100644 --- a/substrate/frame/scored-pool/Cargo.toml +++ b/substrate/frame/scored-pool/Cargo.toml @@ -40,6 +40,6 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/session/benchmarking/Cargo.toml b/substrate/frame/session/benchmarking/Cargo.toml index ffd311dd753eb..cd42c7119dfc2 100644 --- a/substrate/frame/session/benchmarking/Cargo.toml +++ b/substrate/frame/session/benchmarking/Cargo.toml @@ -51,11 +51,11 @@ std = [ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", + "frame-election-provider-support/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-staking/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "frame-election-provider-support/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" ] diff --git a/substrate/frame/society/Cargo.toml b/substrate/frame/society/Cargo.toml index 52f6be678eccf..0794d0d96605d 100644 --- a/substrate/frame/society/Cargo.toml +++ b/substrate/frame/society/Cargo.toml @@ -53,13 +53,13 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ + "frame-support-test/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", - "frame-support-test/try-runtime" + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/staking/Cargo.toml b/substrate/frame/staking/Cargo.toml index 25b227ebeb1c2..d772d62771697 100644 --- a/substrate/frame/staking/Cargo.toml +++ b/substrate/frame/staking/Cargo.toml @@ -71,21 +71,21 @@ runtime-benchmarks = [ "frame-election-provider-support/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-bags-list/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", "rand_chacha", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", - "pallet-bags-list/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" ] try-runtime = [ "frame-election-provider-support/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", "pallet-authorship/try-runtime", - "pallet-session/try-runtime", - "sp-runtime/try-runtime", "pallet-bags-list/try-runtime", "pallet-balances/try-runtime", - "pallet-timestamp/try-runtime" + "pallet-session/try-runtime", + "pallet-timestamp/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/state-trie-migration/Cargo.toml b/substrate/frame/state-trie-migration/Cargo.toml index de5f3c63820af..c6a37faee98b8 100644 --- a/substrate/frame/state-trie-migration/Cargo.toml +++ b/substrate/frame/state-trie-migration/Cargo.toml @@ -54,14 +54,14 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] remote-test = [ "remote-externalities", diff --git a/substrate/frame/statement/Cargo.toml b/substrate/frame/statement/Cargo.toml index c641135c5f962..51f179afffc7b 100644 --- a/substrate/frame/statement/Cargo.toml +++ b/substrate/frame/statement/Cargo.toml @@ -46,6 +46,6 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/support/Cargo.toml b/substrate/frame/support/Cargo.toml index 15ef46e2f4d36..095e7658c9909 100644 --- a/substrate/frame/support/Cargo.toml +++ b/substrate/frame/support/Cargo.toml @@ -96,20 +96,20 @@ std = [ "sp-staking/std", "sp-state-machine/std", "sp-std/std", + "sp-timestamp/std", "sp-tracing/std", "sp-trie/std", "sp-weights/std", - "sp-timestamp/std" ] runtime-benchmarks = [ + "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", - "frame-system/runtime-benchmarks" ] try-runtime = [ + "frame-system/try-runtime", "sp-debug-derive/force-debug", "sp-runtime/try-runtime", - "frame-system/try-runtime" ] experimental = ["frame-support-procedural/experimental"] # By default some types have documentation, `no-metadata-docs` allows to reduce the documentation diff --git a/substrate/frame/support/procedural/Cargo.toml b/substrate/frame/support/procedural/Cargo.toml index efe0d7b176202..257ac22e683ba 100644 --- a/substrate/frame/support/procedural/Cargo.toml +++ b/substrate/frame/support/procedural/Cargo.toml @@ -52,15 +52,15 @@ static_assertions = { workspace = true } [features] default = ["std"] std = [ - "sp-crypto-hashing/std", + "codec/std", "frame-support/std", "frame-system/std", + "scale-info/std", "sp-core/std", + "sp-crypto-hashing/std", "sp-io/std", "sp-metadata-ir/std", "sp-runtime/std", - "codec/std", - "scale-info/std" ] no-metadata-docs = [] experimental = [] diff --git a/substrate/frame/tips/Cargo.toml b/substrate/frame/tips/Cargo.toml index 8a4629f80e156..9371c6a7321fa 100644 --- a/substrate/frame/tips/Cargo.toml +++ b/substrate/frame/tips/Cargo.toml @@ -51,14 +51,14 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "pallet-treasury/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/transaction-payment/Cargo.toml b/substrate/frame/transaction-payment/Cargo.toml index 72f7ee01698d5..2ceedf3bd80f7 100644 --- a/substrate/frame/transaction-payment/Cargo.toml +++ b/substrate/frame/transaction-payment/Cargo.toml @@ -49,12 +49,12 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml index 03edb1921768a..964d35678f31e 100644 --- a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml +++ b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml @@ -42,27 +42,27 @@ std = [ "pallet-asset-conversion/std", "pallet-transaction-payment/std", "scale-info/std", - "sp-runtime/std", "sp-core/std", "sp-io/std", - "sp-storage/std" + "sp-runtime/std", + "sp-storage/std", ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-asset-conversion/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-transaction-payment/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-asset-conversion/try-runtime", + "pallet-assets/try-runtime", + "pallet-balances/try-runtime", "pallet-transaction-payment/try-runtime", "sp-runtime/try-runtime", - "pallet-assets/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml index a1074e935848c..24ce143492c3a 100644 --- a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml +++ b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml @@ -51,23 +51,23 @@ std = [ "sp-core/std", "sp-io/std", "sp-runtime/std", - "sp-storage/std" + "sp-storage/std", ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-transaction-payment/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "pallet-transaction-payment/try-runtime", - "sp-runtime/try-runtime", "pallet-assets/try-runtime", "pallet-authorship/try-runtime", - "pallet-balances/try-runtime" + "pallet-balances/try-runtime", + "pallet-transaction-payment/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/transaction-storage/Cargo.toml b/substrate/frame/transaction-storage/Cargo.toml index ca11494899c16..6181950893cf1 100644 --- a/substrate/frame/transaction-storage/Cargo.toml +++ b/substrate/frame/transaction-storage/Cargo.toml @@ -53,11 +53,11 @@ std = [ "pallet-balances/std", "scale-info/std", "serde", + "sp-core/std", "sp-inherents/std", "sp-io/std", "sp-runtime/std", "sp-transaction-storage-proof/std", - "sp-core/std" ] try-runtime = [ "frame-support/try-runtime", diff --git a/substrate/frame/treasury/Cargo.toml b/substrate/frame/treasury/Cargo.toml index e3bdc2d360d20..07635b67dcb38 100644 --- a/substrate/frame/treasury/Cargo.toml +++ b/substrate/frame/treasury/Cargo.toml @@ -57,13 +57,13 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-balances/runtime-benchmarks", + "pallet-utility/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-utility/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-balances/try-runtime", + "pallet-utility/try-runtime", "sp-runtime/try-runtime", - "pallet-utility/try-runtime" ] diff --git a/substrate/frame/uniques/Cargo.toml b/substrate/frame/uniques/Cargo.toml index bb479caf024d5..e07e5856a48ed 100644 --- a/substrate/frame/uniques/Cargo.toml +++ b/substrate/frame/uniques/Cargo.toml @@ -45,12 +45,12 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/utility/Cargo.toml b/substrate/frame/utility/Cargo.toml index 2714c38f3f309..02b6be324a4b0 100644 --- a/substrate/frame/utility/Cargo.toml +++ b/substrate/frame/utility/Cargo.toml @@ -48,17 +48,17 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-collective/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" + "pallet-timestamp/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", "pallet-collective/try-runtime", "pallet-root-testing/try-runtime", - "pallet-timestamp/try-runtime" + "pallet-timestamp/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/verify-signature/Cargo.toml b/substrate/frame/verify-signature/Cargo.toml index 2460416774fb0..85b56414da9d6 100644 --- a/substrate/frame/verify-signature/Cargo.toml +++ b/substrate/frame/verify-signature/Cargo.toml @@ -50,17 +50,17 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-collective/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks" + "pallet-timestamp/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", "pallet-collective/try-runtime", "pallet-root-testing/try-runtime", - "pallet-timestamp/try-runtime" + "pallet-timestamp/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/frame/vesting/Cargo.toml b/substrate/frame/vesting/Cargo.toml index 44fbd48a1b67a..cf3a96589618e 100644 --- a/substrate/frame/vesting/Cargo.toml +++ b/substrate/frame/vesting/Cargo.toml @@ -40,19 +40,19 @@ std = [ "frame-system/std", "log/std", "scale-info/std", + "sp-io/std", "sp-runtime/std", - "sp-io/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "pallet-balances/runtime-benchmarks" ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", "sp-runtime/try-runtime", - "pallet-balances/try-runtime" ] diff --git a/substrate/frame/whitelist/Cargo.toml b/substrate/frame/whitelist/Cargo.toml index c97e8b2d26a6c..76c4820f41dfd 100644 --- a/substrate/frame/whitelist/Cargo.toml +++ b/substrate/frame/whitelist/Cargo.toml @@ -45,14 +45,14 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", "pallet-balances/runtime-benchmarks", - "pallet-preimage/runtime-benchmarks" + "pallet-preimage/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime", "pallet-balances/try-runtime", - "pallet-preimage/try-runtime" + "pallet-preimage/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/substrate/test-utils/runtime/Cargo.toml b/substrate/test-utils/runtime/Cargo.toml index f851333a06b8c..6839b7c59f744 100644 --- a/substrate/test-utils/runtime/Cargo.toml +++ b/substrate/test-utils/runtime/Cargo.toml @@ -87,6 +87,7 @@ std = [ "pallet-timestamp/std", "sc-service", "scale-info/std", + "serde/std", "serde_json/std", "sp-api/std", "sp-application-crypto/std", @@ -111,7 +112,6 @@ std = [ "substrate-wasm-builder", "tracing/std", "trie-db/std", - "serde/std" ] # Special feature to disable logging diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml index 89f069c233da9..39bb980463a27 100644 --- a/substrate/utils/frame/benchmarking-cli/Cargo.toml +++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml @@ -118,6 +118,6 @@ runtime-benchmarks = [ "sc-client-db/runtime-benchmarks", "sc-service/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "westend-runtime/runtime-benchmarks" + "westend-runtime/runtime-benchmarks", ] rocksdb = ["sc-cli/rocksdb", "sc-client-db/rocksdb"] diff --git a/templates/solochain/pallets/template/Cargo.toml b/templates/solochain/pallets/template/Cargo.toml index b58657590cc71..106ff98fe02c6 100644 --- a/templates/solochain/pallets/template/Cargo.toml +++ b/templates/solochain/pallets/template/Cargo.toml @@ -41,10 +41,10 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks" + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", - "sp-runtime/try-runtime" + "sp-runtime/try-runtime", ]