From 03d25714d790d5408f733b537a4fc27591d8b60c Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Sat, 18 May 2024 12:20:47 +0200 Subject: [PATCH] Pull all dependencies to the workspace (#314) Changes: - Pull all dependencies to the workspace and add a CI check. - Fixup the crates that had differing dependency aliases. - Add CI check to keep deps in the workspace - Add Taplo config for TOML formatting (follow up: add CI check) This is a preliminary to updating to the new SDK version as we currently use conflicting aliases for a few packages while packages are not able to rename workspace deps, see https://github.com/rust-lang/cargo/issues/12546 This is a No-OP change, as can be verified with this: ```bash git checkout oty-fix-dependencies cargo tree -e features > oty.tree git checkout origin/main cargo tree -e features > main.tree diff main.tree oty.tree ``` - [x] Does not require a CHANGELOG entry --------- Signed-off-by: Oliver Tale-Yazdi Co-authored-by: ordian --- .cargo/config.toml | 46 ++++----- .config/taplo.toml | 29 ++++++ .github/workflows/check-features.yaml | 5 +- Cargo.toml | 94 +++++++++++++------ chain-spec-generator/Cargo.toml | 65 ++++++------- chain-spec-generator/src/relay_chain_specs.rs | 12 +-- .../bridge_hub_kusama_local_network.toml | 12 +-- .../bridge_hub_polkadot_local_network.toml | 14 +-- .../assets/asset-hub-kusama/Cargo.toml | 4 +- .../assets/asset-hub-polkadot/Cargo.toml | 4 +- .../bridges/bridge-hub-kusama/Cargo.toml | 2 +- .../bridges/bridge-hub-polkadot/Cargo.toml | 2 +- .../collectives-polkadot/Cargo.toml | 2 +- .../people/people-kusama/Cargo.toml | 4 +- .../parachains/testing/penpal/Cargo.toml | 6 +- .../emulated/chains/relays/kusama/Cargo.toml | 12 +-- .../chains/relays/polkadot/Cargo.toml | 12 +-- integration-tests/emulated/helpers/Cargo.toml | 2 +- .../kusama-polkadot-system/Cargo.toml | 14 +-- .../networks/kusama-system/Cargo.toml | 10 +- .../networks/polkadot-system/Cargo.toml | 10 +- .../tests/assets/asset-hub-kusama/Cargo.toml | 24 ++--- .../asset-hub-kusama/src/tests/treasury.rs | 2 +- .../assets/asset-hub-polkadot/Cargo.toml | 22 +++-- .../bridges/bridge-hub-kusama/Cargo.toml | 22 ++--- .../bridges/bridge-hub-polkadot/Cargo.toml | 22 ++--- .../collectives-polkadot/Cargo.toml | 28 +++--- .../tests/people/people-kusama/Cargo.toml | 18 ++-- relay/kusama/Cargo.toml | 84 ++++++++--------- relay/kusama/constants/Cargo.toml | 14 +-- relay/kusama/constants/src/lib.rs | 12 +-- relay/kusama/src/impls.rs | 6 +- relay/kusama/src/lib.rs | 78 +++++++-------- relay/kusama/src/tests.rs | 8 +- .../src/weights/runtime_common_auctions.rs | 8 +- .../src/weights/runtime_common_claims.rs | 8 +- .../src/weights/runtime_common_crowdloan.rs | 8 +- .../runtime_common_identity_migrator.rs | 8 +- .../weights/runtime_common_paras_registrar.rs | 8 +- .../src/weights/runtime_common_slots.rs | 8 +- relay/kusama/src/xcm_config.rs | 4 +- relay/polkadot/Cargo.toml | 84 ++++++++--------- relay/polkadot/constants/Cargo.toml | 14 +-- relay/polkadot/constants/src/lib.rs | 12 +-- relay/polkadot/src/impls.rs | 2 +- relay/polkadot/src/lib.rs | 84 +++++++++-------- .../src/weights/runtime_common_auctions.rs | 8 +- .../src/weights/runtime_common_claims.rs | 8 +- .../src/weights/runtime_common_crowdloan.rs | 8 +- .../weights/runtime_common_paras_registrar.rs | 8 +- .../src/weights/runtime_common_slots.rs | 8 +- relay/polkadot/src/xcm_config.rs | 8 +- .../asset-hubs/asset-hub-kusama/Cargo.toml | 60 ++++++------ .../asset-hub-kusama/primitives/Cargo.toml | 12 +-- .../asset-hubs/asset-hub-polkadot/Cargo.toml | 58 +++++++----- .../asset-hub-polkadot/primitives/Cargo.toml | 12 +-- .../bridge-hubs/bridge-hub-kusama/Cargo.toml | 62 ++++++------ .../bridge-hub-kusama/primitives/Cargo.toml | 10 +- .../bridge-hub-polkadot/Cargo.toml | 64 +++++++------ .../bridge-hub-polkadot/primitives/Cargo.toml | 12 +-- .../collectives-polkadot/Cargo.toml | 34 +++---- .../collectives-polkadot/constants/Cargo.toml | 2 +- system-parachains/constants/Cargo.toml | 6 +- .../coretime/coretime-kusama/Cargo.toml | 38 ++++---- system-parachains/encointer/Cargo.toml | 75 +++++++-------- .../gluttons/glutton-kusama/Cargo.toml | 24 ++--- .../people/people-kusama/Cargo.toml | 32 ++++--- 67 files changed, 793 insertions(+), 705 deletions(-) create mode 100644 .config/taplo.toml diff --git a/.cargo/config.toml b/.cargo/config.toml index 5f5b3717d3..df126cfef6 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -7,27 +7,27 @@ # RUSTFLAGS= cargo clippy [target.'cfg(feature = "cargo-clippy")'] rustflags = [ - "-Aclippy::all", - "-Dclippy::correctness", - "-Aclippy::if-same-then-else", - "-Asuspicious_double_ref_op", - "-Dclippy::complexity", - "-Aclippy::zero-prefixed-literal", # 00_1000_000 - "-Aclippy::type_complexity", # raison d'etre - "-Aclippy::nonminimal-bool", # maybe - "-Aclippy::borrowed-box", # Reasonable to fix this one - "-Aclippy::too-many-arguments", # (Turning this on would lead to) - "-Aclippy::unnecessary_cast", # Types may change - "-Aclippy::identity-op", # One case where we do 0 + - "-Aclippy::useless_conversion", # Types may change - "-Aclippy::unit_arg", # styalistic. - "-Aclippy::option-map-unit-fn", # styalistic - "-Aclippy::bind_instead_of_map", # styalistic - "-Aclippy::erasing_op", # E.g. 0 * DOLLARS - "-Aclippy::eq_op", # In tests we test equality. - "-Aclippy::while_immutable_condition", # false positives - "-Aclippy::needless_option_as_deref", # false positives - "-Aclippy::derivable_impls", # false positives - "-Aclippy::stable_sort_primitive", # prefer stable sort - "-Aclippy::extra-unused-type-parameters", # stylistic + "-Aclippy::all", + "-Aclippy::bind_instead_of_map", # stylistic + "-Aclippy::borrowed-box", # Reasonable to fix this one + "-Aclippy::derivable_impls", # false positives + "-Aclippy::eq_op", # In tests we test equality. + "-Aclippy::erasing_op", # E.g. 0 * DOLLARS + "-Aclippy::extra-unused-type-parameters", # stylistic + "-Aclippy::identity-op", # One case where we do 0 + + "-Aclippy::if-same-then-else", + "-Aclippy::needless_option_as_deref", # false positives + "-Aclippy::nonminimal-bool", # maybe + "-Aclippy::option-map-unit-fn", # stylistic + "-Aclippy::stable_sort_primitive", # prefer stable sort + "-Aclippy::too-many-arguments", # (Turning this on would lead to) + "-Aclippy::type_complexity", # raison d'etre + "-Aclippy::unit_arg", # stylistic + "-Aclippy::unnecessary_cast", # Types may change + "-Aclippy::useless_conversion", # Types may change + "-Aclippy::while_immutable_condition", # false positives + "-Aclippy::zero-prefixed-literal", # 00_1000_000 + "-Asuspicious_double_ref_op", + "-Dclippy::complexity", + "-Dclippy::correctness", ] diff --git a/.config/taplo.toml b/.config/taplo.toml new file mode 100644 index 0000000000..fb2fe64824 --- /dev/null +++ b/.config/taplo.toml @@ -0,0 +1,29 @@ +# all options https://taplo.tamasfe.dev/configuration/formatter-options.html + +exclude = [ + "target/**", +] + +# global rules +[formatting] +reorder_arrays = true +inline_table_expand = false +array_auto_expand = false +array_auto_collapse = false +indent_string = " " # tab + +# don't re-order order-dependent deb package metadata +[[rule]] +include = ["polkadot/Cargo.toml"] +keys = ["package.metadata.deb"] + +[rule.formatting] +reorder_arrays = false + +# don't re-order order-dependent rustflags +[[rule]] +include = [".cargo/config.toml"] +keys = ["build"] + +[rule.formatting] +reorder_arrays = false diff --git a/.github/workflows/check-features.yaml b/.github/workflows/check-features.yaml index 98e072f6b6..d5b72129d0 100644 --- a/.github/workflows/check-features.yaml +++ b/.github/workflows/check-features.yaml @@ -32,4 +32,7 @@ jobs: fetch-depth: 0 # Dont clone historic commits. - name: Check features - run: zepter run check + run: | + zepter run check + # We will add this to the config file once its stabilized. Just run it in the CI for now. + zepter transpose dep lift-to-workspace 'regex:.*' diff --git a/Cargo.toml b/Cargo.toml index e8b5a48b0f..f9c0c920ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,14 +3,25 @@ version = "1.0.0" authors = ["Polkadot Fellowship"] edition = "2021" repository = "https://github.com/polkadot-fellows/runtimes.git" -license = "GPL-3.0-only" # TODO +license = "GPL-3.0-only" # TODO [workspace.dependencies] assert_matches = { version = "1.5.0" } +asset-hub-kusama-emulated-chain = { path = "integration-tests/emulated/chains/parachains/assets/asset-hub-kusama" } +asset-hub-kusama-runtime = { path = "system-parachains/asset-hubs/asset-hub-kusama" } +asset-hub-polkadot-emulated-chain = { path = "integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot" } +asset-hub-polkadot-runtime = { path = "system-parachains/asset-hubs/asset-hub-polkadot" } asset-test-utils = { version = "8.0.1" } assets-common = { version = "0.8.0", default-features = false } +authority-discovery-primitives = { version = "27.0.0", default-features = false, package = "sp-authority-discovery" } +babe-primitives = { version = "0.33.0", default-features = false, package = "sp-consensus-babe" } +beefy-primitives = { version = "14.0.0", default-features = false, package = "sp-consensus-beefy" } binary-merkle-tree = { version = "14.0.0", default-features = false } +bp-asset-hub-kusama = { path = "system-parachains/asset-hubs/asset-hub-kusama/primitives", default-features = false } +bp-asset-hub-polkadot = { path = "system-parachains/asset-hubs/asset-hub-polkadot/primitives", default-features = false } bp-bridge-hub-cumulus = { version = "0.8.0", default-features = false } +bp-bridge-hub-kusama = { path = "system-parachains/bridge-hubs/bridge-hub-kusama/primitives", default-features = false } +bp-bridge-hub-polkadot = { path = "system-parachains/bridge-hubs/bridge-hub-polkadot/primitives", default-features = false } bp-header-chain = { version = "0.8.1", default-features = false } bp-kusama = { version = "0.6.0", default-features = false } bp-messages = { version = "0.8.0", default-features = false } @@ -21,9 +32,18 @@ bp-relayers = { version = "0.8.0", default-features = false } bp-runtime = { version = "0.8.0", default-features = false } bp-xcm-bridge-hub-router = { version = "0.7.0", default-features = false } bridge-hub-common = { version = "0.1.0", default-features = false } +bridge-hub-kusama-emulated-chain = { path = "integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama" } +bridge-hub-kusama-runtime = { path = "system-parachains/bridge-hubs/bridge-hub-kusama" } +bridge-hub-polkadot-emulated-chain = { path = "integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot" } +bridge-hub-polkadot-runtime = { path = "system-parachains/bridge-hubs/bridge-hub-polkadot" } bridge-hub-test-utils = { version = "0.8.0" } bridge-runtime-common = { version = "0.8.0", default-features = false } clap = { version = "4.5.0" } +codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false } +collectives-polkadot-emulated-chain = { path = "integration-tests/emulated/chains/parachains/collectives/collectives-polkadot" } +collectives-polkadot-runtime = { path = "system-parachains/collectives/collectives-polkadot" } +collectives-polkadot-runtime-constants = { path = "system-parachains/collectives/collectives-polkadot/constants" } +coretime-kusama-runtime = { path = "system-parachains/coretime/coretime-kusama" } cumulus-pallet-aura-ext = { version = "0.8.0", default-features = false } cumulus-pallet-dmp-queue = { version = "0.8.0", default-features = false } cumulus-pallet-parachain-system = { version = "0.8.1", default-features = false } @@ -36,18 +56,26 @@ cumulus-primitives-utility = { version = "0.8.1", default-features = false } emulated-integration-tests-common = { version = "4.0.0" } encointer-balances-tx-payment = { version = "~6.1.0", default-features = false } encointer-balances-tx-payment-rpc-runtime-api = { version = "~6.1.0", default-features = false } +encointer-kusama-runtime = { path = "system-parachains/encointer" } encointer-primitives = { version = "~6.1.0", default-features = false } enumflags2 = { version = "0.7.7" } frame-benchmarking = { version = "29.0.0", default-features = false } frame-election-provider-support = { version = "29.0.0", default-features = false } frame-executive = { version = "29.0.0", default-features = false } -frame-remote-externalities = { version = "0.36.0" } frame-support = { version = "29.0.2", default-features = false } frame-system = { version = "29.0.0", default-features = false } frame-system-benchmarking = { version = "29.0.0", default-features = false } frame-system-rpc-runtime-api = { version = "27.0.0", default-features = false } frame-try-runtime = { version = "0.35.0", default-features = false } +glutton-kusama-runtime = { path = "system-parachains/gluttons/glutton-kusama" } +grandpa = { version = "0.20.0", package = "sc-consensus-grandpa" } hex-literal = { version = "0.4.1" } +integration-tests-helpers = { path = "integration-tests/emulated/helpers" } +kusama-emulated-chain = { path = "integration-tests/emulated/chains/relays/kusama" } +kusama-polkadot-system-emulated-network = { path = "integration-tests/emulated/networks/kusama-polkadot-system" } +kusama-runtime = { path = "relay/kusama", package = "staging-kusama-runtime" } +kusama-runtime-constants = { path = "relay/kusama/constants", default-features = false } +kusama-system-emulated-network = { path = "integration-tests/emulated/networks/kusama-system" } log = { version = "0.4.20", default-features = false } pallet-alliance = { version = "28.0.0", default-features = false } pallet-asset-conversion = { version = "11.0.0", default-features = false } @@ -133,19 +161,26 @@ pallet-xcm = { version = "8.0.5", default-features = false } pallet-xcm-benchmarks = { version = "8.0.2", default-features = false } pallet-xcm-bridge-hub = { version = "0.3.0", default-features = false } pallet-xcm-bridge-hub-router = { version = "0.6.0", default-features = false } +parachain-info = { version = "0.8.0", default-features = false, package = "staging-parachain-info" } parachains-common = { version = "8.0.0", default-features = false } parachains-runtimes-test-utils = { version = "8.0.0" } -parity-scale-codec = { version = "3.6.9", default-features = false } paste = { version = "1.0.14" } +penpal-emulated-chain = { path = "integration-tests/emulated/chains/parachains/testing/penpal" } penpal-runtime = { version = "0.15.1" } +people-kusama-emulated-chain = { path = "integration-tests/emulated/chains/parachains/people/people-kusama" } +people-kusama-runtime = { path = "system-parachains/people/people-kusama" } polkadot-core-primitives = { version = "8.0.0", default-features = false } +polkadot-emulated-chain = { path = "integration-tests/emulated/chains/relays/polkadot" } polkadot-parachain-primitives = { version = "7.0.0", default-features = false } polkadot-primitives = { version = "8.0.1", default-features = false } +polkadot-runtime = { path = "relay/polkadot" } polkadot-runtime-common = { version = "8.0.1", default-features = false } -polkadot-runtime-parachains = { version = "8.0.1", default-features = false } +polkadot-runtime-constants = { path = "relay/polkadot/constants", default-features = false } +polkadot-system-emulated-network = { path = "integration-tests/emulated/networks/polkadot-system" } primitive-types = { version = "0.12.2", default-features = false } +remote-externalities = { version = "0.36.0", package = "frame-remote-externalities" } +runtime-parachains = { version = "8.0.1", default-features = false, package = "polkadot-runtime-parachains" } sc-chain-spec = { version = "28.0.0" } -sc-consensus-grandpa = { version = "0.20.0" } scale-info = { version = "2.10.0", default-features = false } separator = { version = "0.4.1" } serde = { version = "1.0.196" } @@ -166,11 +201,8 @@ snowbridge-system-runtime-api = { version = "0.1.0", default-features = false } sp-api = { version = "27.0.0", default-features = false } sp-application-crypto = { version = "31.0.0", default-features = false } sp-arithmetic = { version = "24.0.0", default-features = false } -sp-authority-discovery = { version = "27.0.0", default-features = false } sp-block-builder = { version = "27.0.0", default-features = false } sp-consensus-aura = { version = "0.33.0", default-features = false } -sp-consensus-babe = { version = "0.33.0", default-features = false } -sp-consensus-beefy = { version = "14.0.0", default-features = false } sp-core = { version = "29.0.0", default-features = false } sp-debug-derive = { version = "14.0.0", default-features = false } sp-genesis-builder = { version = "0.8.0", default-features = false } @@ -189,20 +221,39 @@ sp-transaction-pool = { version = "27.0.0", default-features = false } sp-trie = { version = "30.0.0" } sp-version = { version = "30.0.0", default-features = false } sp-weights = { version = "28.0.0", default-features = false } -staging-parachain-info = { version = "0.8.0", default-features = false } -staging-xcm = { version = "8.0.1", default-features = false } -staging-xcm-builder = { version = "8.0.1", default-features = false } -staging-xcm-executor = { version = "8.0.2", default-features = false } static_assertions = { version = "1.1.0" } substrate-wasm-builder = { version = "18.0.0" } +system-parachains-constants = { path = "system-parachains/constants", default-features = false } tokio = { version = "1.36.0" } +xcm = { version = "8.0.1", default-features = false, package = "staging-xcm" } +xcm-builder = { version = "8.0.1", default-features = false, package = "staging-xcm-builder" } xcm-emulator = { version = "0.6.0" } +xcm-executor = { version = "8.0.1", default-features = false, package = "staging-xcm-executor" } [workspace] resolver = "2" members = [ "chain-spec-generator", + "integration-tests/emulated/chains/parachains/assets/asset-hub-kusama", + "integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot", + "integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama", + "integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot", + "integration-tests/emulated/chains/parachains/collectives/collectives-polkadot", + "integration-tests/emulated/chains/parachains/people/people-kusama", + "integration-tests/emulated/chains/parachains/testing/penpal", + "integration-tests/emulated/chains/relays/kusama", + "integration-tests/emulated/chains/relays/polkadot", + "integration-tests/emulated/helpers", + "integration-tests/emulated/networks/kusama-polkadot-system", + "integration-tests/emulated/networks/kusama-system", + "integration-tests/emulated/networks/polkadot-system", + "integration-tests/emulated/tests/assets/asset-hub-kusama", + "integration-tests/emulated/tests/assets/asset-hub-polkadot", + "integration-tests/emulated/tests/bridges/bridge-hub-kusama", + "integration-tests/emulated/tests/bridges/bridge-hub-polkadot", + "integration-tests/emulated/tests/collectives/collectives-polkadot", + "integration-tests/emulated/tests/people/people-kusama", "relay/kusama", "relay/kusama/constants", "relay/polkadot", @@ -222,25 +273,6 @@ members = [ "system-parachains/encointer", "system-parachains/gluttons/glutton-kusama", "system-parachains/people/people-kusama", - "integration-tests/emulated/chains/relays/kusama", - "integration-tests/emulated/chains/relays/polkadot", - "integration-tests/emulated/chains/parachains/assets/asset-hub-kusama", - "integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot", - "integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama", - "integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot", - "integration-tests/emulated/chains/parachains/collectives/collectives-polkadot", - "integration-tests/emulated/chains/parachains/people/people-kusama", - "integration-tests/emulated/chains/parachains/testing/penpal", - "integration-tests/emulated/helpers", - "integration-tests/emulated/networks/kusama-system", - "integration-tests/emulated/networks/polkadot-system", - "integration-tests/emulated/networks/kusama-polkadot-system", - "integration-tests/emulated/tests/assets/asset-hub-kusama", - "integration-tests/emulated/tests/assets/asset-hub-polkadot", - "integration-tests/emulated/tests/bridges/bridge-hub-kusama", - "integration-tests/emulated/tests/bridges/bridge-hub-polkadot", - "integration-tests/emulated/tests/collectives/collectives-polkadot", - "integration-tests/emulated/tests/people/people-kusama", ] [profile.release] diff --git a/chain-spec-generator/Cargo.toml b/chain-spec-generator/Cargo.toml index 11981fec88..030dccbeb9 100644 --- a/chain-spec-generator/Cargo.toml +++ b/chain-spec-generator/Cargo.toml @@ -7,60 +7,57 @@ repository.workspace = true license.workspace = true [dependencies] -clap = { features = [ "derive" ] , workspace = true } +clap = { features = ["derive"], workspace = true } serde_json = { workspace = true } -serde = { features = ["derive"] , workspace = true } +serde = { features = ["derive"], workspace = true } -polkadot-runtime = { path = "../relay/polkadot" } -polkadot-runtime-constants = { path = "../relay/polkadot/constants" } -kusama-runtime = { package = "staging-kusama-runtime", path = "../relay/kusama" } -kusama-runtime-constants = { path = "../relay/kusama/constants" } +polkadot-runtime = { workspace = true } +polkadot-runtime-constants = { workspace = true, default-features = true } +kusama-runtime = { workspace = true } +kusama-runtime-constants = { workspace = true, default-features = true } sc-chain-spec = { workspace = true } -polkadot-runtime-parachains = { workspace = true, default-features = true } +runtime-parachains = { default-features = true, workspace = true } polkadot-primitives = { workspace = true, default-features = true } -sp-consensus-babe = { workspace = true, default-features = true } -sp-authority-discovery = { workspace = true, default-features = true } +babe-primitives = { workspace = true, default-features = true } +authority-discovery-primitives = { workspace = true, default-features = true } sp-core = { workspace = true, default-features = true } pallet-staking = { workspace = true, default-features = true } -sc-consensus-grandpa = { workspace = true } +grandpa = { workspace = true } sp-runtime = { workspace = true, default-features = true } -sp-consensus-beefy = { workspace = true, default-features = true } -xcm = { package = "staging-xcm", version = "8.0.1" } +beefy-primitives = { workspace = true, default-features = true } +xcm = { workspace = true, default-features = true } parachains-common = { workspace = true, default-features = true } cumulus-primitives-core = { workspace = true, default-features = true } -asset-hub-polkadot-runtime = { path = "../system-parachains/asset-hubs/asset-hub-polkadot" } -asset-hub-kusama-runtime = { path = "../system-parachains/asset-hubs/asset-hub-kusama" } -collectives-polkadot-runtime = { path = "../system-parachains/collectives/collectives-polkadot" } -bridge-hub-polkadot-runtime = { path = "../system-parachains/bridge-hubs/bridge-hub-polkadot" } -bridge-hub-kusama-runtime = { path = "../system-parachains/bridge-hubs/bridge-hub-kusama" } -encointer-kusama-runtime = { path = "../system-parachains/encointer" } -glutton-kusama-runtime = { path = "../system-parachains/gluttons/glutton-kusama" } -coretime-kusama-runtime = { path = "../system-parachains/coretime/coretime-kusama" } -people-kusama-runtime = { path = "../system-parachains/people/people-kusama" } +asset-hub-polkadot-runtime = { workspace = true } +asset-hub-kusama-runtime = { workspace = true } +collectives-polkadot-runtime = { workspace = true } +bridge-hub-polkadot-runtime = { workspace = true } +bridge-hub-kusama-runtime = { workspace = true } +encointer-kusama-runtime = { workspace = true } +glutton-kusama-runtime = { workspace = true } +coretime-kusama-runtime = { workspace = true } +people-kusama-runtime = { workspace = true } [features] -fast-runtime = [ - "kusama-runtime/fast-runtime", - "polkadot-runtime/fast-runtime", -] +fast-runtime = ["kusama-runtime/fast-runtime", "polkadot-runtime/fast-runtime"] runtime-benchmarks = [ - "asset-hub-polkadot-runtime/runtime-benchmarks", "asset-hub-kusama-runtime/runtime-benchmarks", - "bridge-hub-polkadot-runtime/runtime-benchmarks", + "asset-hub-polkadot-runtime/runtime-benchmarks", "bridge-hub-kusama-runtime/runtime-benchmarks", + "bridge-hub-polkadot-runtime/runtime-benchmarks", "collectives-polkadot-runtime/runtime-benchmarks", - "kusama-runtime/runtime-benchmarks", - "polkadot-runtime/runtime-benchmarks", - "encointer-kusama-runtime/runtime-benchmarks", - "glutton-kusama-runtime/runtime-benchmarks", "coretime-kusama-runtime/runtime-benchmarks", - "people-kusama-runtime/runtime-benchmarks", "cumulus-primitives-core/runtime-benchmarks", + "encointer-kusama-runtime/runtime-benchmarks", + "glutton-kusama-runtime/runtime-benchmarks", + "kusama-runtime/runtime-benchmarks", "pallet-staking/runtime-benchmarks", "parachains-common/runtime-benchmarks", + "people-kusama-runtime/runtime-benchmarks", "polkadot-primitives/runtime-benchmarks", - "polkadot-runtime-parachains/runtime-benchmarks", - "sp-runtime/runtime-benchmarks" + "polkadot-runtime/runtime-benchmarks", + "runtime-parachains/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] diff --git a/chain-spec-generator/src/relay_chain_specs.rs b/chain-spec-generator/src/relay_chain_specs.rs index 63caaeb44d..e8c2fa3c8a 100644 --- a/chain-spec-generator/src/relay_chain_specs.rs +++ b/chain-spec-generator/src/relay_chain_specs.rs @@ -15,16 +15,16 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . +use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; +use babe_primitives::AuthorityId as BabeId; +use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId; +use grandpa::AuthorityId as GrandpaId; use kusama_runtime_constants::currency::UNITS as KSM; use pallet_staking::Forcing; use polkadot_primitives::{AccountId, AccountPublic, AssignmentId, ValidatorId}; use polkadot_runtime_constants::currency::UNITS as DOT; -use polkadot_runtime_parachains::configuration::HostConfiguration; +use runtime_parachains::configuration::HostConfiguration; use sc_chain_spec::{ChainSpec, ChainType, NoExtension}; -use sc_consensus_grandpa::AuthorityId as GrandpaId; -use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId; -use sp_consensus_babe::AuthorityId as BabeId; -use sp_consensus_beefy::ecdsa_crypto::AuthorityId as BeefyId; use sp_core::{sr25519, Pair, Public}; use sp_runtime::{traits::IdentifyAccount, Perbill}; @@ -47,7 +47,7 @@ pub fn polkadot_chain_spec_properties() -> serde_json::map::Map HostConfiguration { use polkadot_primitives::{MAX_CODE_SIZE, MAX_POV_SIZE}; - polkadot_runtime_parachains::configuration::HostConfiguration { + runtime_parachains::configuration::HostConfiguration { validation_upgrade_cooldown: 2u32, validation_upgrade_delay: 2, code_retention_period: 1200, diff --git a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml index e790b90553..3cd10ade0c 100644 --- a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml +++ b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml @@ -39,16 +39,12 @@ name = "asset-hub-kusama-collator-1" rpc_port = 9011 ws_port = 9010 command = "{{POLKADOT_PARACHAIN_BINARY}}" -args = [ - "-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace" -] +args = ["-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"] [[parachains.collators]] name = "asset-hub-kusama-collator-2" command = "{{POLKADOT_PARACHAIN_BINARY}}" -args = [ - "-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace" -] +args = ["-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"] [[parachains]] id = 1002 @@ -64,7 +60,7 @@ command = "{{POLKADOT_PARACHAIN_BINARY}}" rpc_port = 8935 ws_port = 8945 args = [ - "-lparachain=debug,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace" + "-lparachain=debug,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace", ] # run bob as parachain collator @@ -75,5 +71,5 @@ command = "{{POLKADOT_PARACHAIN_BINARY}}" rpc_port = 8936 ws_port = 8946 args = [ - "-lparachain=trace,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace" + "-lparachain=trace,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace", ] diff --git a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml index d2ec0207a9..75a0cb5f2b 100644 --- a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml +++ b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml @@ -39,16 +39,12 @@ name = "asset-hub-polkadot-collator-1" rpc_port = 9911 ws_port = 9910 command = "{{POLKADOT_PARACHAIN_BINARY}}" -args = [ - "-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace" -] - +args = ["-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"] + [[parachains.collators]] name = "asset-hub-polkadot-collator-2" command = "{{POLKADOT_PARACHAIN_BINARY}}" -args = [ - "-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace" -] +args = ["-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"] [[parachains]] id = 1002 @@ -63,7 +59,7 @@ command = "{{POLKADOT_PARACHAIN_BINARY}}" rpc_port = 8933 ws_port = 8943 args = [ - "-lparachain=debug,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace" + "-lparachain=debug,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace", ] [[parachains.collators]] @@ -73,5 +69,5 @@ command = "{{POLKADOT_PARACHAIN_BINARY}}" rpc_port = 8934 ws_port = 8944 args = [ - "-lparachain=trace,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace" + "-lparachain=trace,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace", ] diff --git a/integration-tests/emulated/chains/parachains/assets/asset-hub-kusama/Cargo.toml b/integration-tests/emulated/chains/parachains/assets/asset-hub-kusama/Cargo.toml index 5f103dc034..3401d3b653 100644 --- a/integration-tests/emulated/chains/parachains/assets/asset-hub-kusama/Cargo.toml +++ b/integration-tests/emulated/chains/parachains/assets/asset-hub-kusama/Cargo.toml @@ -19,5 +19,5 @@ cumulus-primitives-core = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } # Runtimes -asset-hub-kusama-runtime = { path = "../../../../../../system-parachains/asset-hubs/asset-hub-kusama" } -kusama-emulated-chain = { path = "../../../relays/kusama" } +asset-hub-kusama-runtime = { workspace = true } +kusama-emulated-chain = { workspace = true } diff --git a/integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot/Cargo.toml b/integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot/Cargo.toml index 77be0ca4ab..3bb7ebde64 100644 --- a/integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot/Cargo.toml +++ b/integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot/Cargo.toml @@ -19,5 +19,5 @@ cumulus-primitives-core = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } # Runtimes -asset-hub-polkadot-runtime = { path = "../../../../../../system-parachains/asset-hubs/asset-hub-polkadot" } -polkadot-emulated-chain = { path = "../../../relays/polkadot" } +asset-hub-polkadot-runtime = { workspace = true } +polkadot-emulated-chain = { workspace = true } diff --git a/integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama/Cargo.toml b/integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama/Cargo.toml index 3b01d73bff..e79ba4f465 100644 --- a/integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama/Cargo.toml +++ b/integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama/Cargo.toml @@ -19,4 +19,4 @@ bridge-hub-common = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } # Runtimes -bridge-hub-kusama-runtime = { path = "../../../../../../system-parachains/bridge-hubs/bridge-hub-kusama" } +bridge-hub-kusama-runtime = { workspace = true } diff --git a/integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot/Cargo.toml b/integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot/Cargo.toml index 9e9adab023..026efeb91a 100644 --- a/integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot/Cargo.toml +++ b/integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot/Cargo.toml @@ -19,4 +19,4 @@ bridge-hub-common = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } # Runtimes -bridge-hub-polkadot-runtime = { path = "../../../../../../system-parachains/bridge-hubs/bridge-hub-polkadot" } +bridge-hub-polkadot-runtime = { workspace = true } diff --git a/integration-tests/emulated/chains/parachains/collectives/collectives-polkadot/Cargo.toml b/integration-tests/emulated/chains/parachains/collectives/collectives-polkadot/Cargo.toml index 4cad7b3eee..ffd5689c64 100644 --- a/integration-tests/emulated/chains/parachains/collectives/collectives-polkadot/Cargo.toml +++ b/integration-tests/emulated/chains/parachains/collectives/collectives-polkadot/Cargo.toml @@ -19,4 +19,4 @@ cumulus-primitives-core = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } # Runtimes -collectives-polkadot-runtime = { path = "../../../../../../system-parachains/collectives/collectives-polkadot" } +collectives-polkadot-runtime = { workspace = true } diff --git a/integration-tests/emulated/chains/parachains/people/people-kusama/Cargo.toml b/integration-tests/emulated/chains/parachains/people/people-kusama/Cargo.toml index 4564a4de38..a72f24e626 100644 --- a/integration-tests/emulated/chains/parachains/people/people-kusama/Cargo.toml +++ b/integration-tests/emulated/chains/parachains/people/people-kusama/Cargo.toml @@ -19,5 +19,5 @@ cumulus-primitives-core = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } # Local -people-kusama-runtime = { path = "../../../../../../system-parachains/people/people-kusama" } -kusama-emulated-chain = { path = "../../../relays/kusama" } +people-kusama-runtime = { workspace = true } +kusama-emulated-chain = { workspace = true } diff --git a/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml b/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml index 8a224f7f83..3f5198ea35 100644 --- a/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml +++ b/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml @@ -17,8 +17,8 @@ frame-support = { workspace = true, default-features = true } parachains-common = { workspace = true, default-features = true } cumulus-primitives-core = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } -penpal-runtime = { features = ["experimental"] , workspace = true } +penpal-runtime = { features = ["experimental"], workspace = true } # Runtimes -kusama-emulated-chain = { path = "../../../relays/kusama" } -polkadot-emulated-chain = { path = "../../../relays/polkadot" } +kusama-emulated-chain = { workspace = true } +polkadot-emulated-chain = { workspace = true } diff --git a/integration-tests/emulated/chains/relays/kusama/Cargo.toml b/integration-tests/emulated/chains/relays/kusama/Cargo.toml index 91b03372c2..504c79e1eb 100644 --- a/integration-tests/emulated/chains/relays/kusama/Cargo.toml +++ b/integration-tests/emulated/chains/relays/kusama/Cargo.toml @@ -11,10 +11,10 @@ publish = false # Substrate sp-core = { workspace = true, default-features = true } -authority-discovery-primitives = { package = "sp-authority-discovery", version = "27.0.0" } -babe-primitives = { package = "sp-consensus-babe", version = "0.33.0" } -beefy-primitives = { package = "sp-consensus-beefy", version = "14.0.0" } -grandpa = { package = "sc-consensus-grandpa", version = "0.20.0" } +authority-discovery-primitives = { workspace = true, default-features = true } +babe-primitives = { workspace = true, default-features = true } +beefy-primitives = { workspace = true, default-features = true } +grandpa = { workspace = true } # Polkadot polkadot-primitives = { workspace = true, default-features = true } @@ -24,5 +24,5 @@ parachains-common = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } # Runtimes -kusama-runtime-constants = { path = "../../../../../relay/kusama/constants" } -kusama-runtime = { package = "staging-kusama-runtime", path = "../../../../../relay/kusama" } +kusama-runtime-constants = { workspace = true, default-features = true } +kusama-runtime = { workspace = true } diff --git a/integration-tests/emulated/chains/relays/polkadot/Cargo.toml b/integration-tests/emulated/chains/relays/polkadot/Cargo.toml index 3297be59dd..8c6e2c2a15 100644 --- a/integration-tests/emulated/chains/relays/polkadot/Cargo.toml +++ b/integration-tests/emulated/chains/relays/polkadot/Cargo.toml @@ -12,10 +12,10 @@ publish = false # Substrate sp-core = { workspace = true, default-features = true } sp-runtime = { workspace = true, default-features = true } -authority-discovery-primitives = { package = "sp-authority-discovery", version = "27.0.0" } -babe-primitives = { package = "sp-consensus-babe", version = "0.33.0" } -beefy-primitives = { package = "sp-consensus-beefy", version = "14.0.0" } -grandpa = { package = "sc-consensus-grandpa", version = "0.20.0" } +authority-discovery-primitives = { workspace = true, default-features = true } +babe-primitives = { workspace = true, default-features = true } +beefy-primitives = { workspace = true, default-features = true } +grandpa = { workspace = true } pallet-staking = { workspace = true, default-features = true } # Polkadot @@ -26,5 +26,5 @@ parachains-common = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } # Runtimes -polkadot-runtime-constants = { path = "../../../../../relay/polkadot/constants" } -polkadot-runtime = { path = "../../../../../relay/polkadot" } +polkadot-runtime-constants = { workspace = true, default-features = true } +polkadot-runtime = { workspace = true } diff --git a/integration-tests/emulated/helpers/Cargo.toml b/integration-tests/emulated/helpers/Cargo.toml index 2d041aaee9..b5c6401bf9 100644 --- a/integration-tests/emulated/helpers/Cargo.toml +++ b/integration-tests/emulated/helpers/Cargo.toml @@ -15,7 +15,7 @@ pallet-balances = { workspace = true, default-features = true } pallet-message-queue = { workspace = true, default-features = true } # Polkadot -xcm = { package = "staging-xcm", version = "8.0.1" } +xcm = { workspace = true, default-features = true } pallet-xcm = { workspace = true, default-features = true } # Cumulus diff --git a/integration-tests/emulated/networks/kusama-polkadot-system/Cargo.toml b/integration-tests/emulated/networks/kusama-polkadot-system/Cargo.toml index f5eea2f49b..04781b34cd 100644 --- a/integration-tests/emulated/networks/kusama-polkadot-system/Cargo.toml +++ b/integration-tests/emulated/networks/kusama-polkadot-system/Cargo.toml @@ -13,10 +13,10 @@ publish = false emulated-integration-tests-common = { workspace = true } # Runtimes -asset-hub-kusama-emulated-chain = { path = "../../chains/parachains/assets/asset-hub-kusama" } -asset-hub-polkadot-emulated-chain = { path = "../../chains/parachains/assets/asset-hub-polkadot" } -bridge-hub-kusama-emulated-chain = { path = "../../chains/parachains/bridges/bridge-hub-kusama" } -bridge-hub-polkadot-emulated-chain = { path = "../../chains/parachains/bridges/bridge-hub-polkadot" } -kusama-emulated-chain = { path = "../../chains/relays/kusama" } -penpal-emulated-chain = { path = "../../chains/parachains/testing/penpal" } -polkadot-emulated-chain = { path = "../../chains/relays/polkadot" } +asset-hub-kusama-emulated-chain = { workspace = true } +asset-hub-polkadot-emulated-chain = { workspace = true } +bridge-hub-kusama-emulated-chain = { workspace = true } +bridge-hub-polkadot-emulated-chain = { workspace = true } +kusama-emulated-chain = { workspace = true } +penpal-emulated-chain = { workspace = true } +polkadot-emulated-chain = { workspace = true } diff --git a/integration-tests/emulated/networks/kusama-system/Cargo.toml b/integration-tests/emulated/networks/kusama-system/Cargo.toml index 036047335f..50f09c6512 100644 --- a/integration-tests/emulated/networks/kusama-system/Cargo.toml +++ b/integration-tests/emulated/networks/kusama-system/Cargo.toml @@ -13,8 +13,8 @@ publish = false emulated-integration-tests-common = { workspace = true } # Runtimes -asset-hub-kusama-emulated-chain = { path = "../../chains/parachains/assets/asset-hub-kusama" } -bridge-hub-kusama-emulated-chain = { path = "../../chains/parachains/bridges/bridge-hub-kusama" } -kusama-emulated-chain = { path = "../../chains/relays/kusama" } -penpal-emulated-chain = { path = "../../chains/parachains/testing/penpal" } -people-kusama-emulated-chain = { path = "../../chains/parachains/people/people-kusama" } +asset-hub-kusama-emulated-chain = { workspace = true } +bridge-hub-kusama-emulated-chain = { workspace = true } +kusama-emulated-chain = { workspace = true } +penpal-emulated-chain = { workspace = true } +people-kusama-emulated-chain = { workspace = true } diff --git a/integration-tests/emulated/networks/polkadot-system/Cargo.toml b/integration-tests/emulated/networks/polkadot-system/Cargo.toml index 520fc6b92b..9e7c757374 100644 --- a/integration-tests/emulated/networks/polkadot-system/Cargo.toml +++ b/integration-tests/emulated/networks/polkadot-system/Cargo.toml @@ -13,8 +13,8 @@ publish = false emulated-integration-tests-common = { workspace = true } # Runtimes -asset-hub-polkadot-emulated-chain = { path = "../../chains/parachains/assets/asset-hub-polkadot" } -bridge-hub-polkadot-emulated-chain = { path = "../../chains/parachains/bridges/bridge-hub-polkadot" } -collectives-polkadot-emulated-chain = { path = "../../chains/parachains/collectives/collectives-polkadot" } -penpal-emulated-chain = { path = "../../chains/parachains/testing/penpal" } -polkadot-emulated-chain = { path = "../../chains/relays/polkadot" } +asset-hub-polkadot-emulated-chain = { workspace = true } +bridge-hub-polkadot-emulated-chain = { workspace = true } +collectives-polkadot-emulated-chain = { workspace = true } +penpal-emulated-chain = { workspace = true } +polkadot-emulated-chain = { workspace = true } diff --git a/integration-tests/emulated/tests/assets/asset-hub-kusama/Cargo.toml b/integration-tests/emulated/tests/assets/asset-hub-kusama/Cargo.toml index 8c0f87f053..3e10c1f40a 100644 --- a/integration-tests/emulated/tests/assets/asset-hub-kusama/Cargo.toml +++ b/integration-tests/emulated/tests/assets/asset-hub-kusama/Cargo.toml @@ -8,7 +8,7 @@ description = "Asset Hub Kusama runtime integration tests with xcm-emulator" publish = false [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9" } +codec = { workspace = true, default-features = true } assert_matches = { workspace = true } # Substrate @@ -22,21 +22,23 @@ pallet-message-queue = { workspace = true, default-features = true } pallet-utility = { workspace = true, default-features = true } # Polkadot -xcm = { package = "staging-xcm", version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +xcm = { workspace = true, default-features = true } +xcm-executor = { workspace = true } pallet-xcm = { workspace = true, default-features = true } -runtime-common = { package = "polkadot-runtime-common", default-features = false, version = "8.0.1" } +polkadot-runtime-common = { workspace = true } # Cumulus parachains-common = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } asset-test-utils = { workspace = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook"], workspace = true, default-features = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true, default-features = true } # Local -asset-hub-kusama-runtime = { path = "../../../../../system-parachains/asset-hubs/asset-hub-kusama" } -integration-tests-helpers = { path = "../../../helpers" } -kusama-runtime = { package = "staging-kusama-runtime", path = "../../../../../relay/kusama" } -kusama-system-emulated-network = { path = "../../../networks/kusama-system" } -system-parachains-constants = { path = "../../../../../system-parachains/constants" } -kusama-runtime-constants = { path = "../../../../../relay/kusama/constants" } +asset-hub-kusama-runtime = { workspace = true } +integration-tests-helpers = { workspace = true } +kusama-runtime = { workspace = true } +kusama-system-emulated-network = { workspace = true } +system-parachains-constants = { workspace = true, default-features = true } +kusama-runtime-constants = { workspace = true, default-features = true } diff --git a/integration-tests/emulated/tests/assets/asset-hub-kusama/src/tests/treasury.rs b/integration-tests/emulated/tests/assets/asset-hub-kusama/src/tests/treasury.rs index 0bf533a613..4c7f4faabf 100644 --- a/integration-tests/emulated/tests/assets/asset-hub-kusama/src/tests/treasury.rs +++ b/integration-tests/emulated/tests/assets/asset-hub-kusama/src/tests/treasury.rs @@ -27,7 +27,7 @@ use frame_support::{ }; use kusama_runtime::OriginCaller; use kusama_runtime_constants::currency::GRAND; -use runtime_common::impls::VersionedLocatableAsset; +use polkadot_runtime_common::impls::VersionedLocatableAsset; use xcm_executor::traits::ConvertLocation; // Fund Treasury account on Asset Hub from Treasury account on Relay Chain with KSMs. diff --git a/integration-tests/emulated/tests/assets/asset-hub-polkadot/Cargo.toml b/integration-tests/emulated/tests/assets/asset-hub-polkadot/Cargo.toml index 96ccde7c26..d762ccc96d 100644 --- a/integration-tests/emulated/tests/assets/asset-hub-polkadot/Cargo.toml +++ b/integration-tests/emulated/tests/assets/asset-hub-polkadot/Cargo.toml @@ -8,7 +8,7 @@ description = "Asset Hub Polkadot runtime integration tests with xcm-emulator" publish = false [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9" } +codec = { workspace = true, default-features = true } assert_matches = { workspace = true } # Substrate @@ -22,21 +22,23 @@ pallet-message-queue = { workspace = true, default-features = true } # Polkadot polkadot-runtime-common = { workspace = true, default-features = true } -xcm = { package = "staging-xcm", version = "8.0.1" } +xcm = { workspace = true, default-features = true } pallet-xcm = { workspace = true, default-features = true } -xcm-executor = { package = "staging-xcm-executor", version = "8.0.1" } +xcm-executor = { workspace = true, default-features = true } # Cumulus asset-test-utils = { workspace = true } emulated-integration-tests-common = { workspace = true } parachains-common = { workspace = true, default-features = true } cumulus-pallet-xcmp-queue = { workspace = true, default-features = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook"], workspace = true, default-features = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true, default-features = true } # Local -asset-hub-polkadot-runtime = { path = "../../../../../system-parachains/asset-hubs/asset-hub-polkadot" } -collectives-polkadot-runtime-constants = { path = "../../../../../system-parachains/collectives/collectives-polkadot/constants" } -integration-tests-helpers = { path = "../../../helpers" } -polkadot-runtime = { path = "../../../../../relay/polkadot" } -polkadot-system-emulated-network = { path = "../../../networks/polkadot-system" } -system-parachains-constants = { path = "../../../../../system-parachains/constants" } +asset-hub-polkadot-runtime = { workspace = true } +collectives-polkadot-runtime-constants = { workspace = true } +integration-tests-helpers = { workspace = true } +polkadot-runtime = { workspace = true } +polkadot-system-emulated-network = { workspace = true } +system-parachains-constants = { workspace = true, default-features = true } diff --git a/integration-tests/emulated/tests/bridges/bridge-hub-kusama/Cargo.toml b/integration-tests/emulated/tests/bridges/bridge-hub-kusama/Cargo.toml index 994d0349e9..b3385f8dfb 100644 --- a/integration-tests/emulated/tests/bridges/bridge-hub-kusama/Cargo.toml +++ b/integration-tests/emulated/tests/bridges/bridge-hub-kusama/Cargo.toml @@ -8,8 +8,8 @@ description = "Bridge Hub Kusama runtime integration tests with xcm-emulator" publish = false [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9" } -scale-info = { features = ["derive"] , workspace = true } +codec = { workspace = true, default-features = true } +scale-info = { features = ["derive"], workspace = true } hex-literal = { workspace = true } # Substrate @@ -22,9 +22,9 @@ pallet-assets = { workspace = true, default-features = true } pallet-message-queue = { workspace = true, default-features = true } # Polkadot -xcm = { package = "staging-xcm", version = "8.0.1" } +xcm = { workspace = true, default-features = true } pallet-xcm = { workspace = true, default-features = true } -xcm-executor = { package = "staging-xcm-executor", version = "8.0.1" } +xcm-executor = { workspace = true, default-features = true } # Cumulus emulated-integration-tests-common = { workspace = true } @@ -36,13 +36,13 @@ bp-messages = { workspace = true, default-features = true } pallet-bridge-messages = { workspace = true, default-features = true } # Local -bp-bridge-hub-kusama = { path = "../../../../../system-parachains/bridge-hubs/bridge-hub-kusama/primitives"} -bridge-hub-kusama-runtime = { path = "../../../../../system-parachains/bridge-hubs/bridge-hub-kusama" } -asset-hub-kusama-runtime = { path = "../../../../../system-parachains/asset-hubs/asset-hub-kusama" } -integration-tests-helpers = { path = "../../../helpers" } -kusama-polkadot-system-emulated-network = { path = "../../../networks/kusama-polkadot-system" } -kusama-system-emulated-network = { path = "../../../networks/kusama-system" } -system-parachains-constants = { path = "../../../../../system-parachains/constants" } +bp-bridge-hub-kusama = { workspace = true, default-features = true } +bridge-hub-kusama-runtime = { workspace = true } +asset-hub-kusama-runtime = { workspace = true } +integration-tests-helpers = { workspace = true } +kusama-polkadot-system-emulated-network = { workspace = true } +kusama-system-emulated-network = { workspace = true } +system-parachains-constants = { workspace = true, default-features = true } # Snowbridge snowbridge-beacon-primitives = { workspace = true, default-features = true } diff --git a/integration-tests/emulated/tests/bridges/bridge-hub-polkadot/Cargo.toml b/integration-tests/emulated/tests/bridges/bridge-hub-polkadot/Cargo.toml index 7a9b30559a..c4034d7913 100644 --- a/integration-tests/emulated/tests/bridges/bridge-hub-polkadot/Cargo.toml +++ b/integration-tests/emulated/tests/bridges/bridge-hub-polkadot/Cargo.toml @@ -8,8 +8,8 @@ description = "Bridge Hub Polkadot runtime integration tests with xcm-emulator" publish = false [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9" } -scale-info = { features = ["derive"] , workspace = true } +codec = { workspace = true, default-features = true } +scale-info = { features = ["derive"], workspace = true } hex-literal = { workspace = true } # Substrate @@ -22,9 +22,9 @@ pallet-assets = { workspace = true, default-features = true } pallet-message-queue = { workspace = true, default-features = true } # Polkadot -xcm = { package = "staging-xcm", version = "8.0.1" } +xcm = { workspace = true, default-features = true } pallet-xcm = { workspace = true, default-features = true } -xcm-executor = { package = "staging-xcm-executor", version = "8.0.1" } +xcm-executor = { workspace = true, default-features = true } # Cumulus emulated-integration-tests-common = { workspace = true } @@ -36,13 +36,13 @@ bp-messages = { workspace = true, default-features = true } pallet-bridge-messages = { workspace = true, default-features = true } # Local -bp-bridge-hub-polkadot = { path = "../../../../../system-parachains/bridge-hubs/bridge-hub-polkadot/primitives"} -bridge-hub-polkadot-runtime = { path = "../../../../../system-parachains/bridge-hubs/bridge-hub-polkadot" } -asset-hub-polkadot-runtime = { path = "../../../../../system-parachains/asset-hubs/asset-hub-polkadot" } -integration-tests-helpers = { path = "../../../helpers" } -kusama-polkadot-system-emulated-network = { path = "../../../networks/kusama-polkadot-system" } -polkadot-system-emulated-network = { path = "../../../networks/polkadot-system" } -system-parachains-constants = { path = "../../../../../system-parachains/constants" } +bp-bridge-hub-polkadot = { workspace = true, default-features = true } +bridge-hub-polkadot-runtime = { workspace = true } +asset-hub-polkadot-runtime = { workspace = true } +integration-tests-helpers = { workspace = true } +kusama-polkadot-system-emulated-network = { workspace = true } +polkadot-system-emulated-network = { workspace = true } +system-parachains-constants = { workspace = true, default-features = true } # Snowbridge snowbridge-beacon-primitives = { workspace = true, default-features = true } diff --git a/integration-tests/emulated/tests/collectives/collectives-polkadot/Cargo.toml b/integration-tests/emulated/tests/collectives/collectives-polkadot/Cargo.toml index 5ad4da3221..2735efd0b6 100644 --- a/integration-tests/emulated/tests/collectives/collectives-polkadot/Cargo.toml +++ b/integration-tests/emulated/tests/collectives/collectives-polkadot/Cargo.toml @@ -8,11 +8,11 @@ description = "Collectives Polkadot runtime integration tests with xcm-emulator" publish = false [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9" } +codec = { workspace = true, default-features = true } assert_matches = { workspace = true } # Substrate -sp-core ={ workspace = true, default-features = true } +sp-core = { workspace = true, default-features = true } sp-runtime = { workspace = true, default-features = true } frame-support = { workspace = true, default-features = true } pallet-balances = { workspace = true, default-features = true } @@ -25,23 +25,25 @@ pallet-whitelist = { workspace = true, default-features = true } # Polkadot polkadot-runtime-common = { workspace = true, default-features = true } -xcm = { package = "staging-xcm", version = "8.0.1" } +xcm = { workspace = true, default-features = true } pallet-xcm = { workspace = true, default-features = true } -xcm-executor = { package = "staging-xcm-executor", version = "8.0.1" } +xcm-executor = { workspace = true, default-features = true } # Cumulus asset-test-utils = { workspace = true } emulated-integration-tests-common = { workspace = true } parachains-common = { workspace = true, default-features = true } cumulus-pallet-xcmp-queue = { workspace = true, default-features = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook"], workspace = true, default-features = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true, default-features = true } # Local -asset-hub-polkadot-runtime = { path = "../../../../../system-parachains/asset-hubs/asset-hub-polkadot" } -collectives-polkadot-runtime = { path = "../../../../../system-parachains/collectives/collectives-polkadot" } -collectives-polkadot-runtime-constants = { path = "../../../../../system-parachains/collectives/collectives-polkadot/constants" } -integration-tests-helpers = { path = "../../../helpers" } -polkadot-runtime = { path = "../../../../../relay/polkadot" } -polkadot-runtime-constants = { path = "../../../../../relay/polkadot/constants" } -polkadot-system-emulated-network = { path = "../../../networks/polkadot-system" } -system-parachains-constants = { path = "../../../../../system-parachains/constants" } +asset-hub-polkadot-runtime = { workspace = true } +collectives-polkadot-runtime = { workspace = true } +collectives-polkadot-runtime-constants = { workspace = true } +integration-tests-helpers = { workspace = true } +polkadot-runtime = { workspace = true } +polkadot-runtime-constants = { workspace = true, default-features = true } +polkadot-system-emulated-network = { workspace = true } +system-parachains-constants = { workspace = true, default-features = true } diff --git a/integration-tests/emulated/tests/people/people-kusama/Cargo.toml b/integration-tests/emulated/tests/people/people-kusama/Cargo.toml index 77db521083..4b91b2b197 100644 --- a/integration-tests/emulated/tests/people/people-kusama/Cargo.toml +++ b/integration-tests/emulated/tests/people/people-kusama/Cargo.toml @@ -8,7 +8,7 @@ description = "People Kusama runtime integration tests with xcm-emulator" publish = false [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9" } +codec = { workspace = true, default-features = true } # Substrate sp-runtime = { workspace = true, default-features = true } @@ -19,17 +19,19 @@ pallet-identity = { workspace = true, default-features = true } # Polkadot polkadot-runtime-common = { workspace = true, default-features = true } -xcm = { package = "staging-xcm", version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +xcm = { workspace = true, default-features = true } +xcm-executor = { workspace = true } # Cumulus parachains-common = { workspace = true, default-features = true } emulated-integration-tests-common = { workspace = true } asset-test-utils = { workspace = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook"], workspace = true, default-features = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true, default-features = true } # Local -kusama-runtime-constants = { path = "../../../../../relay/kusama/constants" } -kusama-runtime = { package = "staging-kusama-runtime", path = "../../../../../relay/kusama" } -people-kusama-runtime = { path = "../../../../../system-parachains/people/people-kusama" } -kusama-system-emulated-network = { path = "../../../networks/kusama-system" } +kusama-runtime-constants = { workspace = true, default-features = true } +kusama-runtime = { workspace = true } +people-kusama-runtime = { workspace = true } +kusama-system-emulated-network = { workspace = true } diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml index 9c73470343..e276e2e4c3 100644 --- a/relay/kusama/Cargo.toml +++ b/relay/kusama/Cargo.toml @@ -9,18 +9,18 @@ repository.workspace = true version.workspace = true [dependencies] -parity-scale-codec = { features = ["derive", "max-encoded-len"] , workspace = true } -scale-info = { features = ["derive"] , workspace = true } +codec = { features = ["derive", "max-encoded-len"], workspace = true } +scale-info = { features = ["derive"], workspace = true } log = { workspace = true } -authority-discovery-primitives = { package = "sp-authority-discovery", default-features = false , version = "27.0.0" } -babe-primitives = { package = "sp-consensus-babe", default-features = false , version = "0.33.0" } -beefy-primitives = { package = "sp-consensus-beefy", default-features = false , version = "14.0.0" } +authority-discovery-primitives = { workspace = true } +babe-primitives = { workspace = true } +beefy-primitives = { workspace = true } binary-merkle-tree = { workspace = true } -kusama-runtime-constants = { package = "kusama-runtime-constants", path = "constants", default-features = false } +kusama-runtime-constants = { workspace = true } sp-api = { workspace = true } -inherents = { package = "sp-inherents", default-features = false , version = "27.0.0" } -offchain-primitives = { package = "sp-offchain", default-features = false , version = "27.0.0" } +sp-inherents = { workspace = true } +sp-offchain = { workspace = true } sp-std = { workspace = true } sp-application-crypto = { workspace = true } sp-arithmetic = { workspace = true } @@ -32,8 +32,8 @@ sp-core = { workspace = true } sp-session = { workspace = true } sp-storage = { workspace = true } sp-version = { workspace = true } -tx-pool-api = { package = "sp-transaction-pool", default-features = false , version = "27.0.0" } -block-builder-api = { package = "sp-block-builder", default-features = false , version = "27.0.0" } +sp-transaction-pool = { workspace = true } +sp-block-builder = { workspace = true } sp-npos-elections = { workspace = true } pallet-asset-rate = { workspace = true } @@ -70,7 +70,7 @@ pallet-referenda = { workspace = true } pallet-scheduler = { workspace = true } pallet-session = { workspace = true } pallet-society = { workspace = true } -frame-support = { features = [ "tuples-96" ] , workspace = true } +frame-support = { features = ["tuples-96"], workspace = true } pallet-staking = { workspace = true } pallet-staking-runtime-api = { workspace = true } frame-system = { workspace = true } @@ -81,42 +81,42 @@ pallet-utility = { workspace = true } pallet-vesting = { workspace = true } pallet-whitelist = { workspace = true } pallet-xcm = { workspace = true } -pallet-xcm-benchmarks = { optional = true , workspace = true } +pallet-xcm-benchmarks = { optional = true, workspace = true } frame-election-provider-support = { workspace = true } -frame-benchmarking = { optional = true , workspace = true } -frame-try-runtime = { optional = true , workspace = true } -pallet-offences-benchmarking = { optional = true , workspace = true } -pallet-session-benchmarking = { optional = true , workspace = true } -pallet-nomination-pools-benchmarking = { optional = true , workspace = true } -frame-system-benchmarking = { optional = true , workspace = true } -pallet-election-provider-support-benchmarking = { optional = true , workspace = true } +frame-benchmarking = { optional = true, workspace = true } +frame-try-runtime = { optional = true, workspace = true } +pallet-offences-benchmarking = { optional = true, workspace = true } +pallet-session-benchmarking = { optional = true, workspace = true } +pallet-nomination-pools-benchmarking = { optional = true, workspace = true } +frame-system-benchmarking = { optional = true, workspace = true } +pallet-election-provider-support-benchmarking = { optional = true, workspace = true } hex-literal = { workspace = true } -runtime-common = { package = "polkadot-runtime-common", default-features = false, version = "8.0.1" } -runtime-parachains = { package = "polkadot-runtime-parachains", default-features = false , version = "8.0.1" } -primitives = { package = "polkadot-primitives", default-features = false , version = "8.0.1" } +polkadot-runtime-common = { workspace = true } +runtime-parachains = { workspace = true } +polkadot-primitives = { workspace = true } -xcm = { package = "staging-xcm", default-features = false , version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.1" } +xcm = { workspace = true } +xcm-executor = { workspace = true } +xcm-builder = { workspace = true } sp-debug-derive = { workspace = true } [dev-dependencies] -keyring = { package = "sp-keyring", version = "32.0.0" } +sp-keyring = { workspace = true } sp-trie = { workspace = true } separator = { workspace = true } serde_json = { workspace = true } -remote-externalities = { package = "frame-remote-externalities", version = "0.36.0" } -tokio = { features = ["macros"] , workspace = true } +remote-externalities = { workspace = true } +tokio = { features = ["macros"], workspace = true } sp-tracing = { workspace = true } [build-dependencies] substrate-wasm-builder = { workspace = true } [features] -default = [ "std" ] +default = ["std"] no_std = [] only-staking = [] std = [ @@ -124,7 +124,7 @@ std = [ "babe-primitives/std", "beefy-primitives/std", "binary-merkle-tree/std", - "block-builder-api/std", + "codec/std", "frame-benchmarking?/std", "frame-election-provider-support/std", "frame-executive/std", @@ -133,10 +133,8 @@ std = [ "frame-system-rpc-runtime-api/std", "frame-system/std", "frame-try-runtime/std", - "inherents/std", "kusama-runtime-constants/std", "log/std", - "offchain-primitives/std", "pallet-asset-rate/std", "pallet-authority-discovery/std", "pallet-authorship/std", @@ -183,27 +181,29 @@ std = [ "pallet-whitelist/std", "pallet-xcm-benchmarks?/std", "pallet-xcm/std", - "parity-scale-codec/std", - "primitives/std", - "runtime-common/std", + "polkadot-primitives/std", + "polkadot-runtime-common/std", "runtime-parachains/std", "scale-info/std", "sp-api/std", "sp-application-crypto/std", "sp-arithmetic/std", + "sp-block-builder/std", "sp-core/std", "sp-debug-derive/std", "sp-genesis-builder/std", + "sp-inherents/std", "sp-io/std", "sp-npos-elections/std", + "sp-offchain/std", "sp-runtime/std", "sp-session/std", "sp-staking/std", "sp-std/std", "sp-storage/std", "sp-tracing/std", + "sp-transaction-pool/std", "sp-version/std", - "tx-pool-api/std", "xcm-builder/std", "xcm-executor/std", "xcm/std", @@ -251,8 +251,8 @@ runtime-benchmarks = [ "pallet-whitelist/runtime-benchmarks", "pallet-xcm-benchmarks/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", - "primitives/runtime-benchmarks", - "runtime-common/runtime-benchmarks", + "polkadot-primitives/runtime-benchmarks", + "polkadot-runtime-common/runtime-benchmarks", "runtime-parachains/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", @@ -304,7 +304,7 @@ try-runtime = [ "pallet-vesting/try-runtime", "pallet-whitelist/try-runtime", "pallet-xcm/try-runtime", - "runtime-common/try-runtime", + "polkadot-runtime-common/try-runtime", "runtime-parachains/try-runtime", "sp-runtime/try-runtime", ] @@ -312,11 +312,11 @@ try-runtime = [ # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. -on-chain-release-build = [ "sp-api/disable-logging" ] +on-chain-release-build = ["sp-api/disable-logging"] # Set timing constants (e.g. session period) to faster versions to speed up testing. fast-runtime = [] -runtime-metrics = [ "runtime-parachains/runtime-metrics", "sp-io/with-tracing" ] +runtime-metrics = ["runtime-parachains/runtime-metrics", "sp-io/with-tracing"] -force-debug = [ "sp-debug-derive/force-debug" ] +force-debug = ["sp-debug-derive/force-debug"] diff --git a/relay/kusama/constants/Cargo.toml b/relay/kusama/constants/Cargo.toml index e070c2d0d7..1c8a03a016 100644 --- a/relay/kusama/constants/Cargo.toml +++ b/relay/kusama/constants/Cargo.toml @@ -10,22 +10,22 @@ license.workspace = true smallvec = { workspace = true } frame-support = { workspace = true } -primitives = { package = "polkadot-primitives", default-features = false , version = "8.0.1" } -runtime-common = { package = "polkadot-runtime-common", default-features = false , version = "8.0.1" } +polkadot-primitives = { workspace = true } +polkadot-runtime-common = { workspace = true } sp-runtime = { workspace = true } sp-weights = { workspace = true } sp-core = { workspace = true } -xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.1" } +xcm-builder = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ "frame-support/std", - "primitives/std", - "runtime-common/std", + "polkadot-primitives/std", + "polkadot-runtime-common/std", "sp-core/std", "sp-runtime/std", "sp-weights/std", - "xcm-builder/std" + "xcm-builder/std", ] diff --git a/relay/kusama/constants/src/lib.rs b/relay/kusama/constants/src/lib.rs index 4310e3966e..335efd102a 100644 --- a/relay/kusama/constants/src/lib.rs +++ b/relay/kusama/constants/src/lib.rs @@ -20,7 +20,7 @@ pub mod weights; /// Money matters. pub mod currency { - use primitives::Balance; + use polkadot_primitives::Balance; /// The existential deposit. pub const EXISTENTIAL_DEPOSIT: Balance = CENTS; @@ -38,8 +38,8 @@ pub mod currency { /// Time and blocks. pub mod time { - use primitives::{BlockNumber, Moment}; - use runtime_common::prod_or_fast; + use polkadot_primitives::{BlockNumber, Moment}; + use polkadot_runtime_common::prod_or_fast; pub const MILLISECS_PER_BLOCK: Moment = 6000; pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK; pub const EPOCH_DURATION_IN_SLOTS: BlockNumber = prod_or_fast!(HOURS, MINUTES); @@ -63,7 +63,7 @@ pub mod fee { use frame_support::weights::{ WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }; - use primitives::Balance; + use polkadot_primitives::Balance; use smallvec::smallvec; pub use sp_runtime::Perbill; @@ -102,7 +102,7 @@ pub mod fee { /// System Parachains. pub mod system_parachain { - use primitives::Id; + use polkadot_primitives::Id; use xcm_builder::IsChildSystemParachain; /// Asset Hub parachain ID. @@ -131,7 +131,7 @@ mod tests { }; use crate::weights::ExtrinsicBaseWeight; use frame_support::weights::WeightToFee as WeightToFeeT; - use runtime_common::MAXIMUM_BLOCK_WEIGHT; + use polkadot_runtime_common::MAXIMUM_BLOCK_WEIGHT; #[test] // Test that the fee for `MAXIMUM_BLOCK_WEIGHT` of weight has sane bounds. diff --git a/relay/kusama/src/impls.rs b/relay/kusama/src/impls.rs index e9c3f970ec..20880646cb 100644 --- a/relay/kusama/src/impls.rs +++ b/relay/kusama/src/impls.rs @@ -15,15 +15,15 @@ // along with Polkadot. If not, see . use super::*; +use codec::{Decode, Encode}; use core::marker::PhantomData; use frame_support::{ defensive, pallet_prelude::DispatchResult, traits::tokens::ConversionFromAssetBalance, }; use frame_system::RawOrigin; use kusama_runtime_constants::system_parachain::PEOPLE_ID; -use parity_scale_codec::{Decode, Encode}; -use primitives::Id as ParaId; -use runtime_common::identity_migrator::{OnReapIdentity, WeightInfo}; +use polkadot_primitives::Id as ParaId; +use polkadot_runtime_common::identity_migrator::{OnReapIdentity, WeightInfo}; use xcm::{latest::prelude::*, VersionedXcm}; use xcm_builder::IsChildSystemParachain; use xcm_executor::traits::TransactAsset; diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index a3faef097e..e9e5370ca3 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -20,9 +20,9 @@ // `construct_runtime!` does a lot of recursion and requires us to increase the limit. #![recursion_limit = "512"] +use codec::{Decode, Encode, MaxEncodedLen}; use pallet_nis::WithMaximumOf; -use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; -use primitives::{ +use polkadot_primitives::{ slashing, vstaging::{ApprovalVotingParams, NodeFeatures}, AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CandidateHash, @@ -32,7 +32,7 @@ use primitives::{ ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, LOWEST_PUBLIC_ID, PARACHAIN_KEY_TYPE_ID, }; -use runtime_common::{ +use polkadot_runtime_common::{ auctions, claims, crowdloan, identity_migrator, impl_runtime_weights, impls::{ DealWithFees, LocatableAssetConverter, VersionedLocatableAsset, VersionedLocationConverter, @@ -148,6 +148,7 @@ pub mod impls; #[cfg(test)] mod tests; +use polkadot_runtime_common as runtime_common; impl_runtime_weights!(kusama_runtime_constants); // Make the WASM binary available. @@ -586,7 +587,8 @@ generate_solution_type!( pub struct OnChainSeqPhragmen; impl onchain::Config for OnChainSeqPhragmen { type System = Runtime; - type Solver = SequentialPhragmen; + type Solver = + SequentialPhragmen; type DataProvider = Staking; type WeightInfo = weights::frame_election_provider_support::WeightInfo; type MaxWinners = MaxActiveValidators; @@ -653,7 +655,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime { pallet_election_provider_multi_phase::SolutionAccuracyOf, (), >; - type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig; + type BenchmarkingConfig = polkadot_runtime_common::elections::BenchmarkConfig; type ForceOrigin = EitherOf, StakingAdmin>; type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo; type MaxWinners = MaxActiveValidators; @@ -691,7 +693,7 @@ impl pallet_staking::EraPayout for EraPayout { const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10); const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100; - runtime_common::impls::era_payout( + polkadot_runtime_common::impls::era_payout( total_staked, Nis::issuance().other, MAX_ANNUAL_INFLATION, @@ -753,7 +755,7 @@ impl pallet_staking::Config for Runtime { type MaxUnlockingChunks = frame_support::traits::ConstU32<32>; type HistoryDepth = frame_support::traits::ConstU32<84>; type MaxControllersInDeprecationBatch = ConstU32<5169>; - type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig; + type BenchmarkingConfig = polkadot_runtime_common::StakingBenchmarkingConfig; type EventListeners = NominationPools; type WeightInfo = weights::pallet_staking::WeightInfo; } @@ -824,7 +826,7 @@ impl pallet_treasury::Config for Runtime { type BalanceConverter = impls::NativeOnSystemParachain; type PayoutPeriod = PayoutSpendPeriod; #[cfg(feature = "runtime-benchmarks")] - type BenchmarkHelper = runtime_common::impls::benchmarks::TreasuryArguments; + type BenchmarkHelper = polkadot_runtime_common::impls::benchmarks::TreasuryArguments; } parameter_types! { @@ -1570,7 +1572,7 @@ impl pallet_asset_rate::Config for Runtime { type Currency = Balances; type AssetKind = ::AssetKind; #[cfg(feature = "runtime-benchmarks")] - type BenchmarkHelper = runtime_common::impls::benchmarks::AssetRateArguments; + type BenchmarkHelper = polkadot_runtime_common::impls::benchmarks::AssetRateArguments; } // A mock pallet to keep `ImOnline` events decodable after pallet removal @@ -1801,7 +1803,7 @@ pub mod migrations { use frame_support::traits::OnRuntimeUpgrade; use frame_system::RawOrigin; use pallet_scheduler::WeightInfo as SchedulerWeightInfo; - use runtime_common::auctions::WeightInfo as AuctionsWeightInfo; + use polkadot_runtime_common::auctions::WeightInfo as AuctionsWeightInfo; use runtime_parachains::configuration::WeightInfo; #[cfg(feature = "try-runtime")] use sp_core::crypto::ByteArray; @@ -2017,14 +2019,14 @@ pub type SignedPayload = generic::SignedPayload; mod benches { frame_benchmarking::define_benchmarks!( // Polkadot - // NOTE: Make sure to prefix these with `runtime_common::` so + // NOTE: Make sure to prefix these with `polkadot_runtime_common::` so // that the path resolves correctly in the generated file. - [runtime_common::auctions, Auctions] - [runtime_common::crowdloan, Crowdloan] - [runtime_common::claims, Claims] - [runtime_common::identity_migrator, IdentityMigrator] - [runtime_common::slots, Slots] - [runtime_common::paras_registrar, Registrar] + [polkadot_runtime_common::auctions, Auctions] + [polkadot_runtime_common::crowdloan, Crowdloan] + [polkadot_runtime_common::claims, Claims] + [polkadot_runtime_common::identity_migrator, IdentityMigrator] + [polkadot_runtime_common::slots, Slots] + [polkadot_runtime_common::paras_registrar, Registrar] [runtime_parachains::configuration, Configuration] [runtime_parachains::hrmp, Hrmp] [runtime_parachains::disputes, ParasDisputes] @@ -2106,7 +2108,7 @@ sp_api::impl_runtime_apis! { } } - impl block_builder_api::BlockBuilder for Runtime { + impl sp_block_builder::BlockBuilder for Runtime { fn apply_extrinsic(extrinsic: ::Extrinsic) -> ApplyExtrinsicResult { Executive::apply_extrinsic(extrinsic) } @@ -2115,19 +2117,19 @@ sp_api::impl_runtime_apis! { Executive::finalize_block() } - fn inherent_extrinsics(data: inherents::InherentData) -> Vec<::Extrinsic> { + fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<::Extrinsic> { data.create_extrinsics() } fn check_inherents( block: Block, - data: inherents::InherentData, - ) -> inherents::CheckInherentsResult { + data: sp_inherents::InherentData, + ) -> sp_inherents::CheckInherentsResult { data.check_extrinsics(&block) } } - impl tx_pool_api::runtime_api::TaggedTransactionQueue for Runtime { + impl sp_transaction_pool::runtime_api::TaggedTransactionQueue for Runtime { fn validate_transaction( source: TransactionSource, tx: ::Extrinsic, @@ -2137,14 +2139,14 @@ sp_api::impl_runtime_apis! { } } - impl offchain_primitives::OffchainWorkerApi for Runtime { + impl sp_offchain::OffchainWorkerApi for Runtime { fn offchain_worker(header: &::Header) { Executive::offchain_worker(header) } } #[api_version(10)] - impl primitives::runtime_api::ParachainHost for Runtime { + impl polkadot_primitives::runtime_api::ParachainHost for Runtime { fn validators() -> Vec { parachains_runtime_api_impl::validators::() } @@ -2174,7 +2176,7 @@ sp_api::impl_runtime_apis! { fn check_validation_outputs( para_id: ParaId, - outputs: primitives::CandidateCommitments, + outputs: polkadot_primitives::CandidateCommitments, ) -> bool { parachains_runtime_api_impl::check_validation_outputs::(para_id, outputs) } @@ -2230,8 +2232,8 @@ sp_api::impl_runtime_apis! { } fn submit_pvf_check_statement( - stmt: primitives::PvfCheckStatement, - signature: primitives::ValidatorSignature, + stmt: polkadot_primitives::PvfCheckStatement, + signature: polkadot_primitives::ValidatorSignature, ) { parachains_runtime_api_impl::submit_pvf_check_statement::(stmt, signature) } @@ -2258,7 +2260,7 @@ sp_api::impl_runtime_apis! { fn key_ownership_proof( validator_id: ValidatorId, ) -> Option { - use parity_scale_codec::Encode; + use codec::Encode; Historical::prove((PARACHAIN_KEY_TYPE_ID, validator_id)) .map(|p| p.encode()) @@ -2279,11 +2281,11 @@ sp_api::impl_runtime_apis! { parachains_runtime_api_impl::minimum_backing_votes::() } - fn para_backing_state(para_id: ParaId) -> Option { + fn para_backing_state(para_id: ParaId) -> Option { parachains_runtime_api_impl::backing_state::(para_id) } - fn async_backing_params() -> primitives::AsyncBackingParams { + fn async_backing_params() -> polkadot_primitives::AsyncBackingParams { parachains_runtime_api_impl::async_backing_params::() } @@ -2329,7 +2331,7 @@ sp_api::impl_runtime_apis! { _set_id: beefy_primitives::ValidatorSetId, authority_id: BeefyId, ) -> Option { - use parity_scale_codec::Encode; + use codec::Encode; Historical::prove((beefy_primitives::KEY_TYPE, authority_id)) .map(|p| p.encode()) @@ -2421,7 +2423,7 @@ sp_api::impl_runtime_apis! { _set_id: fg_primitives::SetId, authority_id: fg_primitives::AuthorityId, ) -> Option { - use parity_scale_codec::Encode; + use codec::Encode; Historical::prove((fg_primitives::KEY_TYPE, authority_id)) .map(|p| p.encode()) @@ -2458,7 +2460,7 @@ sp_api::impl_runtime_apis! { _slot: babe_primitives::Slot, authority_id: babe_primitives::AuthorityId, ) -> Option { - use parity_scale_codec::Encode; + use codec::Encode; Historical::prove((babe_primitives::KEY_TYPE, authority_id)) .map(|p| p.encode()) @@ -2668,14 +2670,14 @@ sp_api::impl_runtime_apis! { use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; impl pallet_xcm::benchmarking::Config for Runtime { type DeliveryHelper = ( - runtime_common::xcm_sender::ToParachainDeliveryHelper< + polkadot_runtime_common::xcm_sender::ToParachainDeliveryHelper< XcmConfig, ExistentialDepositAsset, xcm_config::PriceForChildParachainDelivery, AssetHubParaId, (), >, - runtime_common::xcm_sender::ToParachainDeliveryHelper< + polkadot_runtime_common::xcm_sender::ToParachainDeliveryHelper< XcmConfig, ExistentialDepositAsset, xcm_config::PriceForChildParachainDelivery, @@ -2732,7 +2734,7 @@ sp_api::impl_runtime_apis! { impl pallet_xcm_benchmarks::Config for Runtime { type XcmConfig = XcmConfig; type AccountIdConverter = SovereignAccountOf; - type DeliveryHelper = runtime_common::xcm_sender::ToParachainDeliveryHelper< + type DeliveryHelper = polkadot_runtime_common::xcm_sender::ToParachainDeliveryHelper< XcmConfig, ExistentialDepositAsset, xcm_config::PriceForChildParachainDelivery, @@ -2869,7 +2871,7 @@ mod multiplier_tests { dispatch::DispatchInfo, traits::{OnFinalize, PalletInfoAccess}, }; - use runtime_common::{MinimumMultiplier, TargetBlockFullness}; + use polkadot_runtime_common::{MinimumMultiplier, TargetBlockFullness}; use separator::Separatable; use sp_runtime::traits::Convert; @@ -3062,7 +3064,7 @@ mod remote_tests { .unwrap(); ext.execute_with(|| { pallet_fast_unstake::ErasToCheckPerBlock::::put(1); - runtime_common::try_runtime::migrate_all_inactive_nominators::() + polkadot_runtime_common::try_runtime::migrate_all_inactive_nominators::() }); } } diff --git a/relay/kusama/src/tests.rs b/relay/kusama/src/tests.rs index b5fc87781b..8d00742439 100644 --- a/relay/kusama/src/tests.rs +++ b/relay/kusama/src/tests.rs @@ -20,10 +20,10 @@ use crate::*; use frame_support::{ dispatch::GetDispatchInfo, traits::WhitelistedStorageKeys, weights::WeightToFee as WeightToFeeT, }; -use keyring::Sr25519Keyring::Charlie; -use runtime_common::MinimumMultiplier; +use polkadot_runtime_common::MinimumMultiplier; use separator::Separatable; use sp_core::hexdisplay::HexDisplay; +use sp_keyring::Sr25519Keyring::Charlie; use std::collections::HashSet; #[test] @@ -33,7 +33,7 @@ fn nis_hold_reason_encoding_is_correct() { #[test] fn remove_keys_weight_is_sensible() { - use runtime_common::crowdloan::WeightInfo; + use polkadot_runtime_common::crowdloan::WeightInfo; let max_weight = ::WeightInfo::refund(RemoveKeysLimit::get()); // Max remove keys limit should be no more than half the total block weight. assert!((max_weight * 2).all_lt(BlockWeights::get().max_block)); @@ -41,7 +41,7 @@ fn remove_keys_weight_is_sensible() { #[test] fn sample_size_is_sensible() { - use runtime_common::auctions::WeightInfo; + use polkadot_runtime_common::auctions::WeightInfo; // Need to clean up all samples at the end of an auction. let samples: BlockNumber = EndingPeriod::get() / SampleLength::get(); let max_weight: Weight = RocksDbWeight::get().reads_writes(samples.into(), samples.into()); diff --git a/relay/kusama/src/weights/runtime_common_auctions.rs b/relay/kusama/src/weights/runtime_common_auctions.rs index cad85a6d09..3ae18a8155 100644 --- a/relay/kusama/src/weights/runtime_common_auctions.rs +++ b/relay/kusama/src/weights/runtime_common_auctions.rs @@ -13,7 +13,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `runtime_common::auctions` +//! Autogenerated weights for `polkadot_runtime_common::auctions` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -28,7 +28,7 @@ // --chain=./kusama-chain-spec.json // --steps=50 // --repeat=20 -// --pallet=runtime_common::auctions +// --pallet=polkadot_runtime_common::auctions // --extrinsic=* // --wasm-execution=compiled // --heap-pages=4096 @@ -43,9 +43,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::auctions`. +/// Weight functions for `polkadot_runtime_common::auctions`. pub struct WeightInfo(PhantomData); -impl runtime_common::auctions::WeightInfo for WeightInfo { +impl polkadot_runtime_common::auctions::WeightInfo for WeightInfo { /// Storage: `Auctions::AuctionInfo` (r:1 w:1) /// Proof: `Auctions::AuctionInfo` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`) /// Storage: `Auctions::AuctionCounter` (r:1 w:1) diff --git a/relay/kusama/src/weights/runtime_common_claims.rs b/relay/kusama/src/weights/runtime_common_claims.rs index 92f70a3365..30d89a7011 100644 --- a/relay/kusama/src/weights/runtime_common_claims.rs +++ b/relay/kusama/src/weights/runtime_common_claims.rs @@ -13,7 +13,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `runtime_common::claims` +//! Autogenerated weights for `polkadot_runtime_common::claims` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -28,7 +28,7 @@ // --chain=./kusama-chain-spec.json // --steps=50 // --repeat=20 -// --pallet=runtime_common::claims +// --pallet=polkadot_runtime_common::claims // --extrinsic=* // --wasm-execution=compiled // --heap-pages=4096 @@ -43,9 +43,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::claims`. +/// Weight functions for `polkadot_runtime_common::claims`. pub struct WeightInfo(PhantomData); -impl runtime_common::claims::WeightInfo for WeightInfo { +impl polkadot_runtime_common::claims::WeightInfo for WeightInfo { /// Storage: `Claims::Claims` (r:1 w:1) /// Proof: `Claims::Claims` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `Claims::Signing` (r:1 w:1) diff --git a/relay/kusama/src/weights/runtime_common_crowdloan.rs b/relay/kusama/src/weights/runtime_common_crowdloan.rs index c6a9edd129..ea9cf9a120 100644 --- a/relay/kusama/src/weights/runtime_common_crowdloan.rs +++ b/relay/kusama/src/weights/runtime_common_crowdloan.rs @@ -13,7 +13,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `runtime_common::crowdloan` +//! Autogenerated weights for `polkadot_runtime_common::crowdloan` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -28,7 +28,7 @@ // --chain=./kusama-chain-spec.json // --steps=50 // --repeat=20 -// --pallet=runtime_common::crowdloan +// --pallet=polkadot_runtime_common::crowdloan // --extrinsic=* // --wasm-execution=compiled // --heap-pages=4096 @@ -43,9 +43,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::crowdloan`. +/// Weight functions for `polkadot_runtime_common::crowdloan`. pub struct WeightInfo(PhantomData); -impl runtime_common::crowdloan::WeightInfo for WeightInfo { +impl polkadot_runtime_common::crowdloan::WeightInfo for WeightInfo { /// Storage: `Crowdloan::Funds` (r:1 w:1) /// Proof: `Crowdloan::Funds` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `Registrar::Paras` (r:1 w:0) diff --git a/relay/kusama/src/weights/runtime_common_identity_migrator.rs b/relay/kusama/src/weights/runtime_common_identity_migrator.rs index 9b0cb98e6c..28c80d1c4c 100644 --- a/relay/kusama/src/weights/runtime_common_identity_migrator.rs +++ b/relay/kusama/src/weights/runtime_common_identity_migrator.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . -//! Autogenerated weights for `runtime_common::identity_migrator` +//! Autogenerated weights for `polkadot_runtime_common::identity_migrator` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-02-29, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -32,7 +32,7 @@ // --no-storage-info // --no-median-slopes // --no-min-squares -// --pallet=runtime_common::identity_migrator +// --pallet=polkadot_runtime_common::identity_migrator // --extrinsic=* // --execution=wasm // --wasm-execution=compiled @@ -47,9 +47,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::identity_migrator`. +/// Weight functions for `polkadot_runtime_common::identity_migrator`. pub struct WeightInfo(PhantomData); -impl runtime_common::identity_migrator::WeightInfo for WeightInfo { +impl polkadot_runtime_common::identity_migrator::WeightInfo for WeightInfo { /// Storage: `Identity::IdentityOf` (r:1 w:1) /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) /// Storage: `Identity::SubsOf` (r:1 w:1) diff --git a/relay/kusama/src/weights/runtime_common_paras_registrar.rs b/relay/kusama/src/weights/runtime_common_paras_registrar.rs index 5ffcd2028f..da7ef411a5 100644 --- a/relay/kusama/src/weights/runtime_common_paras_registrar.rs +++ b/relay/kusama/src/weights/runtime_common_paras_registrar.rs @@ -13,7 +13,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `runtime_common::paras_registrar` +//! Autogenerated weights for `polkadot_runtime_common::paras_registrar` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -28,7 +28,7 @@ // --chain=./kusama-chain-spec.json // --steps=50 // --repeat=20 -// --pallet=runtime_common::paras_registrar +// --pallet=polkadot_runtime_common::paras_registrar // --extrinsic=* // --wasm-execution=compiled // --heap-pages=4096 @@ -43,9 +43,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::paras_registrar`. +/// Weight functions for `polkadot_runtime_common::paras_registrar`. pub struct WeightInfo(PhantomData); -impl runtime_common::paras_registrar::WeightInfo for WeightInfo { +impl polkadot_runtime_common::paras_registrar::WeightInfo for WeightInfo { /// Storage: `Registrar::NextFreeParaId` (r:1 w:1) /// Proof: `Registrar::NextFreeParaId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) /// Storage: `Registrar::Paras` (r:1 w:1) diff --git a/relay/kusama/src/weights/runtime_common_slots.rs b/relay/kusama/src/weights/runtime_common_slots.rs index b0311027df..dccac44368 100644 --- a/relay/kusama/src/weights/runtime_common_slots.rs +++ b/relay/kusama/src/weights/runtime_common_slots.rs @@ -13,7 +13,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `runtime_common::slots` +//! Autogenerated weights for `polkadot_runtime_common::slots` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -28,7 +28,7 @@ // --chain=./kusama-chain-spec.json // --steps=50 // --repeat=20 -// --pallet=runtime_common::slots +// --pallet=polkadot_runtime_common::slots // --extrinsic=* // --wasm-execution=compiled // --heap-pages=4096 @@ -43,9 +43,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::slots`. +/// Weight functions for `polkadot_runtime_common::slots`. pub struct WeightInfo(PhantomData); -impl runtime_common::slots::WeightInfo for WeightInfo { +impl polkadot_runtime_common::slots::WeightInfo for WeightInfo { /// Storage: `Slots::Leases` (r:1 w:1) /// Proof: `Slots::Leases` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `System::Account` (r:1 w:1) diff --git a/relay/kusama/src/xcm_config.rs b/relay/kusama/src/xcm_config.rs index 316f14ff3a..106550cc19 100644 --- a/relay/kusama/src/xcm_config.rs +++ b/relay/kusama/src/xcm_config.rs @@ -27,7 +27,7 @@ use frame_support::{ }; use frame_system::EnsureRoot; use kusama_runtime_constants::{currency::CENTS, system_parachain::*}; -use runtime_common::{ +use polkadot_runtime_common::{ xcm_sender::{ChildParachainRouter, ExponentialPrice}, ToAuthor, }; @@ -297,8 +297,8 @@ impl pallet_xcm::Config for Runtime { #[test] fn karura_liquid_staking_xcm_has_sane_weight_upper_limt() { + use codec::Decode; use frame_support::dispatch::GetDispatchInfo; - use parity_scale_codec::Decode; use xcm::VersionedXcm; use xcm_executor::traits::WeightBounds; diff --git a/relay/polkadot/Cargo.toml b/relay/polkadot/Cargo.toml index 52fd3131e4..b2cf870f7e 100644 --- a/relay/polkadot/Cargo.toml +++ b/relay/polkadot/Cargo.toml @@ -8,18 +8,18 @@ edition.workspace = true license.workspace = true [dependencies] -parity-scale-codec = { features = ["derive", "max-encoded-len"] , workspace = true } -scale-info = { features = ["derive"] , workspace = true } +codec = { features = ["derive", "max-encoded-len"], workspace = true } +scale-info = { features = ["derive"], workspace = true } log = { workspace = true } -authority-discovery-primitives = { package = "sp-authority-discovery", default-features = false , version = "27.0.0" } -babe-primitives = { package = "sp-consensus-babe", default-features = false , version = "0.33.0" } -beefy-primitives = { package = "sp-consensus-beefy", default-features = false , version = "14.0.0" } +authority-discovery-primitives = { workspace = true } +babe-primitives = { workspace = true } +beefy-primitives = { workspace = true } binary-merkle-tree = { workspace = true } -block-builder-api = { package = "sp-block-builder", default-features = false , version = "27.0.0" } -inherents = { package = "sp-inherents", default-features = false , version = "27.0.0" } -offchain-primitives = { package = "sp-offchain", default-features = false , version = "27.0.0" } -tx-pool-api = { package = "sp-transaction-pool", default-features = false , version = "27.0.0" } +sp-block-builder = { workspace = true } +sp-inherents = { workspace = true } +sp-offchain = { workspace = true } +sp-transaction-pool = { workspace = true } sp-arithmetic = { workspace = true } sp-api = { workspace = true } sp-genesis-builder = { workspace = true } @@ -72,7 +72,7 @@ pallet-staking-runtime-api = { workspace = true } pallet-state-trie-migration = { workspace = true } frame-system = { workspace = true } frame-system-rpc-runtime-api = { workspace = true } -polkadot-runtime-constants = { package = "polkadot-runtime-constants", path = "constants", default-features = false } +polkadot-runtime-constants = { workspace = true } pallet-timestamp = { workspace = true } pallet-treasury = { workspace = true } pallet-whitelist = { workspace = true } @@ -80,40 +80,40 @@ pallet-vesting = { workspace = true } pallet-utility = { workspace = true } frame-election-provider-support = { workspace = true } pallet-xcm = { workspace = true } -pallet-xcm-benchmarks = { optional = true , workspace = true } +pallet-xcm-benchmarks = { optional = true, workspace = true } -frame-benchmarking = { optional = true , workspace = true } -frame-try-runtime = { optional = true , workspace = true } -frame-system-benchmarking = { optional = true , workspace = true } -pallet-election-provider-support-benchmarking = { optional = true , workspace = true } -pallet-offences-benchmarking = { optional = true , workspace = true } -pallet-session-benchmarking = { optional = true , workspace = true } -pallet-nomination-pools-benchmarking = { optional = true , workspace = true } +frame-benchmarking = { optional = true, workspace = true } +frame-try-runtime = { optional = true, workspace = true } +frame-system-benchmarking = { optional = true, workspace = true } +pallet-election-provider-support-benchmarking = { optional = true, workspace = true } +pallet-offences-benchmarking = { optional = true, workspace = true } +pallet-session-benchmarking = { optional = true, workspace = true } +pallet-nomination-pools-benchmarking = { optional = true, workspace = true } -runtime-common = { package = "polkadot-runtime-common", default-features = false, version = "8.0.1" } -runtime-parachains = { package = "polkadot-runtime-parachains", default-features = false , version = "8.0.1" } -primitives = { package = "polkadot-primitives", default-features = false , version = "8.0.1" } +polkadot-runtime-common = { workspace = true } +runtime-parachains = { workspace = true } +polkadot-primitives = { workspace = true } -xcm = { package = "staging-xcm", default-features = false , version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.1" } +xcm = { workspace = true } +xcm-executor = { workspace = true } +xcm-builder = { workspace = true } sp-debug-derive = { workspace = true } [dev-dependencies] -keyring = { package = "sp-keyring", version = "32.0.0" } +sp-keyring = { workspace = true } sp-trie = { workspace = true } serde_json = { workspace = true } separator = { workspace = true } -remote-externalities = { package = "frame-remote-externalities", version = "0.36.0" } -tokio = { features = ["macros"] , workspace = true } +remote-externalities = { workspace = true } +tokio = { features = ["macros"], workspace = true } sp-tracing = { workspace = true } [build-dependencies] substrate-wasm-builder = { workspace = true } [features] -default = [ "std" ] +default = ["std"] no_std = [] only-staking = [] std = [ @@ -121,7 +121,7 @@ std = [ "babe-primitives/std", "beefy-primitives/std", "binary-merkle-tree/std", - "block-builder-api/std", + "codec/std", "frame-benchmarking?/std", "frame-election-provider-support/std", "frame-executive/std", @@ -130,17 +130,15 @@ std = [ "frame-system-rpc-runtime-api/std", "frame-system/std", "frame-try-runtime/std", - "inherents/std", "log/std", - "offchain-primitives/std", "pallet-asset-rate/std", "pallet-authority-discovery/std", "pallet-authorship/std", "pallet-babe/std", "pallet-bags-list/std", "pallet-balances/std", - "pallet-beefy/std", "pallet-beefy-mmr/std", + "pallet-beefy/std", "pallet-bounties/std", "pallet-child-bounties/std", "pallet-conviction-voting/std", @@ -177,28 +175,30 @@ std = [ "pallet-whitelist/std", "pallet-xcm-benchmarks?/std", "pallet-xcm/std", - "parity-scale-codec/std", + "polkadot-primitives/std", + "polkadot-runtime-common/std", "polkadot-runtime-constants/std", - "primitives/std", - "runtime-common/std", "runtime-parachains/std", "scale-info/std", "sp-api/std", "sp-application-crypto/std", "sp-arithmetic/std", + "sp-block-builder/std", "sp-core/std", "sp-debug-derive/std", "sp-genesis-builder/std", + "sp-inherents/std", "sp-io/std", "sp-npos-elections/std", + "sp-offchain/std", "sp-runtime/std", "sp-session/std", "sp-staking/std", "sp-std/std", "sp-storage/std", "sp-tracing/std", + "sp-transaction-pool/std", "sp-version/std", - "tx-pool-api/std", "xcm-builder/std", "xcm-executor/std", "xcm/std", @@ -243,8 +243,8 @@ runtime-benchmarks = [ "pallet-whitelist/runtime-benchmarks", "pallet-xcm-benchmarks/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", - "primitives/runtime-benchmarks", - "runtime-common/runtime-benchmarks", + "polkadot-primitives/runtime-benchmarks", + "polkadot-runtime-common/runtime-benchmarks", "runtime-parachains/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", @@ -293,7 +293,7 @@ try-runtime = [ "pallet-vesting/try-runtime", "pallet-whitelist/try-runtime", "pallet-xcm/try-runtime", - "runtime-common/try-runtime", + "polkadot-runtime-common/try-runtime", "runtime-parachains/try-runtime", "sp-runtime/try-runtime", ] @@ -301,11 +301,11 @@ try-runtime = [ # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. -on-chain-release-build = [ "sp-api/disable-logging" ] +on-chain-release-build = ["sp-api/disable-logging"] # Set timing constants (e.g. session period) to faster versions to speed up testing. fast-runtime = [] -runtime-metrics = [ "runtime-parachains/runtime-metrics", "sp-io/with-tracing" ] +runtime-metrics = ["runtime-parachains/runtime-metrics", "sp-io/with-tracing"] -force-debug = [ "sp-debug-derive/force-debug" ] +force-debug = ["sp-debug-derive/force-debug"] diff --git a/relay/polkadot/constants/Cargo.toml b/relay/polkadot/constants/Cargo.toml index 1e7f541293..81fd205db6 100644 --- a/relay/polkadot/constants/Cargo.toml +++ b/relay/polkadot/constants/Cargo.toml @@ -10,22 +10,22 @@ license.workspace = true smallvec = { workspace = true } frame-support = { workspace = true } -primitives = { package = "polkadot-primitives", default-features = false , version = "8.0.1" } -runtime-common = { package = "polkadot-runtime-common", default-features = false , version = "8.0.1" } +polkadot-primitives = { workspace = true } +polkadot-runtime-common = { workspace = true } sp-runtime = { workspace = true } sp-weights = { workspace = true } sp-core = { workspace = true } -xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.1" } +xcm-builder = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ "frame-support/std", - "primitives/std", - "runtime-common/std", + "polkadot-primitives/std", + "polkadot-runtime-common/std", "sp-core/std", "sp-runtime/std", "sp-weights/std", - "xcm-builder/std" + "xcm-builder/std", ] diff --git a/relay/polkadot/constants/src/lib.rs b/relay/polkadot/constants/src/lib.rs index 1ddd59d86a..49cc6b3560 100644 --- a/relay/polkadot/constants/src/lib.rs +++ b/relay/polkadot/constants/src/lib.rs @@ -22,7 +22,7 @@ pub use self::currency::DOLLARS; /// Money matters. pub mod currency { - use primitives::Balance; + use polkadot_primitives::Balance; /// The existential deposit. pub const EXISTENTIAL_DEPOSIT: Balance = 100 * CENTS; @@ -40,8 +40,8 @@ pub mod currency { /// Time and blocks. pub mod time { - use primitives::{BlockNumber, Moment}; - use runtime_common::prod_or_fast; + use polkadot_primitives::{BlockNumber, Moment}; + use polkadot_runtime_common::prod_or_fast; pub const MILLISECS_PER_BLOCK: Moment = 6000; pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK; pub const EPOCH_DURATION_IN_SLOTS: BlockNumber = prod_or_fast!(4 * HOURS, MINUTES); @@ -65,7 +65,7 @@ pub mod fee { use frame_support::weights::{ WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }; - use primitives::Balance; + use polkadot_primitives::Balance; use smallvec::smallvec; pub use sp_runtime::Perbill; @@ -120,7 +120,7 @@ pub mod xcm { /// System Parachains. pub mod system_parachain { - use primitives::Id; + use polkadot_primitives::Id; use xcm_builder::IsChildSystemParachain; /// Asset Hub parachain ID. @@ -145,7 +145,7 @@ mod tests { }; use crate::weights::ExtrinsicBaseWeight; use frame_support::weights::WeightToFee as WeightToFeeT; - use runtime_common::MAXIMUM_BLOCK_WEIGHT; + use polkadot_runtime_common::MAXIMUM_BLOCK_WEIGHT; #[test] // Test that the fee for `MAXIMUM_BLOCK_WEIGHT` of weight has sane bounds. diff --git a/relay/polkadot/src/impls.rs b/relay/polkadot/src/impls.rs index 3e13683348..8d2d76d224 100644 --- a/relay/polkadot/src/impls.rs +++ b/relay/polkadot/src/impls.rs @@ -17,7 +17,7 @@ use super::*; use core::marker::PhantomData; use frame_support::traits::{tokens::ConversionFromAssetBalance, Contains}; -use primitives::Id as ParaId; +use polkadot_primitives::Id as ParaId; use xcm_builder::IsChildSystemParachain; // TODO: replace by types from polkadot-sdk https://github.com/paritytech/polkadot-sdk/pull/3659 diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs index 5e1695038c..0a34ccc385 100644 --- a/relay/polkadot/src/lib.rs +++ b/relay/polkadot/src/lib.rs @@ -21,7 +21,7 @@ #![recursion_limit = "512"] use pallet_transaction_payment::CurrencyAdapter; -use runtime_common::{ +use polkadot_runtime_common::{ auctions, claims, crowdloan, impl_runtime_weights, impls::{ DealWithFees, LocatableAssetConverter, VersionedLocatableAsset, VersionedLocationConverter, @@ -50,6 +50,7 @@ use beefy_primitives::{ ecdsa_crypto::{AuthorityId as BeefyId, Signature as BeefySignature}, mmr::{BeefyDataProvider, MmrLeafVersion}, }; +use codec::{Decode, Encode, MaxEncodedLen}; use frame_election_provider_support::{ bounds::ElectionBoundsBuilder, generate_solution_type, onchain, SequentialPhragmen, }; @@ -70,8 +71,7 @@ use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId}; use pallet_identity::legacy::IdentityInfo; use pallet_session::historical as session_historical; use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo}; -use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; -use primitives::{ +use polkadot_primitives::{ slashing, vstaging::{ApprovalVotingParams, NodeFeatures}, AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CandidateHash, @@ -134,6 +134,7 @@ pub mod xcm_config; pub const LOG_TARGET: &str = "runtime::polkadot"; +use polkadot_runtime_common as runtime_common; impl_runtime_weights!(polkadot_runtime_constants); // Make the WASM binary available. @@ -562,7 +563,8 @@ generate_solution_type!( pub struct OnChainSeqPhragmen; impl onchain::Config for OnChainSeqPhragmen { type System = Runtime; - type Solver = SequentialPhragmen; + type Solver = + SequentialPhragmen; type DataProvider = Staking; type WeightInfo = weights::frame_election_provider_support::WeightInfo; type MaxWinners = MaxActiveValidators; @@ -629,7 +631,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime { pallet_election_provider_multi_phase::SolutionAccuracyOf, (), >; - type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig; + type BenchmarkingConfig = polkadot_runtime_common::elections::BenchmarkConfig; type ForceOrigin = EitherOf, StakingAdmin>; type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo; type MaxWinners = MaxActiveValidators; @@ -793,7 +795,7 @@ impl pallet_staking::Config for Runtime { type MaxUnlockingChunks = frame_support::traits::ConstU32<32>; type HistoryDepth = frame_support::traits::ConstU32<84>; type MaxControllersInDeprecationBatch = ConstU32<5314>; - type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig; + type BenchmarkingConfig = polkadot_runtime_common::StakingBenchmarkingConfig; type EventListeners = NominationPools; type WeightInfo = weights::pallet_staking::WeightInfo; } @@ -897,7 +899,7 @@ impl pallet_treasury::Config for Runtime { type BalanceConverter = impls::NativeOnSystemParachain; type PayoutPeriod = PayoutSpendPeriod; #[cfg(feature = "runtime-benchmarks")] - type BenchmarkHelper = runtime_common::impls::benchmarks::TreasuryArguments; + type BenchmarkHelper = polkadot_runtime_common::impls::benchmarks::TreasuryArguments; } parameter_types! { @@ -1504,8 +1506,8 @@ impl pallet_nomination_pools::Config for Runtime { type Currency = Balances; type RuntimeFreezeReason = RuntimeFreezeReason; type RewardCounter = FixedU128; - type BalanceToU256 = runtime_common::BalanceToU256; - type U256ToBalance = runtime_common::U256ToBalance; + type BalanceToU256 = polkadot_runtime_common::BalanceToU256; + type U256ToBalance = polkadot_runtime_common::U256ToBalance; type Staking = Staking; type PostUnbondingPoolsWindow = frame_support::traits::ConstU32<4>; type MaxMetadataLen = frame_support::traits::ConstU32<256>; @@ -1570,7 +1572,7 @@ impl pallet_asset_rate::Config for Runtime { type Currency = Balances; type AssetKind = ::AssetKind; #[cfg(feature = "runtime-benchmarks")] - type BenchmarkHelper = runtime_common::impls::benchmarks::AssetRateArguments; + type BenchmarkHelper = polkadot_runtime_common::impls::benchmarks::AssetRateArguments; } // A mock pallet to keep `ImOnline` events decodable after pallet removal @@ -1908,13 +1910,13 @@ pub type SignedPayload = generic::SignedPayload; mod benches { frame_benchmarking::define_benchmarks!( // Polkadot - // NOTE: Make sure to prefix these with `runtime_common::` so + // NOTE: Make sure to prefix these with `polkadot_runtime_common::` so // the that path resolves correctly in the generated file. - [runtime_common::auctions, Auctions] - [runtime_common::claims, Claims] - [runtime_common::crowdloan, Crowdloan] - [runtime_common::slots, Slots] - [runtime_common::paras_registrar, Registrar] + [polkadot_runtime_common::auctions, Auctions] + [polkadot_runtime_common::claims, Claims] + [polkadot_runtime_common::crowdloan, Crowdloan] + [polkadot_runtime_common::slots, Slots] + [polkadot_runtime_common::paras_registrar, Registrar] [runtime_parachains::configuration, Configuration] [runtime_parachains::disputes, ParasDisputes] [runtime_parachains::disputes::slashing, ParasSlashing] @@ -1988,7 +1990,7 @@ sp_api::impl_runtime_apis! { } } - impl block_builder_api::BlockBuilder for Runtime { + impl sp_block_builder::BlockBuilder for Runtime { fn apply_extrinsic(extrinsic: ::Extrinsic) -> ApplyExtrinsicResult { Executive::apply_extrinsic(extrinsic) } @@ -1997,14 +1999,14 @@ sp_api::impl_runtime_apis! { Executive::finalize_block() } - fn inherent_extrinsics(data: inherents::InherentData) -> Vec<::Extrinsic> { + fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<::Extrinsic> { data.create_extrinsics() } fn check_inherents( block: Block, - data: inherents::InherentData, - ) -> inherents::CheckInherentsResult { + data: sp_inherents::InherentData, + ) -> sp_inherents::CheckInherentsResult { data.check_extrinsics(&block) } } @@ -2037,7 +2039,7 @@ sp_api::impl_runtime_apis! { } } - impl tx_pool_api::runtime_api::TaggedTransactionQueue for Runtime { + impl sp_transaction_pool::runtime_api::TaggedTransactionQueue for Runtime { fn validate_transaction( source: TransactionSource, tx: ::Extrinsic, @@ -2047,14 +2049,14 @@ sp_api::impl_runtime_apis! { } } - impl offchain_primitives::OffchainWorkerApi for Runtime { + impl sp_offchain::OffchainWorkerApi for Runtime { fn offchain_worker(header: &::Header) { Executive::offchain_worker(header) } } #[api_version(10)] - impl primitives::runtime_api::ParachainHost for Runtime { + impl polkadot_primitives::runtime_api::ParachainHost for Runtime { fn validators() -> Vec { parachains_runtime_api_impl::validators::() } @@ -2084,7 +2086,7 @@ sp_api::impl_runtime_apis! { fn check_validation_outputs( para_id: ParaId, - outputs: primitives::CandidateCommitments, + outputs: polkadot_primitives::CandidateCommitments, ) -> bool { parachains_runtime_api_impl::check_validation_outputs::(para_id, outputs) } @@ -2140,8 +2142,8 @@ sp_api::impl_runtime_apis! { } fn submit_pvf_check_statement( - stmt: primitives::PvfCheckStatement, - signature: primitives::ValidatorSignature, + stmt: polkadot_primitives::PvfCheckStatement, + signature: polkadot_primitives::ValidatorSignature, ) { parachains_runtime_api_impl::submit_pvf_check_statement::(stmt, signature) } @@ -2168,7 +2170,7 @@ sp_api::impl_runtime_apis! { fn key_ownership_proof( validator_id: ValidatorId, ) -> Option { - use parity_scale_codec::Encode; + use codec::Encode; Historical::prove((PARACHAIN_KEY_TYPE_ID, validator_id)) .map(|p| p.encode()) @@ -2189,11 +2191,11 @@ sp_api::impl_runtime_apis! { parachains_runtime_api_impl::minimum_backing_votes::() } - fn para_backing_state(para_id: ParaId) -> Option { + fn para_backing_state(para_id: ParaId) -> Option { parachains_runtime_api_impl::backing_state::(para_id) } - fn async_backing_params() -> primitives::AsyncBackingParams { + fn async_backing_params() -> polkadot_primitives::AsyncBackingParams { parachains_runtime_api_impl::async_backing_params::() } @@ -2239,7 +2241,7 @@ sp_api::impl_runtime_apis! { _set_id: beefy_primitives::ValidatorSetId, authority_id: BeefyId, ) -> Option { - use parity_scale_codec::Encode; + use codec::Encode; Historical::prove((beefy_primitives::KEY_TYPE, authority_id)) .map(|p| p.encode()) @@ -2331,7 +2333,7 @@ sp_api::impl_runtime_apis! { _set_id: fg_primitives::SetId, authority_id: fg_primitives::AuthorityId, ) -> Option { - use parity_scale_codec::Encode; + use codec::Encode; Historical::prove((fg_primitives::KEY_TYPE, authority_id)) .map(|p| p.encode()) @@ -2368,7 +2370,7 @@ sp_api::impl_runtime_apis! { _slot: babe_primitives::Slot, authority_id: babe_primitives::AuthorityId, ) -> Option { - use parity_scale_codec::Encode; + use codec::Encode; Historical::prove((babe_primitives::KEY_TYPE, authority_id)) .map(|p| p.encode()) @@ -2541,14 +2543,14 @@ sp_api::impl_runtime_apis! { use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; impl pallet_xcm::benchmarking::Config for Runtime { type DeliveryHelper = ( - runtime_common::xcm_sender::ToParachainDeliveryHelper< + polkadot_runtime_common::xcm_sender::ToParachainDeliveryHelper< XcmConfig, ExistentialDepositAsset, xcm_config::PriceForChildParachainDelivery, AssetHubParaId, (), >, - runtime_common::xcm_sender::ToParachainDeliveryHelper< + polkadot_runtime_common::xcm_sender::ToParachainDeliveryHelper< XcmConfig, ExistentialDepositAsset, xcm_config::PriceForChildParachainDelivery, @@ -2605,7 +2607,7 @@ sp_api::impl_runtime_apis! { impl pallet_xcm_benchmarks::Config for Runtime { type XcmConfig = XcmConfig; type AccountIdConverter = SovereignAccountOf; - type DeliveryHelper = runtime_common::xcm_sender::ToParachainDeliveryHelper< + type DeliveryHelper = polkadot_runtime_common::xcm_sender::ToParachainDeliveryHelper< XcmConfig, ExistentialDepositAsset, xcm_config::PriceForChildParachainDelivery, @@ -2719,9 +2721,9 @@ sp_api::impl_runtime_apis! { mod test_fees { use super::*; use frame_support::{dispatch::GetDispatchInfo, weights::WeightToFee as WeightToFeeT}; - use keyring::Sr25519Keyring::{Alice, Charlie}; - use runtime_common::MinimumMultiplier; + use polkadot_runtime_common::MinimumMultiplier; use separator::Separatable; + use sp_keyring::Sr25519Keyring::{Alice, Charlie}; use sp_runtime::{assert_eq_error_rate, MultiAddress, MultiSignature}; #[test] @@ -2929,7 +2931,7 @@ mod multiplier_tests { dispatch::DispatchInfo, traits::{OnFinalize, PalletInfoAccess}, }; - use runtime_common::{MinimumMultiplier, TargetBlockFullness}; + use polkadot_runtime_common::{MinimumMultiplier, TargetBlockFullness}; use separator::Separatable; use sp_runtime::traits::Convert; @@ -3172,7 +3174,7 @@ mod remote_tests { .unwrap(); ext.execute_with(|| { pallet_fast_unstake::ErasToCheckPerBlock::::put(1); - runtime_common::try_runtime::migrate_all_inactive_nominators::() + polkadot_runtime_common::try_runtime::migrate_all_inactive_nominators::() }); } } @@ -3189,7 +3191,7 @@ mod init_state_migration { impl OnRuntimeUpgrade for InitMigrate { #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result, sp_runtime::DispatchError> { - use parity_scale_codec::Encode; + use codec::Encode; let migration_should_start = AutoLimits::::get().is_none() && MigrationProcess::::get() == Default::default(); Ok(migration_should_start.encode()) @@ -3222,7 +3224,7 @@ mod init_state_migration { fn post_upgrade( migration_should_start_bytes: Vec, ) -> Result<(), sp_runtime::DispatchError> { - use parity_scale_codec::Decode; + use codec::Decode; let migration_should_start: bool = Decode::decode(&mut migration_should_start_bytes.as_slice()) .expect("failed to decode migration should start"); diff --git a/relay/polkadot/src/weights/runtime_common_auctions.rs b/relay/polkadot/src/weights/runtime_common_auctions.rs index d7506c558f..fe653e91f8 100644 --- a/relay/polkadot/src/weights/runtime_common_auctions.rs +++ b/relay/polkadot/src/weights/runtime_common_auctions.rs @@ -13,7 +13,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `runtime_common::auctions` +//! Autogenerated weights for `polkadot_runtime_common::auctions` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -28,7 +28,7 @@ // --chain=./polkadot-chain-spec.json // --steps=50 // --repeat=20 -// --pallet=runtime_common::auctions +// --pallet=polkadot_runtime_common::auctions // --extrinsic=* // --wasm-execution=compiled // --heap-pages=4096 @@ -43,9 +43,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::auctions`. +/// Weight functions for `polkadot_runtime_common::auctions`. pub struct WeightInfo(PhantomData); -impl runtime_common::auctions::WeightInfo for WeightInfo { +impl polkadot_runtime_common::auctions::WeightInfo for WeightInfo { /// Storage: `Auctions::AuctionInfo` (r:1 w:1) /// Proof: `Auctions::AuctionInfo` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`) /// Storage: `Auctions::AuctionCounter` (r:1 w:1) diff --git a/relay/polkadot/src/weights/runtime_common_claims.rs b/relay/polkadot/src/weights/runtime_common_claims.rs index dee499c853..6a79828d81 100644 --- a/relay/polkadot/src/weights/runtime_common_claims.rs +++ b/relay/polkadot/src/weights/runtime_common_claims.rs @@ -13,7 +13,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `runtime_common::claims` +//! Autogenerated weights for `polkadot_runtime_common::claims` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -28,7 +28,7 @@ // --chain=./polkadot-chain-spec.json // --steps=50 // --repeat=20 -// --pallet=runtime_common::claims +// --pallet=polkadot_runtime_common::claims // --extrinsic=* // --wasm-execution=compiled // --heap-pages=4096 @@ -43,9 +43,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::claims`. +/// Weight functions for `polkadot_runtime_common::claims`. pub struct WeightInfo(PhantomData); -impl runtime_common::claims::WeightInfo for WeightInfo { +impl polkadot_runtime_common::claims::WeightInfo for WeightInfo { /// Storage: `Claims::Claims` (r:1 w:1) /// Proof: `Claims::Claims` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `Claims::Signing` (r:1 w:1) diff --git a/relay/polkadot/src/weights/runtime_common_crowdloan.rs b/relay/polkadot/src/weights/runtime_common_crowdloan.rs index 54f973de48..6dea79620b 100644 --- a/relay/polkadot/src/weights/runtime_common_crowdloan.rs +++ b/relay/polkadot/src/weights/runtime_common_crowdloan.rs @@ -13,7 +13,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `runtime_common::crowdloan` +//! Autogenerated weights for `polkadot_runtime_common::crowdloan` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -28,7 +28,7 @@ // --chain=./polkadot-chain-spec.json // --steps=50 // --repeat=20 -// --pallet=runtime_common::crowdloan +// --pallet=polkadot_runtime_common::crowdloan // --extrinsic=* // --wasm-execution=compiled // --heap-pages=4096 @@ -43,9 +43,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::crowdloan`. +/// Weight functions for `polkadot_runtime_common::crowdloan`. pub struct WeightInfo(PhantomData); -impl runtime_common::crowdloan::WeightInfo for WeightInfo { +impl polkadot_runtime_common::crowdloan::WeightInfo for WeightInfo { /// Storage: `Crowdloan::Funds` (r:1 w:1) /// Proof: `Crowdloan::Funds` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `Registrar::Paras` (r:1 w:0) diff --git a/relay/polkadot/src/weights/runtime_common_paras_registrar.rs b/relay/polkadot/src/weights/runtime_common_paras_registrar.rs index 621cece0d5..8b8bcaf2b1 100644 --- a/relay/polkadot/src/weights/runtime_common_paras_registrar.rs +++ b/relay/polkadot/src/weights/runtime_common_paras_registrar.rs @@ -13,7 +13,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `runtime_common::paras_registrar` +//! Autogenerated weights for `polkadot_runtime_common::paras_registrar` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -28,7 +28,7 @@ // --chain=./polkadot-chain-spec.json // --steps=50 // --repeat=20 -// --pallet=runtime_common::paras_registrar +// --pallet=polkadot_runtime_common::paras_registrar // --extrinsic=* // --wasm-execution=compiled // --heap-pages=4096 @@ -43,9 +43,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::paras_registrar`. +/// Weight functions for `polkadot_runtime_common::paras_registrar`. pub struct WeightInfo(PhantomData); -impl runtime_common::paras_registrar::WeightInfo for WeightInfo { +impl polkadot_runtime_common::paras_registrar::WeightInfo for WeightInfo { /// Storage: `Registrar::NextFreeParaId` (r:1 w:1) /// Proof: `Registrar::NextFreeParaId` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) /// Storage: `Registrar::Paras` (r:1 w:1) diff --git a/relay/polkadot/src/weights/runtime_common_slots.rs b/relay/polkadot/src/weights/runtime_common_slots.rs index b81a95dc5b..e9bcadddd4 100644 --- a/relay/polkadot/src/weights/runtime_common_slots.rs +++ b/relay/polkadot/src/weights/runtime_common_slots.rs @@ -13,7 +13,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `runtime_common::slots` +//! Autogenerated weights for `polkadot_runtime_common::slots` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 //! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -28,7 +28,7 @@ // --chain=./polkadot-chain-spec.json // --steps=50 // --repeat=20 -// --pallet=runtime_common::slots +// --pallet=polkadot_runtime_common::slots // --extrinsic=* // --wasm-execution=compiled // --heap-pages=4096 @@ -43,9 +43,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `runtime_common::slots`. +/// Weight functions for `polkadot_runtime_common::slots`. pub struct WeightInfo(PhantomData); -impl runtime_common::slots::WeightInfo for WeightInfo { +impl polkadot_runtime_common::slots::WeightInfo for WeightInfo { /// Storage: `Slots::Leases` (r:1 w:1) /// Proof: `Slots::Leases` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `System::Account` (r:1 w:1) diff --git a/relay/polkadot/src/xcm_config.rs b/relay/polkadot/src/xcm_config.rs index 678c8d18ea..d4a18b6bde 100644 --- a/relay/polkadot/src/xcm_config.rs +++ b/relay/polkadot/src/xcm_config.rs @@ -27,13 +27,13 @@ use frame_support::{ }; use frame_system::EnsureRoot; use pallet_xcm::XcmPassthrough; -use polkadot_runtime_constants::{ - currency::CENTS, system_parachain::*, xcm::body::FELLOWSHIP_ADMIN_INDEX, -}; -use runtime_common::{ +use polkadot_runtime_common::{ xcm_sender::{ChildParachainRouter, ExponentialPrice}, ToAuthor, }; +use polkadot_runtime_constants::{ + currency::CENTS, system_parachain::*, xcm::body::FELLOWSHIP_ADMIN_INDEX, +}; use sp_core::ConstU32; use xcm::latest::prelude::*; use xcm_builder::{ diff --git a/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml b/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml index 174abb81ed..6773a28111 100644 --- a/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml +++ b/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml @@ -9,18 +9,18 @@ repository.workspace = true version.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive", "max-encoded-len"] } +codec = { features = ["derive", "max-encoded-len"], workspace = true } hex-literal = { workspace = true } log = { workspace = true } -scale-info = { features = ["derive"] , workspace = true } +scale-info = { features = ["derive"], workspace = true } # Local -bp-asset-hub-kusama = { path = "./primitives", default-features = false} -bp-asset-hub-polkadot = { path = "../asset-hub-polkadot/primitives", default-features = false} -bp-bridge-hub-kusama = { path = "../../bridge-hubs/bridge-hub-kusama/primitives", default-features = false} -bp-bridge-hub-polkadot = { path = "../../bridge-hubs/bridge-hub-polkadot/primitives", default-features = false} -kusama-runtime-constants = { path = "../../../relay/kusama/constants", default-features = false} -polkadot-runtime-constants = { path = "../../../relay/polkadot/constants", default-features = false} +bp-asset-hub-kusama = { workspace = true } +bp-asset-hub-polkadot = { workspace = true } +bp-bridge-hub-kusama = { workspace = true } +bp-bridge-hub-polkadot = { workspace = true } +kusama-runtime-constants = { workspace = true } +polkadot-runtime-constants = { workspace = true } # Substrate frame-benchmarking = { optional = true, workspace = true } @@ -33,7 +33,7 @@ frame-try-runtime = { optional = true, workspace = true } pallet-asset-conversion-tx-payment = { workspace = true } pallet-assets = { workspace = true } pallet-asset-conversion = { workspace = true } -pallet-aura = { features = ["experimental"] , workspace = true } +pallet-aura = { features = ["experimental"], workspace = true } pallet-authorship = { workspace = true } pallet-balances = { workspace = true } pallet-message-queue = { workspace = true } @@ -43,7 +43,7 @@ pallet-nfts = { workspace = true } pallet-nfts-runtime-api = { workspace = true } pallet-proxy = { workspace = true } pallet-session = { workspace = true } -pallet-state-trie-migration = { optional = true , workspace = true } +pallet-state-trie-migration = { optional = true, workspace = true } pallet-timestamp = { workspace = true } pallet-transaction-payment = { workspace = true } pallet-transaction-payment-rpc-runtime-api = { workspace = true } @@ -65,32 +65,38 @@ sp-transaction-pool = { workspace = true } sp-version = { workspace = true } sp-weights = { workspace = true } # num-traits feature needed for dex integer sq root: -primitive-types = { features = ["codec", "scale-info", "num-traits"] , workspace = true } +primitive-types = { features = [ + "codec", + "num-traits", + "scale-info", +], workspace = true } # Polkadot pallet-xcm = { workspace = true } -pallet-xcm-benchmarks = { optional = true , workspace = true } +pallet-xcm-benchmarks = { optional = true, workspace = true } polkadot-core-primitives = { workspace = true } polkadot-parachain-primitives = { workspace = true } polkadot-runtime-common = { workspace = true } -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # Cumulus cumulus-pallet-aura-ext = { workspace = true } cumulus-pallet-dmp-queue = { workspace = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , workspace = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true } cumulus-pallet-session-benchmarking = { workspace = true } cumulus-pallet-xcm = { workspace = true } -cumulus-pallet-xcmp-queue = { features = ["bridging"] , workspace = true } +cumulus-pallet-xcmp-queue = { features = ["bridging"], workspace = true } cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-utility = { workspace = true } pallet-collator-selection = { workspace = true } -parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } +parachain-info = { workspace = true } parachains-common = { workspace = true } -system-parachains-constants = { path = "../../constants", default-features = false } +system-parachains-constants = { workspace = true } assets-common = { workspace = true } # Bridges @@ -103,10 +109,10 @@ parachains-runtimes-test-utils = { workspace = true } sp-io = { workspace = true, default-features = true } [build-dependencies] -substrate-wasm-builder = { optional = true , workspace = true } +substrate-wasm-builder = { optional = true, workspace = true } [features] -default = [ "std" ] +default = ["std"] # When enabled the `state_version` is set to `1`. # This means that the chain will start using the new state format. The migration is lazy, so # it requires to write a storage value to use the new state format. To migrate all the other @@ -114,13 +120,14 @@ default = [ "std" ] # This pallet will migrate the entire state, controlled through some account. # # This feature should be removed when the main-net will be migrated. -state-trie-version-1 = [ "pallet-state-trie-migration" ] +state-trie-version-1 = ["pallet-state-trie-migration"] runtime-benchmarks = [ "assets-common/runtime-benchmarks", "cumulus-pallet-dmp-queue/runtime-benchmarks", "cumulus-pallet-parachain-system/runtime-benchmarks", "cumulus-pallet-session-benchmarking/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", "cumulus-primitives-utility/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", @@ -143,14 +150,13 @@ runtime-benchmarks = [ "pallet-xcm-benchmarks/runtime-benchmarks", "pallet-xcm-bridge-hub-router/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", + "parachains-common/runtime-benchmarks", "polkadot-parachain-primitives/runtime-benchmarks", "polkadot-runtime-common/runtime-benchmarks", "snowbridge-router-primitives/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks", - "parachains-common/runtime-benchmarks" ] try-runtime = [ "cumulus-pallet-aura-ext/try-runtime", @@ -190,8 +196,8 @@ try-runtime = [ std = [ "assets-common/std", "bp-asset-hub-kusama/std", - "bp-bridge-hub-kusama/std", "bp-asset-hub-polkadot/std", + "bp-bridge-hub-kusama/std", "bp-bridge-hub-polkadot/std", "codec/std", "cumulus-pallet-aura-ext/std", @@ -242,6 +248,7 @@ std = [ "polkadot-parachain-primitives/std", "polkadot-runtime-common/std", "polkadot-runtime-constants/std", + "primitive-types/std", "scale-info/std", "snowbridge-router-primitives/std", "sp-api/std", @@ -263,10 +270,9 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", - "primitive-types/std" ] # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. -on-chain-release-build = [ "sp-api/disable-logging" ] +on-chain-release-build = ["sp-api/disable-logging"] diff --git a/system-parachains/asset-hubs/asset-hub-kusama/primitives/Cargo.toml b/system-parachains/asset-hubs/asset-hub-kusama/primitives/Cargo.toml index 9fd39f7cf3..7f22310349 100644 --- a/system-parachains/asset-hubs/asset-hub-kusama/primitives/Cargo.toml +++ b/system-parachains/asset-hubs/asset-hub-kusama/primitives/Cargo.toml @@ -8,11 +8,11 @@ edition.workspace = true license.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { features = ["derive"] , workspace = true } +codec = { features = ["derive", "max-encoded-len"], workspace = true } +scale-info = { features = ["derive"], workspace = true } # Local -system-parachains-constants = { path = "../../../constants", default-features = false } +system-parachains-constants = { workspace = true } # Bridge Dependencies bp-xcm-bridge-hub-router = { workspace = true } @@ -22,10 +22,10 @@ frame-support = { workspace = true } sp-std = { workspace = true } # Polkadot -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } +xcm = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ "bp-xcm-bridge-hub-router/std", "codec/std", @@ -33,5 +33,5 @@ std = [ "scale-info/std", "sp-std/std", "system-parachains-constants/std", - "xcm/std" + "xcm/std", ] diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml b/system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml index 4e58c0414f..842f5d723b 100644 --- a/system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml +++ b/system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml @@ -9,19 +9,19 @@ repository.workspace = true version.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive", "max-encoded-len"] } -hex-literal = { optional = true , workspace = true } +codec = { features = ["derive", "max-encoded-len"], workspace = true } +hex-literal = { optional = true, workspace = true } log = { workspace = true } -scale-info = { features = ["derive"] , workspace = true } +scale-info = { features = ["derive"], workspace = true } # Local -bp-asset-hub-kusama = { path = "../asset-hub-kusama/primitives", default-features = false} -bp-asset-hub-polkadot = { path = "./primitives", default-features = false} -bp-bridge-hub-kusama = { path = "../../bridge-hubs/bridge-hub-kusama/primitives", default-features = false} -bp-bridge-hub-polkadot = { path = "../../bridge-hubs/bridge-hub-polkadot/primitives", default-features = false} -collectives-polkadot-runtime-constants = { path = "../../collectives/collectives-polkadot/constants" } -kusama-runtime-constants = { path = "../../../relay/kusama/constants", default-features = false} -polkadot-runtime-constants = { path = "../../../relay/polkadot/constants", default-features = false} +bp-asset-hub-kusama = { workspace = true } +bp-asset-hub-polkadot = { workspace = true } +bp-bridge-hub-kusama = { workspace = true } +bp-bridge-hub-polkadot = { workspace = true } +collectives-polkadot-runtime-constants = { workspace = true } +kusama-runtime-constants = { workspace = true } +polkadot-runtime-constants = { workspace = true } # Substrate frame-benchmarking = { optional = true, workspace = true } @@ -34,7 +34,7 @@ frame-try-runtime = { optional = true, workspace = true } pallet-asset-conversion-tx-payment = { workspace = true } pallet-asset-conversion = { workspace = true } pallet-assets = { workspace = true } -pallet-aura = { features = ["experimental"] , workspace = true } +pallet-aura = { features = ["experimental"], workspace = true } pallet-authorship = { workspace = true } pallet-balances = { workspace = true } pallet-message-queue = { workspace = true } @@ -65,31 +65,37 @@ sp-transaction-pool = { workspace = true } sp-version = { workspace = true } sp-weights = { workspace = true } # num-traits feature needed for dex integer sq root: -primitive-types = { features = ["codec", "scale-info", "num-traits"] , workspace = true } +primitive-types = { features = [ + "codec", + "num-traits", + "scale-info", +], workspace = true } # Polkadot pallet-xcm = { workspace = true } -pallet-xcm-benchmarks = { optional = true , workspace = true } +pallet-xcm-benchmarks = { optional = true, workspace = true } polkadot-core-primitives = { workspace = true } polkadot-parachain-primitives = { workspace = true } polkadot-runtime-common = { workspace = true } -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # Cumulus cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , workspace = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true } cumulus-pallet-session-benchmarking = { workspace = true } cumulus-pallet-xcm = { workspace = true } -cumulus-pallet-xcmp-queue = { features = ["bridging"] , workspace = true } +cumulus-pallet-xcmp-queue = { features = ["bridging"], workspace = true } cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-utility = { workspace = true } pallet-collator-selection = { workspace = true } -parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } +parachain-info = { workspace = true } parachains-common = { workspace = true } -system-parachains-constants = { path = "../../constants", default-features = false } +system-parachains-constants = { workspace = true } assets-common = { workspace = true } # Bridges @@ -102,15 +108,16 @@ asset-test-utils = { workspace = true } parachains-runtimes-test-utils = { workspace = true } [build-dependencies] -substrate-wasm-builder = { optional = true , workspace = true } +substrate-wasm-builder = { optional = true, workspace = true } [features] -default = [ "std" ] +default = ["std"] runtime-benchmarks = [ "assets-common/runtime-benchmarks", "cumulus-pallet-parachain-system/runtime-benchmarks", "cumulus-pallet-session-benchmarking/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", "cumulus-primitives-utility/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", @@ -132,14 +139,13 @@ runtime-benchmarks = [ "pallet-xcm-benchmarks/runtime-benchmarks", "pallet-xcm-bridge-hub-router/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", + "parachains-common/runtime-benchmarks", "polkadot-parachain-primitives/runtime-benchmarks", "polkadot-runtime-common/runtime-benchmarks", "snowbridge-router-primitives/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks", - "parachains-common/runtime-benchmarks" ] try-runtime = [ "cumulus-pallet-aura-ext/try-runtime", @@ -225,6 +231,7 @@ std = [ "polkadot-parachain-primitives/std", "polkadot-runtime-common/std", "polkadot-runtime-constants/std", + "primitive-types/std", "scale-info/std", "snowbridge-router-primitives/std", "sp-api/std", @@ -247,10 +254,9 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", - "primitive-types/std" ] # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. -on-chain-release-build = [ "sp-api/disable-logging" ] +on-chain-release-build = ["sp-api/disable-logging"] diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/primitives/Cargo.toml b/system-parachains/asset-hubs/asset-hub-polkadot/primitives/Cargo.toml index 459c812e37..70382050d7 100644 --- a/system-parachains/asset-hubs/asset-hub-polkadot/primitives/Cargo.toml +++ b/system-parachains/asset-hubs/asset-hub-polkadot/primitives/Cargo.toml @@ -8,11 +8,11 @@ edition.workspace = true license.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { features = ["derive"] , workspace = true } +codec = { features = ["derive", "max-encoded-len"], workspace = true } +scale-info = { features = ["derive"], workspace = true } # Local -system-parachains-constants = { path = "../../../constants", default-features = false } +system-parachains-constants = { workspace = true } # Bridge Dependencies bp-xcm-bridge-hub-router = { workspace = true } @@ -22,10 +22,10 @@ frame-support = { workspace = true } sp-std = { workspace = true } # Polkadot -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } +xcm = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ "bp-xcm-bridge-hub-router/std", "codec/std", @@ -33,5 +33,5 @@ std = [ "scale-info/std", "sp-std/std", "system-parachains-constants/std", - "xcm/std" + "xcm/std", ] diff --git a/system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml b/system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml index b19f86310e..86c1cff6b6 100644 --- a/system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml +++ b/system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml @@ -9,22 +9,22 @@ repository.workspace = true version.workspace = true [build-dependencies] -substrate-wasm-builder = { optional = true , workspace = true } +substrate-wasm-builder = { optional = true, workspace = true } [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive"] } +codec = { features = ["derive"], workspace = true } hex-literal = { workspace = true } log = { workspace = true } -scale-info = { features = ["derive"] , workspace = true } -serde = { optional = true, features = ["derive"] , workspace = true } +scale-info = { features = ["derive"], workspace = true } +serde = { optional = true, features = ["derive"], workspace = true } # Local -bp-asset-hub-kusama = { path = "../../asset-hubs/asset-hub-kusama/primitives", default-features = false} -bp-asset-hub-polkadot = { path = "../../asset-hubs/asset-hub-polkadot/primitives", default-features = false} -bp-bridge-hub-kusama = { path = "./primitives", default-features = false} -bp-bridge-hub-polkadot = { path = "../bridge-hub-polkadot/primitives", default-features = false} -kusama-runtime-constants = { path = "../../../relay/kusama/constants", default-features = false} -polkadot-runtime-constants = { path = "../../../relay/polkadot/constants", default-features = false} +bp-asset-hub-kusama = { workspace = true } +bp-asset-hub-polkadot = { workspace = true } +bp-bridge-hub-kusama = { workspace = true } +bp-bridge-hub-polkadot = { workspace = true } +kusama-runtime-constants = { workspace = true } +polkadot-runtime-constants = { workspace = true } # Substrate frame-benchmarking = { optional = true, workspace = true } @@ -34,7 +34,7 @@ frame-system = { workspace = true } frame-system-benchmarking = { optional = true, workspace = true } frame-system-rpc-runtime-api = { workspace = true } frame-try-runtime = { optional = true, workspace = true } -pallet-aura = { features = ["experimental"] , workspace = true } +pallet-aura = { features = ["experimental"], workspace = true } pallet-authorship = { workspace = true } pallet-balances = { workspace = true } pallet-message-queue = { workspace = true } @@ -61,28 +61,30 @@ sp-version = { workspace = true } # Polkadot pallet-xcm = { workspace = true } -pallet-xcm-benchmarks = { optional = true , workspace = true } +pallet-xcm-benchmarks = { optional = true, workspace = true } polkadot-core-primitives = { workspace = true } polkadot-parachain-primitives = { workspace = true } polkadot-runtime-common = { workspace = true } -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # Cumulus cumulus-pallet-aura-ext = { workspace = true } cumulus-pallet-dmp-queue = { workspace = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , workspace = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true } cumulus-pallet-session-benchmarking = { workspace = true } cumulus-pallet-xcm = { workspace = true } -cumulus-pallet-xcmp-queue = { features = ["bridging"] , workspace = true } +cumulus-pallet-xcmp-queue = { features = ["bridging"], workspace = true } cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-utility = { workspace = true } pallet-collator-selection = { workspace = true } -parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } +parachain-info = { workspace = true } parachains-common = { workspace = true } -system-parachains-constants = { path = "../../constants", default-features = false } +system-parachains-constants = { workspace = true } # Bridges bp-header-chain = { workspace = true } @@ -99,7 +101,7 @@ pallet-bridge-grandpa = { workspace = true } pallet-bridge-messages = { workspace = true } pallet-bridge-parachains = { workspace = true } pallet-bridge-relayers = { workspace = true } -pallet-xcm-bridge-hub = { workspace = true } +pallet-xcm-bridge-hub = { workspace = true } # Ethereum Bridge (Snowbridge) snowbridge-beacon-primitives = { workspace = true } @@ -115,27 +117,29 @@ snowbridge-runtime-common = { workspace = true } [dev-dependencies] bridge-hub-test-utils = { workspace = true } -bridge-runtime-common = { features = ["integrity-test"] , workspace = true, default-features = true } +bridge-runtime-common = { features = [ + "integrity-test", +], workspace = true, default-features = true } sp-keyring = { workspace = true } static_assertions = { workspace = true } snowbridge-runtime-test-common = { workspace = true } parachains-runtimes-test-utils = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ "bp-asset-hub-kusama/std", "bp-asset-hub-polkadot/std", "bp-bridge-hub-kusama/std", "bp-bridge-hub-polkadot/std", "bp-header-chain/std", + "bp-kusama/std", "bp-messages/std", "bp-parachains/std", "bp-polkadot-core/std", + "bp-polkadot/std", "bp-relayers/std", "bp-runtime/std", - "bp-kusama/std", - "bp-polkadot/std", "bridge-hub-common/std", "bridge-runtime-common/std", "codec/std", @@ -185,14 +189,14 @@ std = [ "serde", "snowbridge-beacon-primitives/std", "snowbridge-core/std", + "snowbridge-outbound-queue-runtime-api/std", "snowbridge-pallet-ethereum-client/std", "snowbridge-pallet-inbound-queue/std", - "snowbridge-outbound-queue-runtime-api/std", "snowbridge-pallet-outbound-queue/std", + "snowbridge-pallet-system/std", "snowbridge-router-primitives/std", "snowbridge-runtime-common/std", "snowbridge-system-runtime-api/std", - "snowbridge-pallet-system/std", "sp-api/std", "sp-block-builder/std", "sp-consensus-aura/std", @@ -221,6 +225,7 @@ runtime-benchmarks = [ "cumulus-pallet-parachain-system/runtime-benchmarks", "cumulus-pallet-session-benchmarking/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", "cumulus-primitives-utility/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", @@ -246,14 +251,13 @@ runtime-benchmarks = [ "snowbridge-pallet-ethereum-client/runtime-benchmarks", "snowbridge-pallet-inbound-queue/runtime-benchmarks", "snowbridge-pallet-outbound-queue/runtime-benchmarks", + "snowbridge-pallet-system/runtime-benchmarks", "snowbridge-router-primitives/runtime-benchmarks", "snowbridge-runtime-common/runtime-benchmarks", "snowbridge-runtime-test-common/runtime-benchmarks", - "snowbridge-pallet-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks", ] try-runtime = [ @@ -294,4 +298,4 @@ try-runtime = [ # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. -on-chain-release-build = [ "sp-api/disable-logging" ] +on-chain-release-build = ["sp-api/disable-logging"] diff --git a/system-parachains/bridge-hubs/bridge-hub-kusama/primitives/Cargo.toml b/system-parachains/bridge-hubs/bridge-hub-kusama/primitives/Cargo.toml index 09616be7a4..fe7729765a 100644 --- a/system-parachains/bridge-hubs/bridge-hub-kusama/primitives/Cargo.toml +++ b/system-parachains/bridge-hubs/bridge-hub-kusama/primitives/Cargo.toml @@ -10,9 +10,9 @@ license.workspace = true [dependencies] # Local -kusama-runtime-constants = { path = "../../../../relay/kusama/constants", default-features = false } -polkadot-runtime-constants = { path = "../../../../relay/polkadot/constants", default-features = false } -system-parachains-constants = { path = "../../../constants", default-features = false } +kusama-runtime-constants = { workspace = true } +polkadot-runtime-constants = { workspace = true } +system-parachains-constants = { workspace = true } # Bridge Dependencies bp-bridge-hub-cumulus = { workspace = true } @@ -27,10 +27,10 @@ sp-runtime = { workspace = true } sp-std = { workspace = true } # Polkadot -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } +xcm = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ "bp-bridge-hub-cumulus/std", "bp-messages/std", diff --git a/system-parachains/bridge-hubs/bridge-hub-polkadot/Cargo.toml b/system-parachains/bridge-hubs/bridge-hub-polkadot/Cargo.toml index 0e02e51826..56126bb031 100644 --- a/system-parachains/bridge-hubs/bridge-hub-polkadot/Cargo.toml +++ b/system-parachains/bridge-hubs/bridge-hub-polkadot/Cargo.toml @@ -9,22 +9,22 @@ repository.workspace = true version.workspace = true [build-dependencies] -substrate-wasm-builder = { optional = true , workspace = true } +substrate-wasm-builder = { optional = true, workspace = true } [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive"] } +codec = { features = ["derive"], workspace = true } hex-literal = { workspace = true } log = { workspace = true } -scale-info = { features = ["derive"] , workspace = true } -serde = { optional = true, features = ["derive"] , workspace = true } +scale-info = { features = ["derive"], workspace = true } +serde = { optional = true, features = ["derive"], workspace = true } # Local -bp-asset-hub-kusama = { path = "../../asset-hubs/asset-hub-kusama/primitives", default-features = false} -bp-asset-hub-polkadot = { path = "../../asset-hubs/asset-hub-polkadot/primitives", default-features = false} -bp-bridge-hub-kusama = { path = "../bridge-hub-kusama/primitives", default-features = false} -bp-bridge-hub-polkadot = { path = "../bridge-hub-polkadot/primitives", default-features = false} -kusama-runtime-constants = { path = "../../../relay/kusama/constants", default-features = false} -polkadot-runtime-constants = { path = "../../../relay/polkadot/constants", default-features = false} +bp-asset-hub-kusama = { workspace = true } +bp-asset-hub-polkadot = { workspace = true } +bp-bridge-hub-kusama = { workspace = true } +bp-bridge-hub-polkadot = { workspace = true } +kusama-runtime-constants = { workspace = true } +polkadot-runtime-constants = { workspace = true } # Substrate frame-benchmarking = { optional = true, workspace = true } @@ -34,7 +34,7 @@ frame-system = { workspace = true } frame-system-benchmarking = { optional = true, workspace = true } frame-system-rpc-runtime-api = { workspace = true } frame-try-runtime = { optional = true, workspace = true } -pallet-aura = { features = ["experimental"] , workspace = true } +pallet-aura = { features = ["experimental"], workspace = true } pallet-authorship = { workspace = true } pallet-balances = { workspace = true } pallet-message-queue = { workspace = true } @@ -61,27 +61,29 @@ sp-version = { workspace = true } # Polkadot pallet-xcm = { workspace = true } -pallet-xcm-benchmarks = { optional = true , workspace = true } +pallet-xcm-benchmarks = { optional = true, workspace = true } polkadot-core-primitives = { workspace = true } polkadot-parachain-primitives = { workspace = true } polkadot-runtime-common = { workspace = true } -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # Cumulus cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , workspace = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true } cumulus-pallet-session-benchmarking = { workspace = true } cumulus-pallet-xcm = { workspace = true } -cumulus-pallet-xcmp-queue = { features = ["bridging"] , workspace = true } +cumulus-pallet-xcmp-queue = { features = ["bridging"], workspace = true } cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-utility = { workspace = true } pallet-collator-selection = { workspace = true } -parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } +parachain-info = { workspace = true } parachains-common = { workspace = true } -system-parachains-constants = { path = "../../constants", default-features = false } +system-parachains-constants = { workspace = true } # Bridges bp-header-chain = { workspace = true } @@ -98,7 +100,7 @@ pallet-bridge-grandpa = { workspace = true } pallet-bridge-messages = { workspace = true } pallet-bridge-parachains = { workspace = true } pallet-bridge-relayers = { workspace = true } -pallet-xcm-bridge-hub = { workspace = true } +pallet-xcm-bridge-hub = { workspace = true } # Ethereum Bridge (Snowbridge) snowbridge-beacon-primitives = { workspace = true } @@ -114,27 +116,29 @@ snowbridge-runtime-common = { workspace = true } [dev-dependencies] bridge-hub-test-utils = { workspace = true } -bridge-runtime-common = { features = ["integrity-test"] , workspace = true, default-features = true } +bridge-runtime-common = { features = [ + "integrity-test", +], workspace = true, default-features = true } sp-keyring = { workspace = true } static_assertions = { workspace = true } snowbridge-runtime-test-common = { workspace = true } parachains-runtimes-test-utils = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ "bp-asset-hub-kusama/std", "bp-asset-hub-polkadot/std", "bp-bridge-hub-kusama/std", "bp-bridge-hub-polkadot/std", "bp-header-chain/std", + "bp-kusama/std", "bp-messages/std", "bp-parachains/std", "bp-polkadot-core/std", + "bp-polkadot/std", "bp-relayers/std", "bp-runtime/std", - "bp-kusama/std", - "bp-polkadot/std", "bridge-hub-common/std", "bridge-runtime-common/std", "codec/std", @@ -153,8 +157,8 @@ std = [ "frame-system-rpc-runtime-api/std", "frame-system/std", "frame-try-runtime?/std", - "log/std", "kusama-runtime-constants/std", + "log/std", "pallet-aura/std", "pallet-authorship/std", "pallet-balances/std", @@ -183,14 +187,14 @@ std = [ "serde", "snowbridge-beacon-primitives/std", "snowbridge-core/std", + "snowbridge-outbound-queue-runtime-api/std", "snowbridge-pallet-ethereum-client/std", "snowbridge-pallet-inbound-queue/std", - "snowbridge-outbound-queue-runtime-api/std", "snowbridge-pallet-outbound-queue/std", + "snowbridge-pallet-system/std", "snowbridge-router-primitives/std", "snowbridge-runtime-common/std", "snowbridge-system-runtime-api/std", - "snowbridge-pallet-system/std", "sp-api/std", "sp-block-builder/std", "sp-consensus-aura/std", @@ -218,6 +222,7 @@ runtime-benchmarks = [ "cumulus-pallet-parachain-system/runtime-benchmarks", "cumulus-pallet-session-benchmarking/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", "cumulus-primitives-utility/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", @@ -243,14 +248,13 @@ runtime-benchmarks = [ "snowbridge-pallet-ethereum-client/runtime-benchmarks", "snowbridge-pallet-inbound-queue/runtime-benchmarks", "snowbridge-pallet-outbound-queue/runtime-benchmarks", + "snowbridge-pallet-system/runtime-benchmarks", "snowbridge-router-primitives/runtime-benchmarks", "snowbridge-runtime-common/runtime-benchmarks", "snowbridge-runtime-test-common/runtime-benchmarks", - "snowbridge-pallet-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks", ] try-runtime = [ @@ -290,4 +294,4 @@ try-runtime = [ # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. -on-chain-release-build = [ "sp-api/disable-logging" ] +on-chain-release-build = ["sp-api/disable-logging"] diff --git a/system-parachains/bridge-hubs/bridge-hub-polkadot/primitives/Cargo.toml b/system-parachains/bridge-hubs/bridge-hub-polkadot/primitives/Cargo.toml index 2ef5073045..404058b1a8 100644 --- a/system-parachains/bridge-hubs/bridge-hub-polkadot/primitives/Cargo.toml +++ b/system-parachains/bridge-hubs/bridge-hub-polkadot/primitives/Cargo.toml @@ -10,9 +10,9 @@ license.workspace = true [dependencies] # Local -kusama-runtime-constants = { path = "../../../../relay/kusama/constants", default-features = false } -polkadot-runtime-constants = { path = "../../../../relay/polkadot/constants", default-features = false } -system-parachains-constants = { path = "../../../constants", default-features = false } +kusama-runtime-constants = { workspace = true } +polkadot-runtime-constants = { workspace = true } +system-parachains-constants = { workspace = true } # Bridge Dependencies bp-bridge-hub-cumulus = { workspace = true } @@ -27,10 +27,10 @@ sp-runtime = { workspace = true } sp-std = { workspace = true } # Polkadot -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } +xcm = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ "bp-bridge-hub-cumulus/std", "bp-messages/std", @@ -38,10 +38,10 @@ std = [ "frame-support/std", "kusama-runtime-constants/std", "polkadot-runtime-constants/std", + "snowbridge-core/std", "sp-api/std", "sp-runtime/std", "sp-std/std", "system-parachains-constants/std", "xcm/std", - "snowbridge-core/std" ] diff --git a/system-parachains/collectives/collectives-polkadot/Cargo.toml b/system-parachains/collectives/collectives-polkadot/Cargo.toml index 94ab3b0dc3..93c26766d4 100644 --- a/system-parachains/collectives/collectives-polkadot/Cargo.toml +++ b/system-parachains/collectives/collectives-polkadot/Cargo.toml @@ -9,10 +9,10 @@ repository.workspace = true version.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive", "max-encoded-len"] } +codec = { features = ["derive", "max-encoded-len"], workspace = true } hex-literal = { workspace = true } log = { workspace = true } -scale-info = { features = ["derive"] , workspace = true } +scale-info = { features = ["derive"], workspace = true } # Substrate frame-benchmarking = { optional = true, workspace = true } @@ -24,7 +24,7 @@ frame-system-rpc-runtime-api = { workspace = true } frame-try-runtime = { optional = true, workspace = true } pallet-asset-rate = { workspace = true } pallet-alliance = { workspace = true } -pallet-aura = { features = ["experimental"] , workspace = true } +pallet-aura = { features = ["experimental"], workspace = true } pallet-authorship = { workspace = true } pallet-balances = { workspace = true } pallet-collective = { workspace = true } @@ -63,14 +63,16 @@ pallet-xcm = { workspace = true } polkadot-core-primitives = { workspace = true } polkadot-parachain-primitives = { workspace = true } polkadot-runtime-common = { workspace = true } -polkadot-runtime-constants = { path = "../../../relay/polkadot/constants", default-features = false} -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +polkadot-runtime-constants = { workspace = true } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # Cumulus cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , workspace = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true } cumulus-pallet-session-benchmarking = { workspace = true } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } @@ -78,22 +80,23 @@ cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-utility = { workspace = true } pallet-collator-selection = { workspace = true } -parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } +parachain-info = { workspace = true } parachains-common = { workspace = true } -system-parachains-constants = { path = "../../constants", default-features = false } +system-parachains-constants = { workspace = true } [dev-dependencies] -collectives-polkadot-runtime-constants = { path = "constants" } +collectives-polkadot-runtime-constants = { workspace = true } [build-dependencies] -substrate-wasm-builder = { optional = true , workspace = true } +substrate-wasm-builder = { optional = true, workspace = true } [features] -default = [ "std" ] +default = ["std"] runtime-benchmarks = [ "cumulus-pallet-parachain-system/runtime-benchmarks", "cumulus-pallet-session-benchmarking/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", "cumulus-primitives-utility/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", @@ -117,13 +120,12 @@ runtime-benchmarks = [ "pallet-treasury/runtime-benchmarks", "pallet-utility/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", + "parachains-common/runtime-benchmarks", "polkadot-parachain-primitives/runtime-benchmarks", "polkadot-runtime-common/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks", - "parachains-common/runtime-benchmarks" ] try-runtime = [ "cumulus-pallet-aura-ext/try-runtime", @@ -232,4 +234,4 @@ std = [ # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. -on-chain-release-build = [ "sp-api/disable-logging" ] +on-chain-release-build = ["sp-api/disable-logging"] diff --git a/system-parachains/collectives/collectives-polkadot/constants/Cargo.toml b/system-parachains/collectives/collectives-polkadot/constants/Cargo.toml index 3684a9aabf..c6f4b792ca 100644 --- a/system-parachains/collectives/collectives-polkadot/constants/Cargo.toml +++ b/system-parachains/collectives/collectives-polkadot/constants/Cargo.toml @@ -4,4 +4,4 @@ repository.workspace = true version.workspace = true authors.workspace = true edition.workspace = true -license.workspace = true \ No newline at end of file +license.workspace = true diff --git a/system-parachains/constants/Cargo.toml b/system-parachains/constants/Cargo.toml index 91de78d491..27dd92e1f5 100644 --- a/system-parachains/constants/Cargo.toml +++ b/system-parachains/constants/Cargo.toml @@ -11,15 +11,15 @@ license.workspace = true smallvec = { workspace = true } frame-support = { workspace = true } -kusama-runtime-constants = { path = "../../relay/kusama/constants", default-features = false} +kusama-runtime-constants = { workspace = true } parachains-common = { workspace = true } polkadot-core-primitives = { workspace = true } polkadot-primitives = { workspace = true } -polkadot-runtime-constants = { path = "../../relay/polkadot/constants", default-features = false} +polkadot-runtime-constants = { workspace = true } sp-runtime = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ "frame-support/std", "kusama-runtime-constants/std", diff --git a/system-parachains/coretime/coretime-kusama/Cargo.toml b/system-parachains/coretime/coretime-kusama/Cargo.toml index 5bda2d1681..14b0b42fe1 100644 --- a/system-parachains/coretime/coretime-kusama/Cargo.toml +++ b/system-parachains/coretime/coretime-kusama/Cargo.toml @@ -9,25 +9,25 @@ license.workspace = true build = "build.rs" [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive"] } +codec = { features = ["derive"], workspace = true } hex-literal = { workspace = true } log = { workspace = true } -scale-info = { features = ["derive"] , workspace = true } -serde = { optional = true, features = ["derive"] , workspace = true } +scale-info = { features = ["derive"], workspace = true } +serde = { optional = true, features = ["derive"], workspace = true } # Local -kusama-runtime-constants = { path = "../../../relay/kusama/constants", default-features = false} -system-parachains-constants = { path = "../../constants", default-features = false } +kusama-runtime-constants = { workspace = true } +system-parachains-constants = { workspace = true } # Substrate frame-benchmarking = { optional = true, workspace = true } frame-executive = { workspace = true } frame-support = { workspace = true } frame-system = { workspace = true } -frame-system-benchmarking = { optional = true , workspace = true } +frame-system-benchmarking = { optional = true, workspace = true } frame-system-rpc-runtime-api = { workspace = true } -frame-try-runtime = { optional = true , workspace = true } -pallet-aura = { features = ["experimental"] , workspace = true } +frame-try-runtime = { optional = true, workspace = true } +pallet-aura = { features = ["experimental"], workspace = true } pallet-authorship = { workspace = true } pallet-balances = { workspace = true } pallet-message-queue = { workspace = true } @@ -55,17 +55,19 @@ sp-version = { workspace = true } # Polkadot pallet-xcm = { workspace = true } -pallet-xcm-benchmarks = { optional = true , workspace = true } +pallet-xcm-benchmarks = { optional = true, workspace = true } polkadot-core-primitives = { workspace = true } polkadot-parachain-primitives = { workspace = true } polkadot-runtime-common = { workspace = true } -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # Cumulus cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , workspace = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true } cumulus-pallet-session-benchmarking = { workspace = true } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } @@ -73,14 +75,14 @@ cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-utility = { workspace = true } pallet-collator-selection = { workspace = true } -parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } +parachain-info = { workspace = true } parachains-common = { workspace = true } [dev-dependencies] parachains-runtimes-test-utils = { workspace = true } [build-dependencies] -substrate-wasm-builder = { optional = true , workspace = true } +substrate-wasm-builder = { optional = true, workspace = true } [features] default = ["std"] @@ -101,6 +103,7 @@ std = [ "frame-system-rpc-runtime-api/std", "frame-system/std", "frame-try-runtime?/std", + "kusama-runtime-constants/std", "log/std", "pallet-aura/std", "pallet-authorship/std", @@ -122,7 +125,6 @@ std = [ "polkadot-core-primitives/std", "polkadot-parachain-primitives/std", "polkadot-runtime-common/std", - "kusama-runtime-constants/std", "scale-info/std", "serde", "sp-api/std", @@ -139,10 +141,10 @@ std = [ "sp-transaction-pool/std", "sp-version/std", "substrate-wasm-builder", + "system-parachains-constants/std", "xcm-builder/std", "xcm-executor/std", "xcm/std", - "system-parachains-constants/std" ] runtime-benchmarks = [ @@ -207,4 +209,4 @@ fast-runtime = [] # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. -on-chain-release-build = [ "sp-api/disable-logging" ] +on-chain-release-build = ["sp-api/disable-logging"] diff --git a/system-parachains/encointer/Cargo.toml b/system-parachains/encointer/Cargo.toml index ed55e0f845..a36eba2f53 100644 --- a/system-parachains/encointer/Cargo.toml +++ b/system-parachains/encointer/Cargo.toml @@ -9,14 +9,10 @@ repository.workspace = true version.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = [ - "derive", -] } -hex-literal = { optional = true , workspace = true } +codec = { features = ["derive"], workspace = true } +hex-literal = { optional = true, workspace = true } log = { workspace = true } -scale-info = { features = [ - "derive", -] , workspace = true } +scale-info = { features = ["derive"], workspace = true } smallvec = { workspace = true } @@ -53,7 +49,7 @@ frame-system-benchmarking = { optional = true, workspace = true } frame-system-rpc-runtime-api = { workspace = true } frame-try-runtime = { optional = true, workspace = true } pallet-asset-tx-payment = { workspace = true } -pallet-aura = { features = ["experimental"] , workspace = true } +pallet-aura = { features = ["experimental"], workspace = true } pallet-balances = { workspace = true } pallet-collective = { workspace = true } pallet-insecure-randomness-collective-flip = { workspace = true } @@ -83,21 +79,21 @@ sp-genesis-builder = { workspace = true } pallet-xcm = { workspace = true } polkadot-parachain-primitives = { workspace = true } polkadot-runtime-common = { workspace = true } -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # Cumulus dependencies cumulus-pallet-aura-ext = { workspace = true } cumulus-pallet-parachain-system = { features = [ - "parameterized-consensus-hook", + "parameterized-consensus-hook", ], workspace = true } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-utility = { workspace = true } -parachain-info = { package = "staging-parachain-info", default-features = false, version = "0.8.0" } +parachain-info = { workspace = true } parachains-common = { workspace = true } polkadot-core-primitives = { workspace = true } polkadot-primitives = { workspace = true } @@ -110,19 +106,24 @@ substrate-wasm-builder = { optional = true, workspace = true } # so we need to copy all the contents from `system-parachains-constants` and `kusama-runtime-constants`. # We use these crates only for testing to ensure compatible values. # NOTE: Do not add this to the `[dependencies]` -kusama-runtime-constants = { path = "../../relay/kusama/constants" } -system-parachains-constants = { path = "../constants" } +kusama-runtime-constants = { workspace = true, default-features = true } +system-parachains-constants = { workspace = true, default-features = true } [features] default = ["std"] runtime-benchmarks = [ - "cumulus-pallet-xcmp-queue/runtime-benchmarks", "cumulus-pallet-parachain-system/runtime-benchmarks", + "cumulus-pallet-xcmp-queue/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", + "cumulus-primitives-utility/runtime-benchmarks", + "encointer-balances-tx-payment/runtime-benchmarks", + "encointer-primitives/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system-benchmarking/runtime-benchmarks", "frame-system/runtime-benchmarks", "hex-literal", + "pallet-asset-tx-payment/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-collective/runtime-benchmarks", "pallet-encointer-balances/runtime-benchmarks", @@ -132,26 +133,21 @@ runtime-benchmarks = [ "pallet-encointer-faucet/runtime-benchmarks", "pallet-encointer-reputation-commitments/runtime-benchmarks", "pallet-encointer-scheduler/runtime-benchmarks", - "pallet-message-queue/runtime-benchmarks", "pallet-membership/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks", "pallet-proxy/runtime-benchmarks", + "pallet-scheduler/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", "pallet-utility/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", + "parachains-common/runtime-benchmarks", + "polkadot-parachain-primitives/runtime-benchmarks", + "polkadot-primitives/runtime-benchmarks", "polkadot-runtime-common/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks", - "cumulus-primitives-utility/runtime-benchmarks", - "encointer-balances-tx-payment/runtime-benchmarks", - "encointer-primitives/runtime-benchmarks", - "pallet-asset-tx-payment/runtime-benchmarks", - "pallet-scheduler/runtime-benchmarks", - "parachains-common/runtime-benchmarks", - "polkadot-parachain-primitives/runtime-benchmarks", - "polkadot-primitives/runtime-benchmarks" ] std = [ "codec/std", @@ -166,8 +162,10 @@ std = [ "encointer-balances-tx-payment/std", "encointer-primitives/serde_derive", "encointer-primitives/std", + "frame-benchmarking?/std", "frame-executive/std", "frame-support/std", + "frame-system-benchmarking?/std", "frame-system-rpc-runtime-api/std", "frame-system/std", "frame-try-runtime?/std", @@ -187,9 +185,10 @@ std = [ "pallet-encointer-reputation-commitments/std", "pallet-encointer-scheduler/std", "pallet-insecure-randomness-collective-flip/std", - "pallet-message-queue/std", "pallet-membership/std", + "pallet-message-queue/std", "pallet-proxy/std", + "pallet-scheduler/std", "pallet-timestamp/std", "pallet-transaction-payment-rpc-runtime-api/std", "pallet-transaction-payment/std", @@ -198,6 +197,10 @@ std = [ "pallet-xcm/std", "parachain-info/std", "parachains-common/std", + "polkadot-core-primitives/std", + "polkadot-parachain-primitives/std", + "polkadot-primitives/std", + "polkadot-runtime-common/std", "scale-info/std", "sp-api/std", "sp-block-builder/std", @@ -215,13 +218,6 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", - "frame-benchmarking?/std", - "frame-system-benchmarking?/std", - "pallet-scheduler/std", - "polkadot-core-primitives/std", - "polkadot-parachain-primitives/std", - "polkadot-primitives/std", - "polkadot-runtime-common/std" ] @@ -230,7 +226,10 @@ try-runtime = [ "cumulus-pallet-parachain-system/try-runtime", "cumulus-pallet-xcm/try-runtime", "cumulus-pallet-xcmp-queue/try-runtime", + "encointer-balances-tx-payment/try-runtime", + "encointer-primitives/try-runtime", "frame-executive/try-runtime", + "frame-support/try-runtime", "frame-system/try-runtime", "frame-try-runtime/try-runtime", "pallet-asset-tx-payment/try-runtime", @@ -245,8 +244,8 @@ try-runtime = [ "pallet-encointer-reputation-commitments/try-runtime", "pallet-encointer-scheduler/try-runtime", "pallet-insecure-randomness-collective-flip/try-runtime", - "pallet-message-queue/try-runtime", "pallet-membership/try-runtime", + "pallet-message-queue/try-runtime", "pallet-proxy/try-runtime", "pallet-scheduler/try-runtime", "pallet-timestamp/try-runtime", @@ -255,15 +254,11 @@ try-runtime = [ "pallet-utility/try-runtime", "pallet-xcm/try-runtime", "parachain-info/try-runtime", - "encointer-balances-tx-payment/try-runtime", - "encointer-primitives/try-runtime", - "frame-support/try-runtime", "polkadot-runtime-common/try-runtime", - "sp-runtime/try-runtime" + "sp-runtime/try-runtime", ] # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. on-chain-release-build = ["sp-api/disable-logging"] - diff --git a/system-parachains/gluttons/glutton-kusama/Cargo.toml b/system-parachains/gluttons/glutton-kusama/Cargo.toml index e5014e173e..192e6a9721 100644 --- a/system-parachains/gluttons/glutton-kusama/Cargo.toml +++ b/system-parachains/gluttons/glutton-kusama/Cargo.toml @@ -9,8 +9,8 @@ repository.workspace = true version.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive"] } -scale-info = { features = ["derive"] , workspace = true } +codec = { features = ["derive"], workspace = true } +scale-info = { features = ["derive"], workspace = true } # Substrate frame-benchmarking = { optional = true, workspace = true } @@ -37,25 +37,28 @@ sp-transaction-pool = { workspace = true } sp-version = { workspace = true } # Polkadot -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # Cumulus -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , workspace = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true } cumulus-pallet-xcm = { workspace = true } cumulus-primitives-core = { workspace = true } -parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } +parachain-info = { workspace = true } parachains-common = { workspace = true } -system-parachains-constants = { path = "../../constants", default-features = false } +system-parachains-constants = { workspace = true } [build-dependencies] substrate-wasm-builder = { workspace = true } [features] -default = [ "std" ] +default = ["std"] runtime-benchmarks = [ "cumulus-pallet-parachain-system/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system-benchmarking/runtime-benchmarks", @@ -67,7 +70,6 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks" ] std = [ "codec/std", @@ -121,4 +123,4 @@ try-runtime = [ # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. -on-chain-release-build = [ "sp-api/disable-logging" ] +on-chain-release-build = ["sp-api/disable-logging"] diff --git a/system-parachains/people/people-kusama/Cargo.toml b/system-parachains/people/people-kusama/Cargo.toml index a4e7a9d11a..58016385c7 100644 --- a/system-parachains/people/people-kusama/Cargo.toml +++ b/system-parachains/people/people-kusama/Cargo.toml @@ -10,11 +10,11 @@ version.workspace = true [dependencies] enumflags2 = { workspace = true } -serde = { optional = true, features = ["derive"] , workspace = true } -codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive", "max-encoded-len"] } +serde = { optional = true, features = ["derive"], workspace = true } +codec = { features = ["derive", "max-encoded-len"], workspace = true } hex-literal = { workspace = true } log = { workspace = true } -scale-info = { features = ["derive"] , workspace = true } +scale-info = { features = ["derive"], workspace = true } # Substrate frame-benchmarking = { optional = true, workspace = true } @@ -24,7 +24,7 @@ frame-system = { workspace = true } frame-system-benchmarking = { optional = true, workspace = true } frame-system-rpc-runtime-api = { workspace = true } frame-try-runtime = { optional = true, workspace = true } -pallet-aura = { features = ["experimental"] , workspace = true } +pallet-aura = { features = ["experimental"], workspace = true } pallet-authorship = { workspace = true } pallet-balances = { workspace = true } pallet-identity = { workspace = true } @@ -52,30 +52,32 @@ sp-version = { workspace = true } # Polkadot pallet-xcm = { workspace = true } -pallet-xcm-benchmarks = { optional = true , workspace = true } +pallet-xcm-benchmarks = { optional = true, workspace = true } polkadot-parachain-primitives = { workspace = true } polkadot-runtime-common = { workspace = true } -kusama-runtime-constants = { path = "../../../relay/kusama/constants", default-features = false} -xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } +kusama-runtime-constants = { workspace = true } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # Cumulus cumulus-primitives-aura = { workspace = true } cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , workspace = true } +cumulus-pallet-parachain-system = { features = [ + "parameterized-consensus-hook", +], workspace = true } cumulus-pallet-session-benchmarking = { workspace = true } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-utility = { workspace = true } pallet-collator-selection = { workspace = true } -parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } +parachain-info = { workspace = true } parachains-common = { workspace = true } -system-parachains-constants = { path = "../../constants", default-features = false } +system-parachains-constants = { workspace = true } [build-dependencies] -substrate-wasm-builder = { optional = true , workspace = true } +substrate-wasm-builder = { optional = true, workspace = true } [features] default = ["std"] @@ -97,6 +99,7 @@ std = [ "frame-system-rpc-runtime-api/std", "frame-system/std", "frame-try-runtime?/std", + "kusama-runtime-constants/std", "log/std", "pallet-aura/std", "pallet-authorship/std", @@ -117,7 +120,6 @@ std = [ "parachains-common/std", "polkadot-parachain-primitives/std", "polkadot-runtime-common/std", - "kusama-runtime-constants/std", "scale-info/std", "serde", "sp-api/std", @@ -198,4 +200,4 @@ try-runtime = [ # A feature that should be enabled when the runtime should be built for on-chain # deployment. This will disable stuff that shouldn't be part of the on-chain wasm # to make it smaller, like logging for example. -on-chain-release-build = [ "sp-api/disable-logging" ] +on-chain-release-build = ["sp-api/disable-logging"]