From 9405a969f06b323becee6bda75570c99bb7b1515 Mon Sep 17 00:00:00 2001 From: Squirrel Date: Fri, 20 May 2022 13:43:04 +0100 Subject: [PATCH] dir restructure to support more CGP (#1266) * rerame res to chain-specs * split polkadot-parachains dir * rename dir parachains-common to common Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> Co-authored-by: Wilfried Kopp Co-authored-by: Chevdor --- .github/ISSUE_TEMPLATE/release.md | 6 +- .github/pr-custom-review.yml | 4 +- .github/workflows/release-02_create-draft.yml | 48 +++++++++++--- .github/workflows/srtool.yml | 65 ++++++++++++------- .gitlab-ci.yml | 2 +- Cargo.toml | 21 +++--- README.md | 2 +- docker/docker-compose.yml | 4 +- docker/injected.Dockerfile | 2 +- parachain-template/runtime/Cargo.toml | 2 +- .../chain-specs}/contracts-rococo.json | 0 .../chain-specs}/shell-statemint-head-data | 0 .../chain-specs}/shell-statemint.json | 0 .../chain-specs}/statemine.json | 0 .../chain-specs}/statemine_genesis.json | 0 .../statemine_genesis_values.json | 0 .../chain-specs}/statemint.json | 0 .../chain-specs}/statemint_genesis.json | 0 .../statemint_genesis_values.json | 0 .../statemint_genesis_values.scale | 0 .../res => parachains/chain-specs}/tick.json | 0 .../res => parachains/chain-specs}/track.json | 0 .../res => parachains/chain-specs}/trick.json | 0 .../chain-specs}/westmint.json | 0 .../chain-specs}/westmint_genesis.json | 0 .../chain-specs}/westmint_genesis_values.json | 0 .../common}/Cargo.toml | 0 .../common}/src/impls.rs | 0 .../common}/src/lib.rs | 0 .../common}/src/xcm_config.rs | 0 .../pallets/parachain-info/Cargo.toml | 0 .../pallets/parachain-info/src/lib.rs | 0 .../pallets/ping/Cargo.toml | 0 .../pallets/ping/src/lib.rs | 0 .../runtimes/assets}/statemine/Cargo.toml | 26 ++++---- .../runtimes/assets/statemine}/build.rs | 0 .../assets/statemine}/src/constants.rs | 0 .../runtimes/assets}/statemine/src/lib.rs | 0 .../statemine}/src/weights/block_weights.rs | 0 .../src/weights/cumulus_pallet_xcmp_queue.rs | 0 .../src/weights/extrinsic_weights.rs | 0 .../statemine/src/weights/frame_system.rs | 0 .../assets}/statemine/src/weights/mod.rs | 0 .../statemine/src/weights/pallet_assets.rs | 0 .../statemine/src/weights/pallet_balances.rs | 0 .../src/weights/pallet_collator_selection.rs | 0 .../statemine/src/weights/pallet_multisig.rs | 0 .../statemine/src/weights/pallet_proxy.rs | 0 .../statemine/src/weights/pallet_session.rs | 0 .../statemine/src/weights/pallet_timestamp.rs | 0 .../statemine/src/weights/pallet_uniques.rs | 0 .../statemine/src/weights/pallet_utility.rs | 0 .../src/weights/paritydb_weights.rs | 0 .../statemine}/src/weights/rocksdb_weights.rs | 0 .../assets}/statemine/src/xcm_config.rs | 0 .../runtimes/assets}/statemint/Cargo.toml | 26 ++++---- .../runtimes/assets/statemint}/build.rs | 0 .../assets}/statemint/src/constants.rs | 0 .../runtimes/assets}/statemint/src/lib.rs | 0 .../statemint}/src/weights/block_weights.rs | 0 .../src/weights/cumulus_pallet_xcmp_queue.rs | 0 .../src/weights/extrinsic_weights.rs | 0 .../statemint/src/weights/frame_system.rs | 0 .../assets}/statemint/src/weights/mod.rs | 0 .../statemint/src/weights/pallet_assets.rs | 0 .../statemint/src/weights/pallet_balances.rs | 0 .../src/weights/pallet_collator_selection.rs | 0 .../statemint/src/weights/pallet_multisig.rs | 0 .../statemint/src/weights/pallet_proxy.rs | 0 .../statemint/src/weights/pallet_session.rs | 0 .../statemint/src/weights/pallet_timestamp.rs | 0 .../statemint/src/weights/pallet_uniques.rs | 0 .../statemint/src/weights/pallet_utility.rs | 0 .../src/weights/paritydb_weights.rs | 0 .../statemint}/src/weights/rocksdb_weights.rs | 0 .../assets}/statemint/src/xcm_config.rs | 0 .../runtimes/assets}/westmint/Cargo.toml | 26 ++++---- .../runtimes/assets/westmint}/build.rs | 0 .../assets}/westmint/src/constants.rs | 0 .../runtimes/assets}/westmint/src/lib.rs | 0 .../westmint}/src/weights/block_weights.rs | 0 .../src/weights/cumulus_pallet_xcmp_queue.rs | 0 .../src/weights/extrinsic_weights.rs | 0 .../westmint/src/weights/frame_system.rs | 0 .../assets}/westmint/src/weights/mod.rs | 0 .../westmint/src/weights/pallet_assets.rs | 0 .../westmint/src/weights/pallet_balances.rs | 0 .../src/weights/pallet_collator_selection.rs | 0 .../westmint/src/weights/pallet_multisig.rs | 0 .../westmint/src/weights/pallet_proxy.rs | 0 .../westmint/src/weights/pallet_session.rs | 0 .../westmint/src/weights/pallet_timestamp.rs | 0 .../westmint/src/weights/pallet_uniques.rs | 0 .../westmint/src/weights/pallet_utility.rs | 0 .../westmint}/src/weights/paritydb_weights.rs | 0 .../westmint}/src/weights/rocksdb_weights.rs | 0 .../assets}/westmint/src/xcm_config.rs | 0 .../contracts}/contracts-rococo/Cargo.toml | 24 +++---- .../contracts}/contracts-rococo/README.md | 0 .../contracts/contracts-rococo}/build.rs | 0 .../contracts-rococo/contracts-overview.svg | 0 .../contracts-rococo}/src/constants.rs | 0 .../contracts-rococo/src/contracts.rs | 0 .../contracts}/contracts-rococo/src/lib.rs | 0 .../src/weights/block_weights.rs | 0 .../src/weights/extrinsic_weights.rs | 0 .../contracts-rococo/src/weights/mod.rs | 0 .../src/weights/paritydb_weights.rs | 0 .../src/weights/rocksdb_weights.rs | 0 .../contracts-rococo/src/xcm_config.rs | 0 .../runtimes/starters}/seedling/Cargo.toml | 8 +-- .../runtimes/starters/seedling}/build.rs | 0 .../runtimes/starters}/seedling/src/lib.rs | 0 .../runtimes/starters}/shell/Cargo.toml | 12 ++-- .../runtimes/starters/shell}/build.rs | 0 .../runtimes/starters}/shell/src/lib.rs | 0 .../starters}/shell/src/xcm_config.rs | 0 .../testing}/rococo-parachain/Cargo.toml | 22 +++---- .../testing/rococo-parachain}/build.rs | 0 .../testing}/rococo-parachain/src/lib.rs | 0 .../Cargo.toml | 18 ++--- .../build.rs | 0 .../src/chain_spec.rs | 0 .../src/cli.rs | 0 .../src/command.rs | 14 ++-- .../src/main.rs | 0 .../src/rpc.rs | 0 .../src/service.rs | 0 .../tests/benchmark_storage_works.rs | 0 .../tests/common.rs | 0 .../tests/polkadot_argument_parsing.rs | 0 .../tests/polkadot_mdns_issue.rs | 0 .../tests/purge_chain_works.rs | 0 .../tests/running_the_node_and_interrupt.rs | 0 scripts/benchmarks-ci.sh | 2 +- scripts/benchmarks.sh | 6 +- scripts/generate_genesis_value.sh | 6 +- test/service/Cargo.toml | 2 +- 138 files changed, 197 insertions(+), 151 deletions(-) rename {polkadot-parachains/res => parachains/chain-specs}/contracts-rococo.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/shell-statemint-head-data (100%) rename {polkadot-parachains/res => parachains/chain-specs}/shell-statemint.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/statemine.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/statemine_genesis.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/statemine_genesis_values.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/statemint.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/statemint_genesis.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/statemint_genesis_values.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/statemint_genesis_values.scale (100%) rename {polkadot-parachains/res => parachains/chain-specs}/tick.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/track.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/trick.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/westmint.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/westmint_genesis.json (100%) rename {polkadot-parachains/res => parachains/chain-specs}/westmint_genesis_values.json (100%) rename {polkadot-parachains/parachains-common => parachains/common}/Cargo.toml (100%) rename {polkadot-parachains/parachains-common => parachains/common}/src/impls.rs (100%) rename {polkadot-parachains/parachains-common => parachains/common}/src/lib.rs (100%) rename {polkadot-parachains/parachains-common => parachains/common}/src/xcm_config.rs (100%) rename {polkadot-parachains => parachains}/pallets/parachain-info/Cargo.toml (100%) rename {polkadot-parachains => parachains}/pallets/parachain-info/src/lib.rs (100%) rename {polkadot-parachains => parachains}/pallets/ping/Cargo.toml (100%) rename {polkadot-parachains => parachains}/pallets/ping/src/lib.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/Cargo.toml (86%) rename {polkadot-parachains/contracts-rococo => parachains/runtimes/assets/statemine}/build.rs (100%) rename {polkadot-parachains/contracts-rococo => parachains/runtimes/assets/statemine}/src/constants.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/lib.rs (100%) rename {polkadot-parachains/contracts-rococo => parachains/runtimes/assets/statemine}/src/weights/block_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/cumulus_pallet_xcmp_queue.rs (100%) rename {polkadot-parachains/contracts-rococo => parachains/runtimes/assets/statemine}/src/weights/extrinsic_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/frame_system.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/mod.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/pallet_assets.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/pallet_balances.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/pallet_collator_selection.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/pallet_multisig.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/pallet_proxy.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/pallet_session.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/pallet_timestamp.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/pallet_uniques.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/weights/pallet_utility.rs (100%) rename {polkadot-parachains/contracts-rococo => parachains/runtimes/assets/statemine}/src/weights/paritydb_weights.rs (100%) rename {polkadot-parachains/contracts-rococo => parachains/runtimes/assets/statemine}/src/weights/rocksdb_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemine/src/xcm_config.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/Cargo.toml (86%) rename {polkadot-parachains/statemine => parachains/runtimes/assets/statemint}/build.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/constants.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/lib.rs (100%) rename {polkadot-parachains/statemine => parachains/runtimes/assets/statemint}/src/weights/block_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/cumulus_pallet_xcmp_queue.rs (100%) rename {polkadot-parachains/statemine => parachains/runtimes/assets/statemint}/src/weights/extrinsic_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/frame_system.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/mod.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/pallet_assets.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/pallet_balances.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/pallet_collator_selection.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/pallet_multisig.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/pallet_proxy.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/pallet_session.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/pallet_timestamp.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/pallet_uniques.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/weights/pallet_utility.rs (100%) rename {polkadot-parachains/statemine => parachains/runtimes/assets/statemint}/src/weights/paritydb_weights.rs (100%) rename {polkadot-parachains/statemine => parachains/runtimes/assets/statemint}/src/weights/rocksdb_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/statemint/src/xcm_config.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/Cargo.toml (86%) rename {polkadot-parachains/statemint => parachains/runtimes/assets/westmint}/build.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/constants.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/lib.rs (100%) rename {polkadot-parachains/statemint => parachains/runtimes/assets/westmint}/src/weights/block_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/cumulus_pallet_xcmp_queue.rs (100%) rename {polkadot-parachains/statemint => parachains/runtimes/assets/westmint}/src/weights/extrinsic_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/frame_system.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/mod.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/pallet_assets.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/pallet_balances.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/pallet_collator_selection.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/pallet_multisig.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/pallet_proxy.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/pallet_session.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/pallet_timestamp.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/pallet_uniques.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/weights/pallet_utility.rs (100%) rename {polkadot-parachains/statemint => parachains/runtimes/assets/westmint}/src/weights/paritydb_weights.rs (100%) rename {polkadot-parachains/statemint => parachains/runtimes/assets/westmint}/src/weights/rocksdb_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/assets}/westmint/src/xcm_config.rs (100%) rename {polkadot-parachains => parachains/runtimes/contracts}/contracts-rococo/Cargo.toml (87%) rename {polkadot-parachains => parachains/runtimes/contracts}/contracts-rococo/README.md (100%) rename {polkadot-parachains/westmint => parachains/runtimes/contracts/contracts-rococo}/build.rs (100%) rename {polkadot-parachains => parachains/runtimes/contracts}/contracts-rococo/contracts-overview.svg (100%) rename {polkadot-parachains/statemine => parachains/runtimes/contracts/contracts-rococo}/src/constants.rs (100%) rename {polkadot-parachains => parachains/runtimes/contracts}/contracts-rococo/src/contracts.rs (100%) rename {polkadot-parachains => parachains/runtimes/contracts}/contracts-rococo/src/lib.rs (100%) rename {polkadot-parachains/westmint => parachains/runtimes/contracts/contracts-rococo}/src/weights/block_weights.rs (100%) rename {polkadot-parachains/westmint => parachains/runtimes/contracts/contracts-rococo}/src/weights/extrinsic_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/contracts}/contracts-rococo/src/weights/mod.rs (100%) rename {polkadot-parachains/westmint => parachains/runtimes/contracts/contracts-rococo}/src/weights/paritydb_weights.rs (100%) rename {polkadot-parachains/westmint => parachains/runtimes/contracts/contracts-rococo}/src/weights/rocksdb_weights.rs (100%) rename {polkadot-parachains => parachains/runtimes/contracts}/contracts-rococo/src/xcm_config.rs (100%) rename {polkadot-parachains => parachains/runtimes/starters}/seedling/Cargo.toml (88%) rename {polkadot-parachains/rococo-parachain => parachains/runtimes/starters/seedling}/build.rs (100%) rename {polkadot-parachains => parachains/runtimes/starters}/seedling/src/lib.rs (100%) rename {polkadot-parachains => parachains/runtimes/starters}/shell/Cargo.toml (86%) rename {polkadot-parachains/seedling => parachains/runtimes/starters/shell}/build.rs (100%) rename {polkadot-parachains => parachains/runtimes/starters}/shell/src/lib.rs (100%) rename {polkadot-parachains => parachains/runtimes/starters}/shell/src/xcm_config.rs (100%) rename {polkadot-parachains => parachains/runtimes/testing}/rococo-parachain/Cargo.toml (83%) rename {polkadot-parachains/shell => parachains/runtimes/testing/rococo-parachain}/build.rs (100%) rename {polkadot-parachains => parachains/runtimes/testing}/rococo-parachain/src/lib.rs (100%) rename {polkadot-parachains => polkadot-parachain}/Cargo.toml (89%) rename {polkadot-parachains => polkadot-parachain}/build.rs (100%) rename {polkadot-parachains => polkadot-parachain}/src/chain_spec.rs (100%) rename {polkadot-parachains => polkadot-parachain}/src/cli.rs (100%) rename {polkadot-parachains => polkadot-parachain}/src/command.rs (98%) rename {polkadot-parachains => polkadot-parachain}/src/main.rs (100%) rename {polkadot-parachains => polkadot-parachain}/src/rpc.rs (100%) rename {polkadot-parachains => polkadot-parachain}/src/service.rs (100%) rename {polkadot-parachains => polkadot-parachain}/tests/benchmark_storage_works.rs (100%) rename {polkadot-parachains => polkadot-parachain}/tests/common.rs (100%) rename {polkadot-parachains => polkadot-parachain}/tests/polkadot_argument_parsing.rs (100%) rename {polkadot-parachains => polkadot-parachain}/tests/polkadot_mdns_issue.rs (100%) rename {polkadot-parachains => polkadot-parachain}/tests/purge_chain_works.rs (100%) rename {polkadot-parachains => polkadot-parachain}/tests/running_the_node_and_interrupt.rs (100%) diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index 342213360de..702fec940ce 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -150,7 +150,7 @@ Until #631 is done, running the benchmarks is a manual process: 5. From the root directory run `nohup ./scripts/benchmarks.sh &` (it will take quite a few hours) 6. Checkout in your local machine to the branch of cumulus that has the version of Statemine you want to release 7. `scp` from the host to your local machine the weights for Statemine, Westmint and Statemint you'll find in: - - `/polkadot-parachains/statemine/src/weights` - - `/polkadot-parachains/westmint/src/weights` - - `/polkadot-parachains/statemint/src/weights` + - `/parachains/runtimes/assets/statemine/src/weights` + - `/parachains/runtimes/assets/statemint/src/weights` + - `/parachains/runtimes/assets/westmint/src/weights` 8. Commit the changes in your local and create a PR diff --git a/.github/pr-custom-review.yml b/.github/pr-custom-review.yml index cc28140944d..821f5284056 100644 --- a/.github/pr-custom-review.yml +++ b/.github/pr-custom-review.yml @@ -6,7 +6,7 @@ action-review-team: ci rules: - name: Runtime files check_type: changed_files - condition: ^polkadot-parachains/(statemine|statemint)/src/[^/]+\.rs$ + condition: ^parachains/runtimes/assets/(statemine|statemint)/src/[^/]+\.rs$ all_distinct: - min_approvals: 1 teams: @@ -20,7 +20,7 @@ rules: condition: include: .* # excluding files from 'Runtime files' and 'CI team' rules - exclude: ^polkadot-parachains/(statemine|statemint)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.* + exclude: ^parachains/runtimes/assets/(statemine|statemint)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.* min_approvals: 2 teams: - core-devs diff --git a/.github/workflows/release-02_create-draft.yml b/.github/workflows/release-02_create-draft.yml index f189d5e2665..5fa9a46d665 100644 --- a/.github/workflows/release-02_create-draft.yml +++ b/.github/workflows/release-02_create-draft.yml @@ -5,11 +5,11 @@ on: inputs: ref1: description: The 'from' tag to use for the diff - default: parachains-v7.0.0 + default: parachains-v9.0.0 required: true ref2: description: The 'to' tag to use for the diff - default: release-parachains-v8.0.0 + default: release-parachains-v10.0.0 required: true release_type: description: Pass "client" for client releases, leave empty otherwise @@ -42,8 +42,22 @@ jobs: build-runtimes: runs-on: ubuntu-latest strategy: - matrix: - runtime: ["shell", "statemine", "statemint", "westmint", "rococo-parachain", "contracts-rococo"] + matrix: + include: + - category: assets + runtime: statemine + - category: assets + runtime: statemint + - category: assets + runtime: westmint + - category: contracts + runtime: contracts-rococo + - category: starters + runtime: seedling + - category: starters + runtime: shell + - category: testing + runtime: rococo-parachain steps: - name: Checkout sources uses: actions/checkout@v3 @@ -67,7 +81,7 @@ jobs: with: image: paritytech/srtool chain: ${{ matrix.runtime }} - runtime_dir: polkadot-parachains/${{ matrix.runtime }} + runtime_dir: parachains/runtimes/${{ matrix.category }}/${{ matrix.runtime }} - name: Store srtool digest to disk if: ${{ github.event.inputs.release_type != 'client' }} @@ -188,10 +202,24 @@ jobs: runs-on: ubuntu-latest needs: ["publish-draft-release"] env: - RUNTIME_DIR: polkadot-parachains + RUNTIME_DIR: parachains/runtimes strategy: - matrix: - runtime: ["shell", "statemine", "statemint", "westmint", "rococo-parachain", "contracts-rococo"] + matrix: + include: + - category: assets + runtime: statemine + - category: assets + runtime: statemint + - category: assets + runtime: westmint + - category: contracts + runtime: contracts-rococo + - category: starters + runtime: seedling + - category: starters + runtime: shell + - category: testing + runtime: rococo-parachain steps: - name: Checkout sources uses: actions/checkout@v3 @@ -209,10 +237,10 @@ jobs: id: get-runtime-ver run: | echo "require './scripts/ci/github/runtime-version.rb'" > script.rb - echo "puts get_runtime(runtime: \"${{ matrix.runtime }}\", runtime_dir: \"$RUNTIME_DIR\")" >> script.rb + echo "puts get_runtime(runtime: \"${{ matrix.runtime }}\", runtime_dir: \"$RUNTIME_DIR/${{ matrix.category }}\")" >> script.rb echo "Current folder: $PWD" - ls "$RUNTIME_DIR/${{ matrix.runtime }}" + ls "$RUNTIME_DIR/${{ matrix.category }}/${{ matrix.runtime }}" runtime_ver=$(ruby script.rb) echo "Found version: >$runtime_ver<" echo "::set-output name=runtime_ver::$runtime_ver" diff --git a/.github/workflows/srtool.yml b/.github/workflows/srtool.yml index 42fdde095ca..32640c5679c 100644 --- a/.github/workflows/srtool.yml +++ b/.github/workflows/srtool.yml @@ -8,11 +8,14 @@ on: tags: - "*" - paths-ignore: - - "docker" - - "docs" - - "scripts" - - "test" + # paths-ignore: + # - "docker" + # - "docs" + # - "scripts" + # - "test" + # - "client" + paths: + - parachains/runtimes/**/* branches: - "release*" @@ -27,7 +30,21 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - chain: ["statemine", "westmint", "statemint", "rococo-parachain", "shell", "contracts-rococo"] + include: + - category: assets + runtime: statemine + - category: assets + runtime: statemint + - category: assets + runtime: westmint + - category: contracts + runtime: contracts-rococo + - category: starters + runtime: seedling + - category: starters + runtime: shell + - category: testing + runtime: rococo-parachain steps: - uses: actions/checkout@v3 with: @@ -37,25 +54,25 @@ jobs: id: srtool_build uses: chevdor/srtool-actions@v0.4.0 with: - chain: ${{ matrix.chain }} - runtime_dir: polkadot-parachains/${{ matrix.chain }} + chain: ${{ matrix.runtime }} + runtime_dir: parachains/runtimes/${{ matrix.category }}/${{ matrix.runtime }} - name: Summary run: | - echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.chain }}-srtool-digest.json - cat ${{ matrix.chain }}-srtool-digest.json + echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.runtime }}-srtool-digest.json + cat ${{ matrix.runtime }}-srtool-digest.json echo "Compact Runtime: ${{ steps.srtool_build.outputs.wasm }}" echo "Compressed Runtime: ${{ steps.srtool_build.outputs.wasm_compressed }}" # it takes a while to build the runtime, so let's save the artifact as soon as we have it - - name: Archive Artifacts for ${{ matrix.chain }} + - name: Archive Artifacts for ${{ matrix.runtime }} uses: actions/upload-artifact@v2 with: - name: ${{ matrix.chain }}-runtime + name: ${{ matrix.runtime }}-runtime path: | ${{ steps.srtool_build.outputs.wasm }} ${{ steps.srtool_build.outputs.wasm_compressed }} - ${{ matrix.chain }}-srtool-digest.json + ${{ matrix.runtime }}-srtool-digest.json # We now get extra information thanks to subwasm - name: Install subwasm @@ -69,29 +86,29 @@ jobs: run: | subwasm info ${{ steps.srtool_build.outputs.wasm }} subwasm info ${{ steps.srtool_build.outputs.wasm_compressed }} - subwasm --json info ${{ steps.srtool_build.outputs.wasm }} > ${{ matrix.chain }}-info.json - subwasm --json info ${{ steps.srtool_build.outputs.wasm_compressed }} > ${{ matrix.chain }}-compressed-info.json + subwasm --json info ${{ steps.srtool_build.outputs.wasm }} > ${{ matrix.runtime }}-info.json + subwasm --json info ${{ steps.srtool_build.outputs.wasm_compressed }} > ${{ matrix.runtime }}-compressed-info.json - name: Extract the metadata shell: bash run: | subwasm meta ${{ steps.srtool_build.outputs.wasm }} - subwasm --json meta ${{ steps.srtool_build.outputs.wasm }} > ${{ matrix.chain }}-metadata.json + subwasm --json meta ${{ steps.srtool_build.outputs.wasm }} > ${{ matrix.runtime }}-metadata.json - name: Check the metadata diff shell: bash # the following subwasm call will error for chains that are not known and/or live, that includes shell for instance run: | - subwasm diff ${{ steps.srtool_build.outputs.wasm }} --chain-b ${{ matrix.chain }} || \ - echo "Subwasm call failed, check the logs. This is likely because ${{ matrix.chain }} is not known by subwasm" | \ - tee ${{ matrix.chain }}-diff.txt + subwasm diff ${{ steps.srtool_build.outputs.wasm }} --chain-b ${{ matrix.runtime }} || \ + echo "Subwasm call failed, check the logs. This is likely because ${{ matrix.runtime }} is not known by subwasm" | \ + tee ${{ matrix.runtime }}-diff.txt - name: Archive Subwasm results uses: actions/upload-artifact@v2 with: - name: ${{ matrix.chain }}-runtime + name: ${{ matrix.runtime }}-runtime path: | - ${{ matrix.chain }}-info.json - ${{ matrix.chain }}-compressed-info.json - ${{ matrix.chain }}-metadata.json - ${{ matrix.chain }}-diff.txt + ${{ matrix.runtime }}-info.json + ${{ matrix.runtime }}-compressed-info.json + ${{ matrix.runtime }}-metadata.json + ${{ matrix.runtime }}-diff.txt diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3510e9232f..bbe63c4c066 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -224,7 +224,7 @@ benchmarks: - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" # push results to github - git checkout -b $BRANCHNAME - - git add polkadot-parachains/* + - git add parachains/* - git commit -m "[benchmarks] pr with weights" - git push origin $BRANCHNAME # create PR diff --git a/Cargo.toml b/Cargo.toml index f9a0bcc87af..9c6bd5af20d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,16 +24,17 @@ members = [ "primitives/parachain-inherent", "primitives/timestamp", "primitives/utility", - "polkadot-parachains/", - "polkadot-parachains/pallets/parachain-info", - "polkadot-parachains/pallets/ping", - "polkadot-parachains/rococo-parachain", - "polkadot-parachains/shell", - "polkadot-parachains/parachains-common", - "polkadot-parachains/statemint", - "polkadot-parachains/statemine", - "polkadot-parachains/westmint", - "polkadot-parachains/contracts-rococo", + "polkadot-parachain/", + "parachains/common", + "parachains/pallets/parachain-info", + "parachains/pallets/ping", + "parachains/runtimes/testing/rococo-parachain", + "parachains/runtimes/starters/shell", + "parachains/runtimes/starters/seedling", + "parachains/runtimes/assets/statemint", + "parachains/runtimes/assets/statemine", + "parachains/runtimes/assets/westmint", + "parachains/runtimes/contracts/contracts-rococo", "test/client", "test/relay-sproof-builder", "test/relay-validation-worker-provider", diff --git a/README.md b/README.md index 58b802077d3..2df7aa0583e 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Refer to the [setup instructions below](#local-setup) to run a local network for ## Contracts 📝 -See [the `contracts-rococo` readme](polkadot-parachains/contracts-rococo/README.md) for details. +See [the `contracts-rococo` readme](parachains/runtimes/contracts/contracts-rococo/README.md) for details. ## Rococo 👑 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 0a0821984f6..8344ad43bb4 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -9,7 +9,7 @@ services: volumes: - "polkadot-data-alice:/data" - type: bind - source: ./test/parachain/res/polkadot_chainspec.json + source: ./test/parachain/chain-specs/polkadot_chainspec.json target: /chainspec.json read_only: true command: > @@ -38,7 +38,7 @@ services: volumes: - "polkadot-data-bob:/data" - type: bind - source: ./test/parachain/res/polkadot_chainspec.json + source: ./test/parachain/chain-specs/polkadot_chainspec.json target: /chainspec.json read_only: true command: > diff --git a/docker/injected.Dockerfile b/docker/injected.Dockerfile index a2517583448..93d0561ca87 100644 --- a/docker/injected.Dockerfile +++ b/docker/injected.Dockerfile @@ -38,7 +38,7 @@ RUN apt-get update && \ COPY ./target/release/polkadot-parachain /usr/local/bin COPY ./target/release/polkadot-parachain.asc /usr/local/bin COPY ./target/release/polkadot-parachain.sha256 /usr/local/bin -COPY ./polkadot-parachains/res/*.json /specs/ +COPY ./parachains/chain-specs/*.json /specs/ USER polkadot diff --git a/parachain-template/runtime/Cargo.toml b/parachain-template/runtime/Cargo.toml index 63a499699c3..77c8c12e123 100644 --- a/parachain-template/runtime/Cargo.toml +++ b/parachain-template/runtime/Cargo.toml @@ -73,7 +73,7 @@ cumulus-primitives-core = { path = "../../primitives/core", default-features = f cumulus-primitives-timestamp = { path = "../../primitives/timestamp", default-features = false } cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false } pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } -parachain-info = { path = "../../polkadot-parachains/pallets/parachain-info", default-features = false } +parachain-info = { path = "../../parachains/pallets/parachain-info", default-features = false } [features] default = [ diff --git a/polkadot-parachains/res/contracts-rococo.json b/parachains/chain-specs/contracts-rococo.json similarity index 100% rename from polkadot-parachains/res/contracts-rococo.json rename to parachains/chain-specs/contracts-rococo.json diff --git a/polkadot-parachains/res/shell-statemint-head-data b/parachains/chain-specs/shell-statemint-head-data similarity index 100% rename from polkadot-parachains/res/shell-statemint-head-data rename to parachains/chain-specs/shell-statemint-head-data diff --git a/polkadot-parachains/res/shell-statemint.json b/parachains/chain-specs/shell-statemint.json similarity index 100% rename from polkadot-parachains/res/shell-statemint.json rename to parachains/chain-specs/shell-statemint.json diff --git a/polkadot-parachains/res/statemine.json b/parachains/chain-specs/statemine.json similarity index 100% rename from polkadot-parachains/res/statemine.json rename to parachains/chain-specs/statemine.json diff --git a/polkadot-parachains/res/statemine_genesis.json b/parachains/chain-specs/statemine_genesis.json similarity index 100% rename from polkadot-parachains/res/statemine_genesis.json rename to parachains/chain-specs/statemine_genesis.json diff --git a/polkadot-parachains/res/statemine_genesis_values.json b/parachains/chain-specs/statemine_genesis_values.json similarity index 100% rename from polkadot-parachains/res/statemine_genesis_values.json rename to parachains/chain-specs/statemine_genesis_values.json diff --git a/polkadot-parachains/res/statemint.json b/parachains/chain-specs/statemint.json similarity index 100% rename from polkadot-parachains/res/statemint.json rename to parachains/chain-specs/statemint.json diff --git a/polkadot-parachains/res/statemint_genesis.json b/parachains/chain-specs/statemint_genesis.json similarity index 100% rename from polkadot-parachains/res/statemint_genesis.json rename to parachains/chain-specs/statemint_genesis.json diff --git a/polkadot-parachains/res/statemint_genesis_values.json b/parachains/chain-specs/statemint_genesis_values.json similarity index 100% rename from polkadot-parachains/res/statemint_genesis_values.json rename to parachains/chain-specs/statemint_genesis_values.json diff --git a/polkadot-parachains/res/statemint_genesis_values.scale b/parachains/chain-specs/statemint_genesis_values.scale similarity index 100% rename from polkadot-parachains/res/statemint_genesis_values.scale rename to parachains/chain-specs/statemint_genesis_values.scale diff --git a/polkadot-parachains/res/tick.json b/parachains/chain-specs/tick.json similarity index 100% rename from polkadot-parachains/res/tick.json rename to parachains/chain-specs/tick.json diff --git a/polkadot-parachains/res/track.json b/parachains/chain-specs/track.json similarity index 100% rename from polkadot-parachains/res/track.json rename to parachains/chain-specs/track.json diff --git a/polkadot-parachains/res/trick.json b/parachains/chain-specs/trick.json similarity index 100% rename from polkadot-parachains/res/trick.json rename to parachains/chain-specs/trick.json diff --git a/polkadot-parachains/res/westmint.json b/parachains/chain-specs/westmint.json similarity index 100% rename from polkadot-parachains/res/westmint.json rename to parachains/chain-specs/westmint.json diff --git a/polkadot-parachains/res/westmint_genesis.json b/parachains/chain-specs/westmint_genesis.json similarity index 100% rename from polkadot-parachains/res/westmint_genesis.json rename to parachains/chain-specs/westmint_genesis.json diff --git a/polkadot-parachains/res/westmint_genesis_values.json b/parachains/chain-specs/westmint_genesis_values.json similarity index 100% rename from polkadot-parachains/res/westmint_genesis_values.json rename to parachains/chain-specs/westmint_genesis_values.json diff --git a/polkadot-parachains/parachains-common/Cargo.toml b/parachains/common/Cargo.toml similarity index 100% rename from polkadot-parachains/parachains-common/Cargo.toml rename to parachains/common/Cargo.toml diff --git a/polkadot-parachains/parachains-common/src/impls.rs b/parachains/common/src/impls.rs similarity index 100% rename from polkadot-parachains/parachains-common/src/impls.rs rename to parachains/common/src/impls.rs diff --git a/polkadot-parachains/parachains-common/src/lib.rs b/parachains/common/src/lib.rs similarity index 100% rename from polkadot-parachains/parachains-common/src/lib.rs rename to parachains/common/src/lib.rs diff --git a/polkadot-parachains/parachains-common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs similarity index 100% rename from polkadot-parachains/parachains-common/src/xcm_config.rs rename to parachains/common/src/xcm_config.rs diff --git a/polkadot-parachains/pallets/parachain-info/Cargo.toml b/parachains/pallets/parachain-info/Cargo.toml similarity index 100% rename from polkadot-parachains/pallets/parachain-info/Cargo.toml rename to parachains/pallets/parachain-info/Cargo.toml diff --git a/polkadot-parachains/pallets/parachain-info/src/lib.rs b/parachains/pallets/parachain-info/src/lib.rs similarity index 100% rename from polkadot-parachains/pallets/parachain-info/src/lib.rs rename to parachains/pallets/parachain-info/src/lib.rs diff --git a/polkadot-parachains/pallets/ping/Cargo.toml b/parachains/pallets/ping/Cargo.toml similarity index 100% rename from polkadot-parachains/pallets/ping/Cargo.toml rename to parachains/pallets/ping/Cargo.toml diff --git a/polkadot-parachains/pallets/ping/src/lib.rs b/parachains/pallets/ping/src/lib.rs similarity index 100% rename from polkadot-parachains/pallets/ping/src/lib.rs rename to parachains/pallets/ping/src/lib.rs diff --git a/polkadot-parachains/statemine/Cargo.toml b/parachains/runtimes/assets/statemine/Cargo.toml similarity index 86% rename from polkadot-parachains/statemine/Cargo.toml rename to parachains/runtimes/assets/statemine/Cargo.toml index eef06ae41b8..61df2484a83 100644 --- a/polkadot-parachains/statemine/Cargo.toml +++ b/parachains/runtimes/assets/statemine/Cargo.toml @@ -59,19 +59,19 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus -cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } -cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } -cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false } -cumulus-pallet-session-benchmarking = {path = "../../pallets/session-benchmarking", default-features = false, version = "3.0.0"} -cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false } -cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue", default-features = false } -cumulus-ping = { path = "../pallets/ping", default-features = false } -cumulus-primitives-core = { path = "../../primitives/core", default-features = false } -cumulus-primitives-timestamp = { path = "../../primitives/timestamp", default-features = false } -cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false } -pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } -parachain-info = { path = "../pallets/parachain-info", default-features = false } -parachains-common = { path = "../parachains-common", default-features = false } +cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false } +cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false } +cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false } +cumulus-pallet-session-benchmarking = {path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0"} +cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false } +cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false } +cumulus-ping = { path = "../../../pallets/ping", default-features = false } +cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false } +cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false } +cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false } +pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false } +parachain-info = { path = "../../../pallets/parachain-info", default-features = false } +parachains-common = { path = "../../../common", default-features = false } [dev-dependencies] diff --git a/polkadot-parachains/contracts-rococo/build.rs b/parachains/runtimes/assets/statemine/build.rs similarity index 100% rename from polkadot-parachains/contracts-rococo/build.rs rename to parachains/runtimes/assets/statemine/build.rs diff --git a/polkadot-parachains/contracts-rococo/src/constants.rs b/parachains/runtimes/assets/statemine/src/constants.rs similarity index 100% rename from polkadot-parachains/contracts-rococo/src/constants.rs rename to parachains/runtimes/assets/statemine/src/constants.rs diff --git a/polkadot-parachains/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs similarity index 100% rename from polkadot-parachains/statemine/src/lib.rs rename to parachains/runtimes/assets/statemine/src/lib.rs diff --git a/polkadot-parachains/contracts-rococo/src/weights/block_weights.rs b/parachains/runtimes/assets/statemine/src/weights/block_weights.rs similarity index 100% rename from polkadot-parachains/contracts-rococo/src/weights/block_weights.rs rename to parachains/runtimes/assets/statemine/src/weights/block_weights.rs diff --git a/polkadot-parachains/statemine/src/weights/cumulus_pallet_xcmp_queue.rs b/parachains/runtimes/assets/statemine/src/weights/cumulus_pallet_xcmp_queue.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/cumulus_pallet_xcmp_queue.rs rename to parachains/runtimes/assets/statemine/src/weights/cumulus_pallet_xcmp_queue.rs diff --git a/polkadot-parachains/contracts-rococo/src/weights/extrinsic_weights.rs b/parachains/runtimes/assets/statemine/src/weights/extrinsic_weights.rs similarity index 100% rename from polkadot-parachains/contracts-rococo/src/weights/extrinsic_weights.rs rename to parachains/runtimes/assets/statemine/src/weights/extrinsic_weights.rs diff --git a/polkadot-parachains/statemine/src/weights/frame_system.rs b/parachains/runtimes/assets/statemine/src/weights/frame_system.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/frame_system.rs rename to parachains/runtimes/assets/statemine/src/weights/frame_system.rs diff --git a/polkadot-parachains/statemine/src/weights/mod.rs b/parachains/runtimes/assets/statemine/src/weights/mod.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/mod.rs rename to parachains/runtimes/assets/statemine/src/weights/mod.rs diff --git a/polkadot-parachains/statemine/src/weights/pallet_assets.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_assets.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/pallet_assets.rs rename to parachains/runtimes/assets/statemine/src/weights/pallet_assets.rs diff --git a/polkadot-parachains/statemine/src/weights/pallet_balances.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_balances.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/pallet_balances.rs rename to parachains/runtimes/assets/statemine/src/weights/pallet_balances.rs diff --git a/polkadot-parachains/statemine/src/weights/pallet_collator_selection.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_collator_selection.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/pallet_collator_selection.rs rename to parachains/runtimes/assets/statemine/src/weights/pallet_collator_selection.rs diff --git a/polkadot-parachains/statemine/src/weights/pallet_multisig.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_multisig.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/pallet_multisig.rs rename to parachains/runtimes/assets/statemine/src/weights/pallet_multisig.rs diff --git a/polkadot-parachains/statemine/src/weights/pallet_proxy.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/pallet_proxy.rs rename to parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs diff --git a/polkadot-parachains/statemine/src/weights/pallet_session.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_session.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/pallet_session.rs rename to parachains/runtimes/assets/statemine/src/weights/pallet_session.rs diff --git a/polkadot-parachains/statemine/src/weights/pallet_timestamp.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_timestamp.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/pallet_timestamp.rs rename to parachains/runtimes/assets/statemine/src/weights/pallet_timestamp.rs diff --git a/polkadot-parachains/statemine/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/pallet_uniques.rs rename to parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs diff --git a/polkadot-parachains/statemine/src/weights/pallet_utility.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_utility.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/pallet_utility.rs rename to parachains/runtimes/assets/statemine/src/weights/pallet_utility.rs diff --git a/polkadot-parachains/contracts-rococo/src/weights/paritydb_weights.rs b/parachains/runtimes/assets/statemine/src/weights/paritydb_weights.rs similarity index 100% rename from polkadot-parachains/contracts-rococo/src/weights/paritydb_weights.rs rename to parachains/runtimes/assets/statemine/src/weights/paritydb_weights.rs diff --git a/polkadot-parachains/contracts-rococo/src/weights/rocksdb_weights.rs b/parachains/runtimes/assets/statemine/src/weights/rocksdb_weights.rs similarity index 100% rename from polkadot-parachains/contracts-rococo/src/weights/rocksdb_weights.rs rename to parachains/runtimes/assets/statemine/src/weights/rocksdb_weights.rs diff --git a/polkadot-parachains/statemine/src/xcm_config.rs b/parachains/runtimes/assets/statemine/src/xcm_config.rs similarity index 100% rename from polkadot-parachains/statemine/src/xcm_config.rs rename to parachains/runtimes/assets/statemine/src/xcm_config.rs diff --git a/polkadot-parachains/statemint/Cargo.toml b/parachains/runtimes/assets/statemint/Cargo.toml similarity index 86% rename from polkadot-parachains/statemint/Cargo.toml rename to parachains/runtimes/assets/statemint/Cargo.toml index 640d7fd2eaa..56cc82ad805 100644 --- a/polkadot-parachains/statemint/Cargo.toml +++ b/parachains/runtimes/assets/statemint/Cargo.toml @@ -59,19 +59,19 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus -cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } -cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } -cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false } -cumulus-pallet-session-benchmarking = { path = "../../pallets/session-benchmarking", default-features = false, version = "3.0.0" } -cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false } -cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue", default-features = false } -cumulus-ping = { path = "../pallets/ping", default-features = false } -cumulus-primitives-core = { path = "../../primitives/core", default-features = false } -cumulus-primitives-timestamp = { path = "../../primitives/timestamp", default-features = false } -cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false } -pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } -parachain-info = { path = "../pallets/parachain-info", default-features = false } -parachains-common = { path = "../parachains-common", default-features = false } +cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false } +cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false } +cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false } +cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0" } +cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false } +cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false } +cumulus-ping = { path = "../../../pallets/ping", default-features = false } +cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false } +cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false } +cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false } +pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false } +parachain-info = { path = "../../../pallets/parachain-info", default-features = false } +parachains-common = { path = "../../../common", default-features = false } [dev-dependencies] hex-literal = "0.3.4" diff --git a/polkadot-parachains/statemine/build.rs b/parachains/runtimes/assets/statemint/build.rs similarity index 100% rename from polkadot-parachains/statemine/build.rs rename to parachains/runtimes/assets/statemint/build.rs diff --git a/polkadot-parachains/statemint/src/constants.rs b/parachains/runtimes/assets/statemint/src/constants.rs similarity index 100% rename from polkadot-parachains/statemint/src/constants.rs rename to parachains/runtimes/assets/statemint/src/constants.rs diff --git a/polkadot-parachains/statemint/src/lib.rs b/parachains/runtimes/assets/statemint/src/lib.rs similarity index 100% rename from polkadot-parachains/statemint/src/lib.rs rename to parachains/runtimes/assets/statemint/src/lib.rs diff --git a/polkadot-parachains/statemine/src/weights/block_weights.rs b/parachains/runtimes/assets/statemint/src/weights/block_weights.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/block_weights.rs rename to parachains/runtimes/assets/statemint/src/weights/block_weights.rs diff --git a/polkadot-parachains/statemint/src/weights/cumulus_pallet_xcmp_queue.rs b/parachains/runtimes/assets/statemint/src/weights/cumulus_pallet_xcmp_queue.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/cumulus_pallet_xcmp_queue.rs rename to parachains/runtimes/assets/statemint/src/weights/cumulus_pallet_xcmp_queue.rs diff --git a/polkadot-parachains/statemine/src/weights/extrinsic_weights.rs b/parachains/runtimes/assets/statemint/src/weights/extrinsic_weights.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/extrinsic_weights.rs rename to parachains/runtimes/assets/statemint/src/weights/extrinsic_weights.rs diff --git a/polkadot-parachains/statemint/src/weights/frame_system.rs b/parachains/runtimes/assets/statemint/src/weights/frame_system.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/frame_system.rs rename to parachains/runtimes/assets/statemint/src/weights/frame_system.rs diff --git a/polkadot-parachains/statemint/src/weights/mod.rs b/parachains/runtimes/assets/statemint/src/weights/mod.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/mod.rs rename to parachains/runtimes/assets/statemint/src/weights/mod.rs diff --git a/polkadot-parachains/statemint/src/weights/pallet_assets.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_assets.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/pallet_assets.rs rename to parachains/runtimes/assets/statemint/src/weights/pallet_assets.rs diff --git a/polkadot-parachains/statemint/src/weights/pallet_balances.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_balances.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/pallet_balances.rs rename to parachains/runtimes/assets/statemint/src/weights/pallet_balances.rs diff --git a/polkadot-parachains/statemint/src/weights/pallet_collator_selection.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_collator_selection.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/pallet_collator_selection.rs rename to parachains/runtimes/assets/statemint/src/weights/pallet_collator_selection.rs diff --git a/polkadot-parachains/statemint/src/weights/pallet_multisig.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_multisig.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/pallet_multisig.rs rename to parachains/runtimes/assets/statemint/src/weights/pallet_multisig.rs diff --git a/polkadot-parachains/statemint/src/weights/pallet_proxy.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/pallet_proxy.rs rename to parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs diff --git a/polkadot-parachains/statemint/src/weights/pallet_session.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_session.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/pallet_session.rs rename to parachains/runtimes/assets/statemint/src/weights/pallet_session.rs diff --git a/polkadot-parachains/statemint/src/weights/pallet_timestamp.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_timestamp.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/pallet_timestamp.rs rename to parachains/runtimes/assets/statemint/src/weights/pallet_timestamp.rs diff --git a/polkadot-parachains/statemint/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/pallet_uniques.rs rename to parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs diff --git a/polkadot-parachains/statemint/src/weights/pallet_utility.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_utility.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/pallet_utility.rs rename to parachains/runtimes/assets/statemint/src/weights/pallet_utility.rs diff --git a/polkadot-parachains/statemine/src/weights/paritydb_weights.rs b/parachains/runtimes/assets/statemint/src/weights/paritydb_weights.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/paritydb_weights.rs rename to parachains/runtimes/assets/statemint/src/weights/paritydb_weights.rs diff --git a/polkadot-parachains/statemine/src/weights/rocksdb_weights.rs b/parachains/runtimes/assets/statemint/src/weights/rocksdb_weights.rs similarity index 100% rename from polkadot-parachains/statemine/src/weights/rocksdb_weights.rs rename to parachains/runtimes/assets/statemint/src/weights/rocksdb_weights.rs diff --git a/polkadot-parachains/statemint/src/xcm_config.rs b/parachains/runtimes/assets/statemint/src/xcm_config.rs similarity index 100% rename from polkadot-parachains/statemint/src/xcm_config.rs rename to parachains/runtimes/assets/statemint/src/xcm_config.rs diff --git a/polkadot-parachains/westmint/Cargo.toml b/parachains/runtimes/assets/westmint/Cargo.toml similarity index 86% rename from polkadot-parachains/westmint/Cargo.toml rename to parachains/runtimes/assets/westmint/Cargo.toml index 986d379c6de..3fc7d857acc 100644 --- a/polkadot-parachains/westmint/Cargo.toml +++ b/parachains/runtimes/assets/westmint/Cargo.toml @@ -58,19 +58,19 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus -cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } -cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } -cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false } -cumulus-pallet-session-benchmarking = {path = "../../pallets/session-benchmarking", default-features = false, version = "3.0.0"} -cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false } -cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue", default-features = false } -cumulus-ping = { path = "../pallets/ping", default-features = false } -cumulus-primitives-core = { path = "../../primitives/core", default-features = false } -cumulus-primitives-timestamp = { path = "../../primitives/timestamp", default-features = false } -cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false } -pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } -parachain-info = { path = "../pallets/parachain-info", default-features = false } -parachains-common = { path = "../parachains-common", default-features = false } +cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false } +cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false } +cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false } +cumulus-pallet-session-benchmarking = {path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0"} +cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false } +cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false } +cumulus-ping = { path = "../../../pallets/ping", default-features = false } +cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false } +cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false } +cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false } +pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false } +parachain-info = { path = "../../../pallets/parachain-info", default-features = false } +parachains-common = { path = "../../../common", default-features = false } [dev-dependencies] hex-literal = "0.3.4" diff --git a/polkadot-parachains/statemint/build.rs b/parachains/runtimes/assets/westmint/build.rs similarity index 100% rename from polkadot-parachains/statemint/build.rs rename to parachains/runtimes/assets/westmint/build.rs diff --git a/polkadot-parachains/westmint/src/constants.rs b/parachains/runtimes/assets/westmint/src/constants.rs similarity index 100% rename from polkadot-parachains/westmint/src/constants.rs rename to parachains/runtimes/assets/westmint/src/constants.rs diff --git a/polkadot-parachains/westmint/src/lib.rs b/parachains/runtimes/assets/westmint/src/lib.rs similarity index 100% rename from polkadot-parachains/westmint/src/lib.rs rename to parachains/runtimes/assets/westmint/src/lib.rs diff --git a/polkadot-parachains/statemint/src/weights/block_weights.rs b/parachains/runtimes/assets/westmint/src/weights/block_weights.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/block_weights.rs rename to parachains/runtimes/assets/westmint/src/weights/block_weights.rs diff --git a/polkadot-parachains/westmint/src/weights/cumulus_pallet_xcmp_queue.rs b/parachains/runtimes/assets/westmint/src/weights/cumulus_pallet_xcmp_queue.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/cumulus_pallet_xcmp_queue.rs rename to parachains/runtimes/assets/westmint/src/weights/cumulus_pallet_xcmp_queue.rs diff --git a/polkadot-parachains/statemint/src/weights/extrinsic_weights.rs b/parachains/runtimes/assets/westmint/src/weights/extrinsic_weights.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/extrinsic_weights.rs rename to parachains/runtimes/assets/westmint/src/weights/extrinsic_weights.rs diff --git a/polkadot-parachains/westmint/src/weights/frame_system.rs b/parachains/runtimes/assets/westmint/src/weights/frame_system.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/frame_system.rs rename to parachains/runtimes/assets/westmint/src/weights/frame_system.rs diff --git a/polkadot-parachains/westmint/src/weights/mod.rs b/parachains/runtimes/assets/westmint/src/weights/mod.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/mod.rs rename to parachains/runtimes/assets/westmint/src/weights/mod.rs diff --git a/polkadot-parachains/westmint/src/weights/pallet_assets.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_assets.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/pallet_assets.rs rename to parachains/runtimes/assets/westmint/src/weights/pallet_assets.rs diff --git a/polkadot-parachains/westmint/src/weights/pallet_balances.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_balances.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/pallet_balances.rs rename to parachains/runtimes/assets/westmint/src/weights/pallet_balances.rs diff --git a/polkadot-parachains/westmint/src/weights/pallet_collator_selection.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_collator_selection.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/pallet_collator_selection.rs rename to parachains/runtimes/assets/westmint/src/weights/pallet_collator_selection.rs diff --git a/polkadot-parachains/westmint/src/weights/pallet_multisig.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_multisig.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/pallet_multisig.rs rename to parachains/runtimes/assets/westmint/src/weights/pallet_multisig.rs diff --git a/polkadot-parachains/westmint/src/weights/pallet_proxy.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/pallet_proxy.rs rename to parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs diff --git a/polkadot-parachains/westmint/src/weights/pallet_session.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_session.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/pallet_session.rs rename to parachains/runtimes/assets/westmint/src/weights/pallet_session.rs diff --git a/polkadot-parachains/westmint/src/weights/pallet_timestamp.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_timestamp.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/pallet_timestamp.rs rename to parachains/runtimes/assets/westmint/src/weights/pallet_timestamp.rs diff --git a/polkadot-parachains/westmint/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/pallet_uniques.rs rename to parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs diff --git a/polkadot-parachains/westmint/src/weights/pallet_utility.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_utility.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/pallet_utility.rs rename to parachains/runtimes/assets/westmint/src/weights/pallet_utility.rs diff --git a/polkadot-parachains/statemint/src/weights/paritydb_weights.rs b/parachains/runtimes/assets/westmint/src/weights/paritydb_weights.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/paritydb_weights.rs rename to parachains/runtimes/assets/westmint/src/weights/paritydb_weights.rs diff --git a/polkadot-parachains/statemint/src/weights/rocksdb_weights.rs b/parachains/runtimes/assets/westmint/src/weights/rocksdb_weights.rs similarity index 100% rename from polkadot-parachains/statemint/src/weights/rocksdb_weights.rs rename to parachains/runtimes/assets/westmint/src/weights/rocksdb_weights.rs diff --git a/polkadot-parachains/westmint/src/xcm_config.rs b/parachains/runtimes/assets/westmint/src/xcm_config.rs similarity index 100% rename from polkadot-parachains/westmint/src/xcm_config.rs rename to parachains/runtimes/assets/westmint/src/xcm_config.rs diff --git a/polkadot-parachains/contracts-rococo/Cargo.toml b/parachains/runtimes/contracts/contracts-rococo/Cargo.toml similarity index 87% rename from polkadot-parachains/contracts-rococo/Cargo.toml rename to parachains/runtimes/contracts/contracts-rococo/Cargo.toml index 1bea26bb981..998da496480 100644 --- a/polkadot-parachains/contracts-rococo/Cargo.toml +++ b/parachains/runtimes/contracts/contracts-rococo/Cargo.toml @@ -64,18 +64,18 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus -cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } -cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } -cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false } -cumulus-pallet-session-benchmarking = { path = "../../pallets/session-benchmarking", default-features = false } -cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false } -cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue", default-features = false } -cumulus-primitives-core = { path = "../../primitives/core", default-features = false } -cumulus-primitives-timestamp = { path = "../../primitives/timestamp", default-features = false } -cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false } -pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } -parachain-info = { path = "../pallets/parachain-info", default-features = false } -parachains-common = { path = "../parachains-common", default-features = false } +cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false } +cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false } +cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false } +cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false } +cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false } +cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false } +cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false } +cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false } +cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false } +pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false } +parachain-info = { path = "../../../pallets/parachain-info", default-features = false } +parachains-common = { path = "../../../common", default-features = false } [features] default = [ diff --git a/polkadot-parachains/contracts-rococo/README.md b/parachains/runtimes/contracts/contracts-rococo/README.md similarity index 100% rename from polkadot-parachains/contracts-rococo/README.md rename to parachains/runtimes/contracts/contracts-rococo/README.md diff --git a/polkadot-parachains/westmint/build.rs b/parachains/runtimes/contracts/contracts-rococo/build.rs similarity index 100% rename from polkadot-parachains/westmint/build.rs rename to parachains/runtimes/contracts/contracts-rococo/build.rs diff --git a/polkadot-parachains/contracts-rococo/contracts-overview.svg b/parachains/runtimes/contracts/contracts-rococo/contracts-overview.svg similarity index 100% rename from polkadot-parachains/contracts-rococo/contracts-overview.svg rename to parachains/runtimes/contracts/contracts-rococo/contracts-overview.svg diff --git a/polkadot-parachains/statemine/src/constants.rs b/parachains/runtimes/contracts/contracts-rococo/src/constants.rs similarity index 100% rename from polkadot-parachains/statemine/src/constants.rs rename to parachains/runtimes/contracts/contracts-rococo/src/constants.rs diff --git a/polkadot-parachains/contracts-rococo/src/contracts.rs b/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs similarity index 100% rename from polkadot-parachains/contracts-rococo/src/contracts.rs rename to parachains/runtimes/contracts/contracts-rococo/src/contracts.rs diff --git a/polkadot-parachains/contracts-rococo/src/lib.rs b/parachains/runtimes/contracts/contracts-rococo/src/lib.rs similarity index 100% rename from polkadot-parachains/contracts-rococo/src/lib.rs rename to parachains/runtimes/contracts/contracts-rococo/src/lib.rs diff --git a/polkadot-parachains/westmint/src/weights/block_weights.rs b/parachains/runtimes/contracts/contracts-rococo/src/weights/block_weights.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/block_weights.rs rename to parachains/runtimes/contracts/contracts-rococo/src/weights/block_weights.rs diff --git a/polkadot-parachains/westmint/src/weights/extrinsic_weights.rs b/parachains/runtimes/contracts/contracts-rococo/src/weights/extrinsic_weights.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/extrinsic_weights.rs rename to parachains/runtimes/contracts/contracts-rococo/src/weights/extrinsic_weights.rs diff --git a/polkadot-parachains/contracts-rococo/src/weights/mod.rs b/parachains/runtimes/contracts/contracts-rococo/src/weights/mod.rs similarity index 100% rename from polkadot-parachains/contracts-rococo/src/weights/mod.rs rename to parachains/runtimes/contracts/contracts-rococo/src/weights/mod.rs diff --git a/polkadot-parachains/westmint/src/weights/paritydb_weights.rs b/parachains/runtimes/contracts/contracts-rococo/src/weights/paritydb_weights.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/paritydb_weights.rs rename to parachains/runtimes/contracts/contracts-rococo/src/weights/paritydb_weights.rs diff --git a/polkadot-parachains/westmint/src/weights/rocksdb_weights.rs b/parachains/runtimes/contracts/contracts-rococo/src/weights/rocksdb_weights.rs similarity index 100% rename from polkadot-parachains/westmint/src/weights/rocksdb_weights.rs rename to parachains/runtimes/contracts/contracts-rococo/src/weights/rocksdb_weights.rs diff --git a/polkadot-parachains/contracts-rococo/src/xcm_config.rs b/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs similarity index 100% rename from polkadot-parachains/contracts-rococo/src/xcm_config.rs rename to parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs diff --git a/polkadot-parachains/seedling/Cargo.toml b/parachains/runtimes/starters/seedling/Cargo.toml similarity index 88% rename from polkadot-parachains/seedling/Cargo.toml rename to parachains/runtimes/starters/seedling/Cargo.toml index 4b7ae861f74..97fc40b9988 100644 --- a/polkadot-parachains/seedling/Cargo.toml +++ b/parachains/runtimes/starters/seedling/Cargo.toml @@ -29,10 +29,10 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Cumulus -cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false } -cumulus-pallet-solo-to-para = { path = "../../pallets/solo-to-para", default-features = false } -parachain-info = { path = "../pallets/parachain-info", default-features = false } -cumulus-primitives-core = { path = "../../primitives/core", default-features = false } +cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false } +cumulus-pallet-solo-to-para = { path = "../../../../pallets/solo-to-para", default-features = false } +parachain-info = { path = "../../../pallets/parachain-info", default-features = false } +cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false } [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-parachains/rococo-parachain/build.rs b/parachains/runtimes/starters/seedling/build.rs similarity index 100% rename from polkadot-parachains/rococo-parachain/build.rs rename to parachains/runtimes/starters/seedling/build.rs diff --git a/polkadot-parachains/seedling/src/lib.rs b/parachains/runtimes/starters/seedling/src/lib.rs similarity index 100% rename from polkadot-parachains/seedling/src/lib.rs rename to parachains/runtimes/starters/seedling/src/lib.rs diff --git a/polkadot-parachains/shell/Cargo.toml b/parachains/runtimes/starters/shell/Cargo.toml similarity index 86% rename from polkadot-parachains/shell/Cargo.toml rename to parachains/runtimes/starters/shell/Cargo.toml index 0d390948a12..51242257e32 100644 --- a/polkadot-parachains/shell/Cargo.toml +++ b/parachains/runtimes/starters/shell/Cargo.toml @@ -33,12 +33,12 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus -cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } -cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false } -cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false } -cumulus-primitives-core = { path = "../../primitives/core", default-features = false } -cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false } -parachain-info = { path = "../pallets/parachain-info", default-features = false } +cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false } +cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false } +cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false } +cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false } +cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false } +parachain-info = { path = "../../../pallets/parachain-info", default-features = false } [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-parachains/seedling/build.rs b/parachains/runtimes/starters/shell/build.rs similarity index 100% rename from polkadot-parachains/seedling/build.rs rename to parachains/runtimes/starters/shell/build.rs diff --git a/polkadot-parachains/shell/src/lib.rs b/parachains/runtimes/starters/shell/src/lib.rs similarity index 100% rename from polkadot-parachains/shell/src/lib.rs rename to parachains/runtimes/starters/shell/src/lib.rs diff --git a/polkadot-parachains/shell/src/xcm_config.rs b/parachains/runtimes/starters/shell/src/xcm_config.rs similarity index 100% rename from polkadot-parachains/shell/src/xcm_config.rs rename to parachains/runtimes/starters/shell/src/xcm_config.rs diff --git a/polkadot-parachains/rococo-parachain/Cargo.toml b/parachains/runtimes/testing/rococo-parachain/Cargo.toml similarity index 83% rename from polkadot-parachains/rococo-parachain/Cargo.toml rename to parachains/runtimes/testing/rococo-parachain/Cargo.toml index 1d4f605e30e..243888af67d 100644 --- a/polkadot-parachains/rococo-parachain/Cargo.toml +++ b/parachains/runtimes/testing/rococo-parachain/Cargo.toml @@ -44,17 +44,17 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus -cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } -cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } -cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false } -cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false } -cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue", default-features = false } -cumulus-ping = { path = "../pallets/ping", default-features = false } -cumulus-primitives-core = { path = "../../primitives/core", default-features = false } -cumulus-primitives-timestamp = { path = "../../primitives/timestamp", default-features = false } -cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false } -parachains-common = { path = "../parachains-common", default-features = false } -parachain-info = { path = "../pallets/parachain-info", default-features = false } +cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false } +cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false } +cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false } +cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false } +cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false } +cumulus-ping = { path = "../../../pallets/ping", default-features = false } +cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false } +cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false } +cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false } +parachains-common = { path = "../../../common", default-features = false } +parachain-info = { path = "../../../pallets/parachain-info", default-features = false } [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-parachains/shell/build.rs b/parachains/runtimes/testing/rococo-parachain/build.rs similarity index 100% rename from polkadot-parachains/shell/build.rs rename to parachains/runtimes/testing/rococo-parachain/build.rs diff --git a/polkadot-parachains/rococo-parachain/src/lib.rs b/parachains/runtimes/testing/rococo-parachain/src/lib.rs similarity index 100% rename from polkadot-parachains/rococo-parachain/src/lib.rs rename to parachains/runtimes/testing/rococo-parachain/src/lib.rs diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachain/Cargo.toml similarity index 89% rename from polkadot-parachains/Cargo.toml rename to polkadot-parachain/Cargo.toml index f1a6e282dd5..aaab54335d5 100644 --- a/polkadot-parachains/Cargo.toml +++ b/polkadot-parachain/Cargo.toml @@ -20,15 +20,15 @@ log = "0.4.17" serde = { version = "1.0.137", features = ["derive"] } # Local -rococo-parachain-runtime = { path = "rococo-parachain" } -shell-runtime = { path = "shell" } -seedling-runtime = { path = "seedling" } -statemint-runtime = { path = "statemint" } -statemine-runtime = { path = "statemine" } -westmint-runtime = { path = "westmint" } -contracts-rococo-runtime = { path = "contracts-rococo" } -jsonrpsee = { version = "0.13.0", features = ["server"] } -parachains-common = { path = "parachains-common" } +rococo-parachain-runtime = { path = "../parachains/runtimes/testing/rococo-parachain" } +shell-runtime = { path = "../parachains/runtimes/starters/shell" } +seedling-runtime = { path = "../parachains/runtimes/starters/seedling" } +statemint-runtime = { path = "../parachains/runtimes/assets/statemint" } +statemine-runtime = { path = "../parachains/runtimes/assets/statemine" } +westmint-runtime = { path = "../parachains/runtimes/assets/westmint" } +contracts-rococo-runtime = { path = "../parachains/runtimes/contracts/contracts-rococo" } +jsonrpsee = { version = "0.13", features = ["server"] } +parachains-common = { path = "../parachains/common" } # Substrate frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-parachains/build.rs b/polkadot-parachain/build.rs similarity index 100% rename from polkadot-parachains/build.rs rename to polkadot-parachain/build.rs diff --git a/polkadot-parachains/src/chain_spec.rs b/polkadot-parachain/src/chain_spec.rs similarity index 100% rename from polkadot-parachains/src/chain_spec.rs rename to polkadot-parachain/src/chain_spec.rs diff --git a/polkadot-parachains/src/cli.rs b/polkadot-parachain/src/cli.rs similarity index 100% rename from polkadot-parachains/src/cli.rs rename to polkadot-parachain/src/cli.rs diff --git a/polkadot-parachains/src/command.rs b/polkadot-parachain/src/command.rs similarity index 98% rename from polkadot-parachains/src/command.rs rename to polkadot-parachain/src/command.rs index 9836501fe12..c6753564ab6 100644 --- a/polkadot-parachains/src/command.rs +++ b/polkadot-parachain/src/command.rs @@ -95,13 +95,13 @@ fn load_spec(id: &str) -> std::result::Result, St Ok(match id { "staging" => Box::new(chain_spec::staging_test_net()), "tick" => Box::new(chain_spec::ChainSpec::from_json_bytes( - &include_bytes!("../res/tick.json")[..], + &include_bytes!("../../parachains/chain-specs/tick.json")[..], )?), "trick" => Box::new(chain_spec::ChainSpec::from_json_bytes( - &include_bytes!("../res/trick.json")[..], + &include_bytes!("../../parachains/chain-specs/trick.json")[..], )?), "track" => Box::new(chain_spec::ChainSpec::from_json_bytes( - &include_bytes!("../res/track.json")[..], + &include_bytes!("../../parachains/chain-specs/track.json")[..], )?), "shell" => Box::new(chain_spec::get_shell_chain_spec()), // -- Statemint @@ -112,7 +112,7 @@ fn load_spec(id: &str) -> std::result::Result, St "statemint-genesis" => Box::new(chain_spec::statemint_config()), // the shell-based chain spec as used for syncing "statemint" => Box::new(chain_spec::ChainSpec::from_json_bytes( - &include_bytes!("../res/statemint.json")[..], + &include_bytes!("../../parachains/chain-specs/statemint.json")[..], )?), // -- Statemine "statemine-dev" => Box::new(chain_spec::statemine_development_config()), @@ -121,7 +121,7 @@ fn load_spec(id: &str) -> std::result::Result, St "statemine-genesis" => Box::new(chain_spec::statemine_config()), // the shell-based chain spec as used for syncing "statemine" => Box::new(chain_spec::ChainSpec::from_json_bytes( - &include_bytes!("../res/statemine.json")[..], + &include_bytes!("../../parachains/chain-specs/statemine.json")[..], )?), // -- Westmint "westmint-dev" => Box::new(chain_spec::westmint_development_config()), @@ -130,14 +130,14 @@ fn load_spec(id: &str) -> std::result::Result, St "westmint-genesis" => Box::new(chain_spec::westmint_config()), // the shell-based chain spec as used for syncing "westmint" => Box::new(chain_spec::ChainSpec::from_json_bytes( - &include_bytes!("../res/westmint.json")[..], + &include_bytes!("../../parachains/chain-specs/westmint.json")[..], )?), // -- Contracts on Rococo "contracts-rococo-dev" => Box::new(chain_spec::contracts_rococo_development_config()), "contracts-rococo-local" => Box::new(chain_spec::contracts_rococo_local_config()), "contracts-rococo-genesis" => Box::new(chain_spec::contracts_rococo_config()), "contracts-rococo" => Box::new(chain_spec::ChainSpec::from_json_bytes( - &include_bytes!("../res/contracts-rococo.json")[..], + &include_bytes!("../../parachains/chain-specs/contracts-rococo.json")[..], )?), // -- Fallback (generic chainspec) "" => Box::new(chain_spec::get_chain_spec()), diff --git a/polkadot-parachains/src/main.rs b/polkadot-parachain/src/main.rs similarity index 100% rename from polkadot-parachains/src/main.rs rename to polkadot-parachain/src/main.rs diff --git a/polkadot-parachains/src/rpc.rs b/polkadot-parachain/src/rpc.rs similarity index 100% rename from polkadot-parachains/src/rpc.rs rename to polkadot-parachain/src/rpc.rs diff --git a/polkadot-parachains/src/service.rs b/polkadot-parachain/src/service.rs similarity index 100% rename from polkadot-parachains/src/service.rs rename to polkadot-parachain/src/service.rs diff --git a/polkadot-parachains/tests/benchmark_storage_works.rs b/polkadot-parachain/tests/benchmark_storage_works.rs similarity index 100% rename from polkadot-parachains/tests/benchmark_storage_works.rs rename to polkadot-parachain/tests/benchmark_storage_works.rs diff --git a/polkadot-parachains/tests/common.rs b/polkadot-parachain/tests/common.rs similarity index 100% rename from polkadot-parachains/tests/common.rs rename to polkadot-parachain/tests/common.rs diff --git a/polkadot-parachains/tests/polkadot_argument_parsing.rs b/polkadot-parachain/tests/polkadot_argument_parsing.rs similarity index 100% rename from polkadot-parachains/tests/polkadot_argument_parsing.rs rename to polkadot-parachain/tests/polkadot_argument_parsing.rs diff --git a/polkadot-parachains/tests/polkadot_mdns_issue.rs b/polkadot-parachain/tests/polkadot_mdns_issue.rs similarity index 100% rename from polkadot-parachains/tests/polkadot_mdns_issue.rs rename to polkadot-parachain/tests/polkadot_mdns_issue.rs diff --git a/polkadot-parachains/tests/purge_chain_works.rs b/polkadot-parachain/tests/purge_chain_works.rs similarity index 100% rename from polkadot-parachains/tests/purge_chain_works.rs rename to polkadot-parachain/tests/purge_chain_works.rs diff --git a/polkadot-parachains/tests/running_the_node_and_interrupt.rs b/polkadot-parachain/tests/running_the_node_and_interrupt.rs similarity index 100% rename from polkadot-parachains/tests/running_the_node_and_interrupt.rs rename to polkadot-parachain/tests/running_the_node_and_interrupt.rs diff --git a/scripts/benchmarks-ci.sh b/scripts/benchmarks-ci.sh index 90f28e77593..e74842868ee 100755 --- a/scripts/benchmarks-ci.sh +++ b/scripts/benchmarks-ci.sh @@ -4,7 +4,7 @@ steps=50 repeat=20 chainName=$1 -benhcmarkOutput=./polkadot-parachains/$chainName/src/weights +benhcmarkOutput=./parachains/runtimes/$chainName/src/weights benhcmarkChainName="$chainName-dev" pallets=( diff --git a/scripts/benchmarks.sh b/scripts/benchmarks.sh index 371c57ccac6..eddd1e9215a 100755 --- a/scripts/benchmarks.sh +++ b/scripts/benchmarks.sh @@ -3,9 +3,9 @@ steps=50 repeat=20 -statemineOutput=./polkadot-parachains/statemine/src/weights -statemintOutput=./polkadot-parachains/statemint/src/weights -westmintOutput=./polkadot-parachains/westmint/src/weights +statemineOutput=./parachains/runtimes/statemine/src/weights +statemintOutput=./parachains/runtimes/statemint/src/weights +westmintOutput=./parachains/runtimes/westmint/src/weights statemineChain=statemine-dev statemintChain=statemint-dev diff --git a/scripts/generate_genesis_value.sh b/scripts/generate_genesis_value.sh index 370c4f8c694..07e9fca59d7 100755 --- a/scripts/generate_genesis_value.sh +++ b/scripts/generate_genesis_value.sh @@ -41,7 +41,7 @@ set -e chain_id=$1 rpc_endpoint=$2 -work_dir="polkadot-parachains/res" +work_dir="parachains/chain-specs" chain_spec=$work_dir/$chain_id.json chain_values=$work_dir/${chain_id}_values.json chain_values_scale=$work_dir/${chain_id}_values.scale @@ -58,7 +58,7 @@ if [[ "$rpc_endpoint" =~ "localhost" ]]; then check_collator echo -e "Make sure you have a collator running with the correct version at $rpc_endpoint." echo -e "If you don't, NOW is the time to start it with:" - echo -e "target/release/polkadot-parachain --chain polkadot-parachains/res/shell-statemint.json --tmp\n" + echo -e "target/release/polkadot-parachain --chain parachains/chain-specs/shell-statemint.json --tmp\n" read -p "You can abort with CTRL+C if this is not correct, otherwise press ENTER " fi @@ -77,4 +77,4 @@ popd node scripts/scale_encode_genesis $chain_values $chain_values_scale $rpc_endpoint -ls -al polkadot-parachains/res/${chain_id}_value*.* +ls -al parachains/chain-specs/${chain_id}_value*.* diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml index 8d9ddad4a5a..0f01f81755d 100644 --- a/test/service/Cargo.toml +++ b/test/service/Cargo.toml @@ -58,7 +58,7 @@ polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "maste # Cumulus cumulus-client-cli = { path = "../../client/cli" } -parachains-common = { path = "../../polkadot-parachains/parachains-common" } +parachains-common = { path = "../../parachains/common" } cumulus-client-consensus-common = { path = "../../client/consensus/common" } cumulus-client-consensus-relay-chain = { path = "../../client/consensus/relay-chain" } cumulus-client-network = { path = "../../client/network" }