diff --git a/.github/pr-custom-review.yml b/.github/pr-custom-review.yml index b833d3a01aa..fc26ee677f0 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: ^parachains/runtimes/assets/(statemine|statemint)/src/[^/]+\.rs$|^parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^parachains/common/src/[^/]+\.rs$ + condition: ^parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^parachains/common/src/[^/]+\.rs$ all_distinct: - min_approvals: 1 teams: @@ -20,7 +20,7 @@ rules: condition: include: .* # excluding files from 'Runtime files' and 'CI files' rules and `Bridges subtree files` - exclude: ^parachains/runtimes/assets/(statemine|statemint)/src/[^/]+\.rs$|^parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^parachains/common/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.* + exclude: ^parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^parachains/common/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.* min_approvals: 2 teams: - core-devs diff --git a/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml b/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml index 5a7d695ec98..2f4552b928f 100644 --- a/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml +++ b/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml @@ -14,7 +14,7 @@ on: required: true chain: description: The name of the chain under test. Usually, you would pass a local chain - default: statemine-local + default: asset-hub-kusama-local required: true jobs: diff --git a/.github/workflows/release-21_extrinsic-ordering-check-from-two.yml b/.github/workflows/release-21_extrinsic-ordering-check-from-two.yml index 7fde56ef1b2..79fa11b3f9c 100644 --- a/.github/workflows/release-21_extrinsic-ordering-check-from-two.yml +++ b/.github/workflows/release-21_extrinsic-ordering-check-from-two.yml @@ -28,14 +28,14 @@ jobs: fail-fast: false matrix: include: - - runtime: statemine - local: statemine-local + - runtime: asset-hub-kusama + local: asset-hub-kusama-local + relay: kusama-local + - runtime: asset-hub-polkadot + local: asset-hub-polkadot-local relay: polkadot-local - - runtime: statemint - local: statemint-local - relay: polkadot-local - - runtime: westmint - local: westmint-local + - runtime: asset-hub-westend + local: asset-hub-westend-local relay: polkadot-local - runtime: contracts-rococo local: contracts-rococo-local diff --git a/.github/workflows/release-30_create-draft.yml b/.github/workflows/release-30_create-draft.yml index c4bb546dc78..b79f1948c16 100644 --- a/.github/workflows/release-30_create-draft.yml +++ b/.github/workflows/release-30_create-draft.yml @@ -45,11 +45,11 @@ jobs: matrix: include: - category: assets - runtime: statemine + runtime: asset-hub-kusama - category: assets - runtime: statemint + runtime: asset-hub-polkadot - category: assets - runtime: westmint + runtime: asset-hub-westend - category: bridge-hubs runtime: bridge-hub-polkadot - category: bridge-hubs @@ -223,11 +223,11 @@ jobs: matrix: include: - category: assets - runtime: statemine + runtime: asset-hub-kusama - category: assets - runtime: statemint + runtime: asset-hub-polkadot - category: assets - runtime: westmint + runtime: asset-hub-westend - category: bridge-hubs runtime: bridge-hub-polkadot - category: bridge-hubs diff --git a/.github/workflows/srtool.yml b/.github/workflows/srtool.yml index 3ac4ff8be55..b717a12ce86 100644 --- a/.github/workflows/srtool.yml +++ b/.github/workflows/srtool.yml @@ -32,11 +32,11 @@ jobs: matrix: include: - category: assets - runtime: statemine + runtime: asset-hub-kusama - category: assets - runtime: statemint + runtime: asset-hub-polkadot - category: assets - runtime: westmint + runtime: asset-hub-westend - category: bridge-hubs runtime: bridge-hub-polkadot - category: bridge-hubs diff --git a/Cargo.lock b/Cargo.lock index 305c986fdb1..59aa83e787b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -364,6 +364,266 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "asset-hub-kusama-integration-tests" +version = "1.0.0" +dependencies = [ + "asset-hub-kusama-runtime", + "frame-support", + "frame-system", + "integration-tests-common", + "pallet-assets", + "pallet-balances", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "penpal-runtime", + "polkadot-core-primitives", + "polkadot-parachain", + "polkadot-runtime", + "polkadot-runtime-parachains", + "sp-core", + "sp-runtime", + "sp-weights", + "xcm", + "xcm-emulator", + "xcm-executor", +] + +[[package]] +name = "asset-hub-kusama-runtime" +version = "0.9.420" +dependencies = [ + "asset-test-utils", + "assets-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-timestamp", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-proxy", + "pallet-session", + "pallet-state-trie-migration", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain", + "polkadot-runtime-common", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "sp-weights", + "substrate-wasm-builder", + "xcm", + "xcm-builder", + "xcm-executor", +] + +[[package]] +name = "asset-hub-polkadot-integration-tests" +version = "1.0.0" +dependencies = [ + "asset-hub-polkadot-runtime", + "frame-support", + "frame-system", + "integration-tests-common", + "pallet-assets", + "pallet-balances", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "penpal-runtime", + "polkadot-core-primitives", + "polkadot-parachain", + "polkadot-runtime", + "polkadot-runtime-parachains", + "sp-core", + "sp-runtime", + "sp-weights", + "xcm", + "xcm-emulator", + "xcm-executor", +] + +[[package]] +name = "asset-hub-polkadot-runtime" +version = "0.9.420" +dependencies = [ + "asset-test-utils", + "assets-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-timestamp", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-proxy", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain", + "polkadot-runtime-common", + "polkadot-runtime-constants", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "sp-weights", + "substrate-wasm-builder", + "xcm", + "xcm-builder", + "xcm-executor", +] + +[[package]] +name = "asset-hub-westend-runtime" +version = "0.9.420" +dependencies = [ + "asset-test-utils", + "assets-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-timestamp", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-proxy", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain", + "polkadot-runtime-common", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", + "westend-runtime-constants", + "xcm", + "xcm-builder", + "xcm-executor", +] + [[package]] name = "asset-test-utils" version = "1.0.0" @@ -4881,6 +5141,8 @@ dependencies = [ name = "integration-tests-common" version = "1.0.0" dependencies = [ + "asset-hub-kusama-runtime", + "asset-hub-polkadot-runtime", "bridge-hub-kusama-runtime", "bridge-hub-polkadot-runtime", "collectives-polkadot-runtime", @@ -4911,8 +5173,6 @@ dependencies = [ "sp-core", "sp-runtime", "sp-weights", - "statemine-runtime", - "statemint-runtime", "xcm", "xcm-emulator", "xcm-executor", @@ -9454,6 +9714,9 @@ name = "polkadot-parachain-bin" version = "0.9.420" dependencies = [ "assert_cmd", + "asset-hub-kusama-runtime", + "asset-hub-polkadot-runtime", + "asset-hub-westend-runtime", "async-trait", "bridge-hub-kusama-runtime", "bridge-hub-polkadot-runtime", @@ -9517,8 +9780,6 @@ dependencies = [ "sp-session", "sp-timestamp", "sp-transaction-pool", - "statemine-runtime", - "statemint-runtime", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -9527,7 +9788,6 @@ dependencies = [ "tokio", "try-runtime-cli", "wait-timeout", - "westmint-runtime", "xcm", ] @@ -13599,197 +13859,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "statemine-it" -version = "1.0.0" -dependencies = [ - "frame-support", - "frame-system", - "integration-tests-common", - "pallet-assets", - "pallet-balances", - "pallet-xcm", - "parachains-common", - "parity-scale-codec", - "penpal-runtime", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-runtime", - "polkadot-runtime-parachains", - "sp-core", - "sp-runtime", - "sp-weights", - "statemine-runtime", - "xcm", - "xcm-emulator", - "xcm-executor", -] - -[[package]] -name = "statemine-runtime" -version = "2.0.0" -dependencies = [ - "asset-test-utils", - "assets-common", - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-timestamp", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.4.1", - "kusama-runtime-constants", - "log", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-multisig", - "pallet-nfts", - "pallet-nfts-runtime-api", - "pallet-proxy", - "pallet-session", - "pallet-state-trie-migration", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-uniques", - "pallet-utility", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parachain-info", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-runtime-common", - "scale-info", - "smallvec", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std", - "sp-transaction-pool", - "sp-version", - "sp-weights", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", -] - -[[package]] -name = "statemint-it" -version = "1.0.0" -dependencies = [ - "frame-support", - "frame-system", - "integration-tests-common", - "pallet-assets", - "pallet-balances", - "pallet-xcm", - "parachains-common", - "parity-scale-codec", - "penpal-runtime", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-runtime", - "polkadot-runtime-parachains", - "sp-core", - "sp-runtime", - "sp-weights", - "statemint-runtime", - "xcm", - "xcm-emulator", - "xcm-executor", -] - -[[package]] -name = "statemint-runtime" -version = "1.0.0" -dependencies = [ - "asset-test-utils", - "assets-common", - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-timestamp", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.4.1", - "log", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-multisig", - "pallet-nfts", - "pallet-nfts-runtime-api", - "pallet-proxy", - "pallet-session", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-uniques", - "pallet-utility", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parachain-info", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-runtime-common", - "polkadot-runtime-constants", - "scale-info", - "smallvec", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std", - "sp-transaction-pool", - "sp-version", - "sp-weights", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -15709,75 +15778,6 @@ dependencies = [ "sp-weights", ] -[[package]] -name = "westmint-runtime" -version = "1.0.0" -dependencies = [ - "asset-test-utils", - "assets-common", - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-timestamp", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.4.1", - "log", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-multisig", - "pallet-nft-fractionalization", - "pallet-nfts", - "pallet-nfts-runtime-api", - "pallet-proxy", - "pallet-session", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-uniques", - "pallet-utility", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parachain-info", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-runtime-common", - "scale-info", - "smallvec", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std", - "sp-transaction-pool", - "sp-version", - "substrate-wasm-builder", - "westend-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", -] - [[package]] name = "which" version = "4.2.2" diff --git a/Cargo.toml b/Cargo.toml index faec5a0288a..d03e720da64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,9 +42,9 @@ members = [ "parachains/runtimes/starters/shell", "parachains/runtimes/starters/seedling", "parachains/runtimes/assets/common", - "parachains/runtimes/assets/statemint", - "parachains/runtimes/assets/statemine", - "parachains/runtimes/assets/westmint", + "parachains/runtimes/assets/asset-hub-polkadot", + "parachains/runtimes/assets/asset-hub-kusama", + "parachains/runtimes/assets/asset-hub-westend", "parachains/runtimes/bridge-hubs/bridge-hub-rococo", "parachains/runtimes/bridge-hubs/bridge-hub-kusama", "parachains/runtimes/bridge-hubs/bridge-hub-polkadot", @@ -53,8 +53,8 @@ members = [ "parachains/runtimes/glutton/glutton-kusama", "parachains/runtimes/testing/penpal", "parachains/integration-tests/emulated/common", - "parachains/integration-tests/emulated/assets/statemine", - "parachains/integration-tests/emulated/assets/statemint", + "parachains/integration-tests/emulated/assets/asset-hub-kusama", + "parachains/integration-tests/emulated/assets/asset-hub-polkadot", "test/client", "test/relay-sproof-builder", "test/relay-validation-worker-provider", diff --git a/README.md b/README.md index fe6836e03ae..b9ebebfe3a7 100644 --- a/README.md +++ b/README.md @@ -167,16 +167,14 @@ cargo build --release --bin polkadot-parachain ![image](https://user-images.githubusercontent.com/2915325/99548884-1be13580-2987-11eb-9a8b-20be658d34f9.png) -## Statemint 🪙 +## Asset Hub 🪙 -This repository also contains the Statemint runtime (as well as the canary runtime Statemine and the -test runtime Westmint). -Statemint is a system parachain providing an asset store for the Polkadot ecosystem. +This repository also contains the Asset Hub runtimes. Asset Hub is a system parachain providing an +asset store for the Polkadot ecosystem. ### Build & Launch a Node -To run a Statemine or Westmint node (Statemint is not deployed, yet) you will need to compile the -`polkadot-parachain` binary: +To run an Asset Hub node, you will need to compile the `polkadot-parachain` binary: ```bash cargo build --release --locked --bin polkadot-parachain @@ -185,7 +183,7 @@ cargo build --release --locked --bin polkadot-parachain Once the executable is built, launch the parachain node via: ```bash -CHAIN=westmint # or statemine +CHAIN=asset-hub-westend # or asset-hub-kusama ./target/release/polkadot-parachain --chain $CHAIN ``` @@ -244,7 +242,7 @@ Once the executable is built, launch collators for each parachain (repeat once e ### Parachains -* [Statemint](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-statemint-rpc.polkadot.io#/explorer) +* [Asset Hub](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-statemint-rpc.polkadot.io#/explorer) * [Contracts on Rococo](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-contracts-rpc.polkadot.io#/explorer) * [RILT](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo.kilt.io#/explorer) diff --git a/bridges/docs/polkadot-kusama-bridge-overview.md b/bridges/docs/polkadot-kusama-bridge-overview.md index 9f407b6ba00..b469720f65b 100644 --- a/bridges/docs/polkadot-kusama-bridge-overview.md +++ b/bridges/docs/polkadot-kusama-bridge-overview.md @@ -24,9 +24,9 @@ You won't be able to directly use bridge hub transactions to send XCM messages o to use other parachains transactions, which will use HRMP to deliver messages to the Bridge Hub. The Bridge Hub will just queue these messages in its outbound lane, which is dedicated to deliver messages between two parachains. -Our first planned bridge will connect the Polkadot' Statemint and Kusama' Statemine. Bridge between those two -parachains would allow Statemint accounts to hold wrapped KSM tokens and Statemine accounts to hold wrapped DOT -tokens. +Our first planned bridge will connect the Polkadot and Kusama Asset Hubs. A bridge between those two +parachains would allow Asset Hub Polkadot accounts to hold wrapped KSM tokens and Asset Hub Kusama +accounts to hold wrapped DOT tokens. For that bridge (pair of parachains under different consensus systems) we'll be using the lane 00000000. Later, when other parachains will join the bridge, they will be using other lanes for their messages. @@ -93,13 +93,13 @@ Obviously, there should be someone who is paying relayer rewards. We want bridge can't use fees for rewards. Instead, the parachains using the bridge, use sovereign accounts on both sides of the bridge to cover relayer rewards. -Bridged Parachains will have sovereign accounts at bridge hubs. For example, the Statemine (Kusama Parachain) will -have an account at the Polkadot Bridge Hub. The Statemint (Polkadot Parachain) will have an account at the Kusama +Bridged Parachains will have sovereign accounts at bridge hubs. For example, the Kusama Asset Hub will +have an account at the Polkadot Bridge Hub. The Polkadot Asset Hub will have an account at the Kusama Bridge Hub. The sovereign accounts are used as a source of funds when the relayer is calling the `pallet_bridge_relayers::claim_rewards`. Since messages lane is only used by the pair of parachains, there's no collision between different bridges. E.g. -Statemine will only reward relayers that are delivering messages from Statemine. The Statemine sovereign account +Kusama Asset Hub will only reward relayers that are delivering messages from Kusama Asset Hub. The Kusama Asset Hub sovereign account is not used to cover rewards of bridging with some other Polkadot Parachain. ### Multiple Relayers and Rewards diff --git a/bridges/docs/polkadot-kusama-bridge.html b/bridges/docs/polkadot-kusama-bridge.html index dcbae0e7b17..bf248adb571 100644 --- a/bridges/docs/polkadot-kusama-bridge.html +++ b/bridges/docs/polkadot-kusama-bridge.html @@ -16,7 +16,7 @@

Polkadot <> Kusama Bridge

In our architecture, the lane that is used to relay messages over the bridge is determined by - the XCM source and destinations. So e.g. bridge between Statemint and Statemine (and opposite direction) + the XCM source and destinations. So e.g. bridge between Asset Hubs Polkadot and Kusama (and opposite direction) will use the lane 00000000, bridge between some other Polkadot Parachain and some other Kusama Parachain will use the lane 00000001 and so on.

@@ -24,29 +24,29 @@

Polkadot <> Kusama Bridge

flowchart LR subgraph Polkadot Consensus polkadot(((Polkadot))) - statemint(((Statemint))) + asset_hub_polkadot(((Polkadot Asset Hub))) polkadot_bh(((Polkadot Bridge Hub))) - polkadot---statemint + polkadot---asset_hub_polkadot polkadot---polkadot_bh - statemint-->|Send Message Using HRMP|polkadot_bh + asset_hub_polkadot-->|Send Message Using HRMP|polkadot_bh - polkadot_bh-->|Send Message Using HRMP|statemint - statemint-->|Dispatch the Message|statemint + polkadot_bh-->|Send Message Using HRMP|asset_hub_polkadot + asset_hub_polkadot-->|Dispatch the Message|asset_hub_polkadot end subgraph Kusama Consensus kusama_bh(((Kusama Bridge Hub))) - statemine(((Statemine))) + asset_hub_kusama(((Kusama Asset Hub))) kusama(((Kusama))) - kusama---statemine + kusama---asset_hub_kusama kusama---kusama_bh - kusama_bh-->|Send Message Using HRMP|statemine - statemine-->|Dispatch the Message|statemine + kusama_bh-->|Send Message Using HRMP|asset_hub_kusama + asset_hub_kusama-->|Dispatch the Message|asset_hub_kusama - statemine-->|Send Message Using HRMP|kusama_bh + asset_hub_kusama-->|Send Message Using HRMP|kusama_bh end polkadot_bh<===>|Message is relayed to the Bridged Chain using lane 00000000|kusama_bh diff --git a/bridges/modules/messages/README.md b/bridges/modules/messages/README.md index b717db6ad62..b5250d0dca0 100644 --- a/bridges/modules/messages/README.md +++ b/bridges/modules/messages/README.md @@ -33,8 +33,8 @@ is the runtime developer who defines what message lane and message mean for this In our [Kusama<>Polkadot bridge](../../docs/polkadot-kusama-bridge-overview.md) we are using lane as a channel of communication between two parachains of different relay chains. For example, lane -`[0, 0, 0, 0]` is used for Statemint <> Statemine communications. Other lanes may be used to bridge -another parachains. +`[0, 0, 0, 0]` is used for Polkadot <> Kusama Asset Hub communications. Other lanes may be used to +bridge other parachains. ## Message Workflow diff --git a/bridges/primitives/runtime/src/lib.rs b/bridges/primitives/runtime/src/lib.rs index 48c1ec13e89..1ce1b7a0eed 100644 --- a/bridges/primitives/runtime/src/lib.rs +++ b/bridges/primitives/runtime/src/lib.rs @@ -76,8 +76,8 @@ pub const KUSAMA_CHAIN_ID: ChainId = *b"ksma"; /// Westend chain id. pub const WESTEND_CHAIN_ID: ChainId = *b"wend"; -/// Westend chain id. -pub const WESTMINT_CHAIN_ID: ChainId = *b"wmnt"; +/// AssetHubWestend chain id. +pub const ASSET_HUB_WESTEND_CHAIN_ID: ChainId = *b"ahwe"; /// Rococo chain id. pub const ROCOCO_CHAIN_ID: ChainId = *b"roco"; diff --git a/docs/release.md b/docs/release.md index 9c0a6acc0e9..b04c4e844c4 100644 --- a/docs/release.md +++ b/docs/release.md @@ -37,8 +37,8 @@ performed during the release process. ### Burn In -Ensure that Parity DevOps has run the new release on Westmint and Statemine collators for 12h prior to publishing the -release. +Ensure that Parity DevOps has run the new release on Westend and Kusama Asset Hub collators for 12h +prior to publishing the release. ### Build Artifacts @@ -84,15 +84,15 @@ To verify the order has not changed, manually start the following [Github Action To run it, in the _Run Workflow_ dropdown: 1. **Use workflow from**: to ignore, leave `master` as default 2. **The WebSocket url of the reference node**: - - Statemint: `wss://statemint-rpc.polkadot.io` - - Statemine: `wss://statemine-rpc.polkadot.io` - - Westmint: `wss://westmint-rpc.polkadot.io` + - Asset Hub Polkadot: `wss://statemint-rpc.polkadot.io` + - Asset Hub Kusama: `wss://statemine-rpc.polkadot.io` + - Asset Hub Westend: `wss://westmint-rpc.polkadot.io` 3. **A url to a Linux binary for the node containing the runtime to test**: Paste the URL of the latest release-candidate binary from the draft-release on Github. The binary has to previously be uploaded to S3 (Github url link to the binary is constantly changing) - E.g: https://releases.parity.io/cumulus/v0.9.270-rc3/polkadot-parachain 4. **The name of the chain under test. Usually, you would pass a local chain**: - - Statemint: `statemint-local` - - Statemine: `statemine-local` - - Westmint: `westmint-local` + - Asset Hub Polkadot: `asset-hub-polkadot-local` + - Asset Hub Kusama: `asset-hub-kusama-local` + - Asset Hub Westend: `asset-hub-westend-local` 5. Click **Run workflow** When the workflow is done, click on it and download the zip artifact, inside you'll find an `output.txt` file. The things to look for in the output are lines like: @@ -114,7 +114,7 @@ The Benchmarks can now be started from the CI. First find the CI pipeline from [ ### Integration Tests Until https://github.com/paritytech/ci_cd/issues/499 is done, tests will have to be run manually. -1. Go to https://github.com/paritytech/parachains-integration-tests and checkout to the release branch. +1. Go to https://github.com/paritytech/parachains-integration-tests and check out the release branch. E.g. https://github.com/paritytech/parachains-integration-tests/tree/release-v9270-v0.9.27 for `release-parachains-v0.9.270` 2. Clone `release-parachains-` branch from Cumulus @@ -126,5 +126,5 @@ In case the branch does not exists (it is a manual process): cherry pick parityt 6. `cargo build --release --features fast-runtime` 7. Copy `./target/polkadot` into `./bin` (in Cumulus) 8. Run the tests: - - Statemint: `yarn zombienet-test -c ./examples/statemint/config.toml -t ./examples/statemint` - - Statemine: `yarn zombienet-test -c ./examples/statemine/config.toml -t ./examples/statemine` + - Asset Hub Polkadot: `yarn zombienet-test -c ./examples/statemint/config.toml -t ./examples/statemint` + - Asset Hub Kusama: `yarn zombienet-test -c ./examples/statemine/config.toml -t ./examples/statemine` diff --git a/pallets/session-benchmarking/Cargo.toml b/pallets/session-benchmarking/Cargo.toml index 111cbb85ee6..6bc7d845d70 100644 --- a/pallets/session-benchmarking/Cargo.toml +++ b/pallets/session-benchmarking/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" homepage = "https://substrate.io" repository = "https://github.com/paritytech/cumulus/" -description = "FRAME sessions pallet benchmarking for statemint" +description = "FRAME sessions pallet benchmarking" readme = "README.md" [package.metadata.docs.rs] diff --git a/parachains/chain-specs/statemine_genesis_values.json b/parachains/chain-specs/asset-hub-kusama-genesis-values.json similarity index 100% rename from parachains/chain-specs/statemine_genesis_values.json rename to parachains/chain-specs/asset-hub-kusama-genesis-values.json diff --git a/parachains/chain-specs/statemine_genesis.json b/parachains/chain-specs/asset-hub-kusama-genesis.json similarity index 99% rename from parachains/chain-specs/statemine_genesis.json rename to parachains/chain-specs/asset-hub-kusama-genesis.json index 8b0dee2f8cf..d6eeb567c25 100644 --- a/parachains/chain-specs/statemine_genesis.json +++ b/parachains/chain-specs/asset-hub-kusama-genesis.json @@ -1,6 +1,6 @@ { - "name": "Statemine", - "id": "statemine", + "name": "Kusama Asset Hub", + "id": "asset-hub-kusama", "chainType": "Live", "bootNodes": [ "/ip4/127.0.0.1/tcp/30333/p2p/12D3KooWHGksh2JFMaW8AkZvyhVpmiXUJnCQbngExTLMdq753ZQR" diff --git a/parachains/chain-specs/statemine.json b/parachains/chain-specs/asset-hub-kusama.json similarity index 99% rename from parachains/chain-specs/statemine.json rename to parachains/chain-specs/asset-hub-kusama.json index bf296a173b9..ccbe8f0326c 100644 --- a/parachains/chain-specs/statemine.json +++ b/parachains/chain-specs/asset-hub-kusama.json @@ -1,6 +1,6 @@ { - "name": "Statemine", - "id": "statemine", + "name": "Kusama Asset Hub", + "id": "asset-hub-kusama", "chainType": "Live", "bootNodes": [ "/ip4/34.77.217.152/tcp/30334/p2p/12D3KooWF63ZxKtZMYs5247WQA8fcTiGJb2osXykc31cmjwNLwem", diff --git a/parachains/chain-specs/statemint_genesis_values.json b/parachains/chain-specs/asset-hub-polkadot-genesis-values.json similarity index 100% rename from parachains/chain-specs/statemint_genesis_values.json rename to parachains/chain-specs/asset-hub-polkadot-genesis-values.json diff --git a/parachains/chain-specs/statemint_genesis_values.scale b/parachains/chain-specs/asset-hub-polkadot-genesis-values.scale similarity index 100% rename from parachains/chain-specs/statemint_genesis_values.scale rename to parachains/chain-specs/asset-hub-polkadot-genesis-values.scale diff --git a/parachains/chain-specs/statemint_genesis.json b/parachains/chain-specs/asset-hub-polkadot-genesis.json similarity index 99% rename from parachains/chain-specs/statemint_genesis.json rename to parachains/chain-specs/asset-hub-polkadot-genesis.json index 2763994949e..fff9bbe1ea1 100644 --- a/parachains/chain-specs/statemint_genesis.json +++ b/parachains/chain-specs/asset-hub-polkadot-genesis.json @@ -1,6 +1,6 @@ { - "name": "Statemint", - "id": "statemint", + "name": "Polkadot Asset Hub", + "id": "asset-hub-polkadot", "chainType": "Live", "bootNodes": [ "/ip4/34.65.251.121/tcp/30334/p2p/12D3KooWG3GrM6XKMM4gp3cvemdwUvu96ziYoJmqmetLZBXE8bSa", diff --git a/parachains/chain-specs/statemint.json b/parachains/chain-specs/asset-hub-polkadot.json similarity index 99% rename from parachains/chain-specs/statemint.json rename to parachains/chain-specs/asset-hub-polkadot.json index 61ca655af6c..5c18f90f70a 100644 --- a/parachains/chain-specs/statemint.json +++ b/parachains/chain-specs/asset-hub-polkadot.json @@ -1,6 +1,6 @@ { - "name": "Statemint", - "id": "statemint", + "name": "Polkadot Asset Hub", + "id": "asset-hub-polkadot", "chainType": "Live", "bootNodes": [ "/ip4/34.65.251.121/tcp/30334/p2p/12D3KooWG3GrM6XKMM4gp3cvemdwUvu96ziYoJmqmetLZBXE8bSa", diff --git a/parachains/chain-specs/rockmine.json b/parachains/chain-specs/asset-hub-rococo.json similarity index 99% rename from parachains/chain-specs/rockmine.json rename to parachains/chain-specs/asset-hub-rococo.json index d774da8744a..1a9e63a1cb8 100644 --- a/parachains/chain-specs/rockmine.json +++ b/parachains/chain-specs/asset-hub-rococo.json @@ -1,6 +1,6 @@ { - "name": "Rockmine", - "id": "statemine-rococo", + "name": "Rococo Asset Hub", + "id": "asset-hub-rococo", "chainType": "Live", "bootNodes": [ "/dns/rococo-rockmine-collator-node-0.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWRrZMndHAopzao34uGsN7srjS3gh9nAjTGKLSyJeU31Lg", diff --git a/parachains/chain-specs/westmint_genesis_values.json b/parachains/chain-specs/asset-hub-westend-genesis-values.json similarity index 100% rename from parachains/chain-specs/westmint_genesis_values.json rename to parachains/chain-specs/asset-hub-westend-genesis-values.json diff --git a/parachains/chain-specs/westmint_genesis.json b/parachains/chain-specs/asset-hub-westend-genesis.json similarity index 99% rename from parachains/chain-specs/westmint_genesis.json rename to parachains/chain-specs/asset-hub-westend-genesis.json index ffd30fbe2de..09d07277c41 100644 --- a/parachains/chain-specs/westmint_genesis.json +++ b/parachains/chain-specs/asset-hub-westend-genesis.json @@ -1,6 +1,6 @@ { - "name": "Westmint", - "id": "westmint", + "name": "Westend Asset Hub", + "id": "asset-hub-westend", "chainType": "Live", "bootNodes": [ "/ip4/127.0.0.1/tcp/30333/p2p/12D3KooWQWfQ6EBNgik1sW5by9vYagzrdsohc6NafeGPU4upnLRp" diff --git a/parachains/chain-specs/westmint.json b/parachains/chain-specs/asset-hub-westend.json similarity index 99% rename from parachains/chain-specs/westmint.json rename to parachains/chain-specs/asset-hub-westend.json index 17d768e58d7..14aaea348e9 100644 --- a/parachains/chain-specs/westmint.json +++ b/parachains/chain-specs/asset-hub-westend.json @@ -1,6 +1,6 @@ { - "name": "Westmint", - "id": "westmint", + "name": "Westend Asset Hub", + "id": "asset-hub-westend", "chainType": "Live", "bootNodes": [ "/dns/westend-westmint-collator-node-0.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWJaAfPyiye7ZQBuHengTJJoMrcaz7Jj1UzHiKdNxA1Nkd", diff --git a/parachains/chain-specs/shell-statemint-head-data b/parachains/chain-specs/shell-head-data similarity index 100% rename from parachains/chain-specs/shell-statemint-head-data rename to parachains/chain-specs/shell-head-data diff --git a/parachains/chain-specs/shell-statemint.json b/parachains/chain-specs/shell.json similarity index 100% rename from parachains/chain-specs/shell-statemint.json rename to parachains/chain-specs/shell.json diff --git a/parachains/common/src/lib.rs b/parachains/common/src/lib.rs index 8ac464ea077..46a8af0fb2e 100644 --- a/parachains/common/src/lib.rs +++ b/parachains/common/src/lib.rs @@ -54,12 +54,12 @@ mod types { // Aura consensus authority. pub type AuraId = sp_consensus_aura::sr25519::AuthorityId; - // Aura consensus authority used by Statemint. + // Aura consensus authority used by Asset Hub Polkadot. // // Because of registering the authorities with an ed25519 key before switching from Shell - // to Statemint, we were required to deploy a hotfix that changed Statemint to ed22519. - // In the future that may change again. - pub type StatemintAuraId = sp_consensus_aura::ed25519::AuthorityId; + // to Asset Hub Polkadot, we were required to deploy a hotfix that changed Asset Hub Polkadot's + // Aura keys to ed22519. In the future that may change again. + pub type AssetHubPolkadotAuraId = sp_consensus_aura::ed25519::AuthorityId; // Id used for identifying assets. pub type AssetIdForTrustBackedAssets = u32; diff --git a/parachains/integration-tests/e2e/assets/statemine/0_xcm/0_init.yml b/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/0_init.yml similarity index 100% rename from parachains/integration-tests/e2e/assets/statemine/0_xcm/0_init.yml rename to parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/0_init.yml diff --git a/parachains/integration-tests/e2e/assets/statemine/0_xcm/1_dmp.yml b/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/1_dmp.yml similarity index 100% rename from parachains/integration-tests/e2e/assets/statemine/0_xcm/1_dmp.yml rename to parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/1_dmp.yml diff --git a/parachains/integration-tests/e2e/assets/statemine/0_xcm/2_ump.yml b/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/2_ump.yml similarity index 100% rename from parachains/integration-tests/e2e/assets/statemine/0_xcm/2_ump.yml rename to parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/2_ump.yml diff --git a/parachains/integration-tests/e2e/assets/statemine/0_xcm/3_force_hrmp-open-channels.yml b/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/3_force_hrmp-open-channels.yml similarity index 100% rename from parachains/integration-tests/e2e/assets/statemine/0_xcm/3_force_hrmp-open-channels.yml rename to parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/3_force_hrmp-open-channels.yml diff --git a/parachains/integration-tests/e2e/assets/statemine/0_xcm/4_hrmp.yml b/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/4_hrmp.yml similarity index 100% rename from parachains/integration-tests/e2e/assets/statemine/0_xcm/4_hrmp.yml rename to parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/4_hrmp.yml diff --git a/parachains/integration-tests/e2e/assets/statemine/config.toml b/parachains/integration-tests/e2e/assets/asset-hub-kusama/config.toml similarity index 97% rename from parachains/integration-tests/e2e/assets/statemine/config.toml rename to parachains/integration-tests/e2e/assets/asset-hub-kusama/config.toml index 57c8f37e24b..1ec06b3fa10 100644 --- a/parachains/integration-tests/e2e/assets/statemine/config.toml +++ b/parachains/integration-tests/e2e/assets/asset-hub-kusama/config.toml @@ -26,7 +26,7 @@ chain = "kusama-local" [[parachains]] id = 1000 -chain = "statemine-local" +chain = "asset-hub-kusama-local" cumulus_based = true [[parachains.collators]] diff --git a/parachains/integration-tests/e2e/assets/statemint/0_xcm/0_init.yml b/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/0_init.yml similarity index 100% rename from parachains/integration-tests/e2e/assets/statemint/0_xcm/0_init.yml rename to parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/0_init.yml diff --git a/parachains/integration-tests/e2e/assets/statemint/0_xcm/1_dmp.yml b/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/1_dmp.yml similarity index 100% rename from parachains/integration-tests/e2e/assets/statemint/0_xcm/1_dmp.yml rename to parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/1_dmp.yml diff --git a/parachains/integration-tests/e2e/assets/statemint/0_xcm/2_ump.yml b/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/2_ump.yml similarity index 100% rename from parachains/integration-tests/e2e/assets/statemint/0_xcm/2_ump.yml rename to parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/2_ump.yml diff --git a/parachains/integration-tests/e2e/assets/statemint/0_xcm/3_force_hrmp-open-channels.yml b/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/3_force_hrmp-open-channels.yml similarity index 100% rename from parachains/integration-tests/e2e/assets/statemint/0_xcm/3_force_hrmp-open-channels.yml rename to parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/3_force_hrmp-open-channels.yml diff --git a/parachains/integration-tests/e2e/assets/statemint/0_xcm/4_hrmp.yml b/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/4_hrmp.yml similarity index 100% rename from parachains/integration-tests/e2e/assets/statemint/0_xcm/4_hrmp.yml rename to parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/4_hrmp.yml diff --git a/parachains/integration-tests/e2e/assets/statemint/config.toml b/parachains/integration-tests/e2e/assets/asset-hub-polkadot/config.toml similarity index 97% rename from parachains/integration-tests/e2e/assets/statemint/config.toml rename to parachains/integration-tests/e2e/assets/asset-hub-polkadot/config.toml index 2e68734e09f..da53cd0ad4f 100644 --- a/parachains/integration-tests/e2e/assets/statemint/config.toml +++ b/parachains/integration-tests/e2e/assets/asset-hub-polkadot/config.toml @@ -26,7 +26,7 @@ chain = "polkadot-local" [[parachains]] id = 1000 -chain = "statemint-local" +chain = "asset-hub-polkadot-local" cumulus_based = true [[parachains.collators]] diff --git a/parachains/integration-tests/emulated/assets/statemint/Cargo.toml b/parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml similarity index 90% rename from parachains/integration-tests/emulated/assets/statemint/Cargo.toml rename to parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml index 8c6077b67e4..a25e2116873 100644 --- a/parachains/integration-tests/emulated/assets/statemint/Cargo.toml +++ b/parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "statemint-it" +name = "asset-hub-kusama-integration-tests" version = "1.0.0" authors = ["Parity Technologies "] edition = "2021" -description = "Statemint parachain runtime integration tests with xcm-emulator" +description = "Asset Hub Kusama runtime integration tests with xcm-emulator" [dependencies] codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false } @@ -29,7 +29,7 @@ pallet-xcm = { default-features = false, git = "https://github.com/paritytech/po # Cumulus parachains-common = { path = "../../../../common" } penpal-runtime = { path = "../../../../runtimes/testing/penpal" } -statemint-runtime = { path = "../../../../runtimes/assets/statemint" } +asset-hub-kusama-runtime = { path = "../../../../runtimes/assets/asset-hub-kusama" } # Local xcm-emulator = { default-features = false, path = "../../../../../xcm/xcm-emulator" } diff --git a/parachains/integration-tests/emulated/assets/statemine/src/lib.rs b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs similarity index 52% rename from parachains/integration-tests/emulated/assets/statemine/src/lib.rs rename to parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs index 7616a871b84..49986fa3c83 100644 --- a/parachains/integration-tests/emulated/assets/statemine/src/lib.rs +++ b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs @@ -8,13 +8,13 @@ pub use integration_tests_common::{ kusama::ED as KUSAMA_ED, PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3, }, - AccountId, BHKusama, BHKusamaPallet, BHKusamaReceiver, BHKusamaSender, BHPolkadot, - BHPolkadotPallet, BHPolkadotReceiver, BHPolkadotSender, Collectives, CollectivesPallet, - CollectivesReceiver, CollectivesSender, Kusama, KusamaMockNet, KusamaPallet, KusamaReceiver, - KusamaSender, PenpalKusama, PenpalKusamaReceiver, PenpalKusamaSender, PenpalPolkadot, - PenpalPolkadotReceiver, PenpalPolkadotSender, Polkadot, PolkadotMockNet, PolkadotPallet, - PolkadotReceiver, PolkadotSender, Statemine, StateminePallet, StatemineReceiver, - StatemineSender, + AccountId, AssetHubKusama, AssetHubKusamaPallet, AssetHubKusamaReceiver, AssetHubKusamaSender, + BHKusama, BHKusamaPallet, BHKusamaReceiver, BHKusamaSender, BHPolkadot, BHPolkadotPallet, + BHPolkadotReceiver, BHPolkadotSender, Collectives, CollectivesPallet, CollectivesReceiver, + CollectivesSender, Kusama, KusamaMockNet, KusamaPallet, KusamaReceiver, KusamaSender, + PenpalKusama, PenpalKusamaReceiver, PenpalKusamaSender, PenpalPolkadot, PenpalPolkadotReceiver, + PenpalPolkadotSender, Polkadot, PolkadotMockNet, PolkadotPallet, PolkadotReceiver, + PolkadotSender, }; pub use polkadot_core_primitives::InboundDownwardMessage; pub use xcm::{ diff --git a/parachains/integration-tests/emulated/assets/statemine/src/tests/mod.rs b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/mod.rs similarity index 100% rename from parachains/integration-tests/emulated/assets/statemine/src/tests/mod.rs rename to parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/mod.rs diff --git a/parachains/integration-tests/emulated/assets/statemine/src/tests/reserve_transfer.rs b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs similarity index 78% rename from parachains/integration-tests/emulated/assets/statemine/src/tests/reserve_transfer.rs rename to parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs index bbf272572ac..46d6e9a807d 100644 --- a/parachains/integration-tests/emulated/assets/statemine/src/tests/reserve_transfer.rs +++ b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs @@ -5,13 +5,14 @@ fn reserve_transfer_native_asset_from_relay_to_assets() { // Init tests variables let amount = KUSAMA_ED * 1000; let relay_sender_balance_before = Kusama::account_data_of(KusamaSender::get()).free; - let para_receiver_balance_before = Statemine::account_data_of(StatemineReceiver::get()).free; + let para_receiver_balance_before = + AssetHubKusama::account_data_of(AssetHubKusamaReceiver::get()).free; let origin = ::RuntimeOrigin::signed(KusamaSender::get()); let assets_para_destination: VersionedMultiLocation = - Kusama::child_location_of(Statemine::para_id()).into(); + Kusama::child_location_of(AssetHubKusama::para_id()).into(); let beneficiary: VersionedMultiLocation = - AccountId32 { network: None, id: StatemineReceiver::get().into() }.into(); + AccountId32 { network: None, id: AssetHubKusamaReceiver::get().into() }.into(); let native_assets: VersionedMultiAssets = (Here, amount).into(); let fee_asset_item = 0; let weight_limit = WeightLimit::Unlimited; @@ -40,11 +41,11 @@ fn reserve_transfer_native_asset_from_relay_to_assets() { }); // Receive XCM message in Assets Parachain - Statemine::execute_with(|| { - type RuntimeEvent = ::RuntimeEvent; + AssetHubKusama::execute_with(|| { + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( - Statemine, + AssetHubKusama, vec![ RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { outcome: Outcome::Incomplete(_, Error::UntrustedReserveLocation), @@ -56,7 +57,8 @@ fn reserve_transfer_native_asset_from_relay_to_assets() { // Check if balances are updated accordingly in Relay Chain and Assets Parachain let relay_sender_balance_after = Kusama::account_data_of(KusamaSender::get()).free; - let para_sender_balance_after = Statemine::account_data_of(StatemineReceiver::get()).free; + let para_sender_balance_after = + AssetHubKusama::account_data_of(AssetHubKusamaReceiver::get()).free; assert_eq!(relay_sender_balance_before - amount, relay_sender_balance_after); assert_eq!(para_sender_balance_after, para_receiver_balance_before); diff --git a/parachains/integration-tests/emulated/assets/statemine/src/tests/teleport.rs b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs similarity index 74% rename from parachains/integration-tests/emulated/assets/statemine/src/tests/teleport.rs rename to parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs index cbb07e4592e..92849523d45 100644 --- a/parachains/integration-tests/emulated/assets/statemine/src/tests/teleport.rs +++ b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs @@ -5,13 +5,14 @@ fn teleport_native_assets_from_relay_to_assets_para() { // Init tests variables let amount = KUSAMA_ED * 1000; let relay_sender_balance_before = Kusama::account_data_of(KusamaSender::get()).free; - let para_receiver_balance_before = Statemine::account_data_of(StatemineReceiver::get()).free; + let para_receiver_balance_before = + AssetHubKusama::account_data_of(AssetHubKusamaReceiver::get()).free; let origin = ::RuntimeOrigin::signed(KusamaSender::get()); let assets_para_destination: VersionedMultiLocation = - Kusama::child_location_of(Statemine::para_id()).into(); + Kusama::child_location_of(AssetHubKusama::para_id()).into(); let beneficiary: VersionedMultiLocation = - AccountId32 { network: None, id: StatemineReceiver::get().into() }.into(); + AccountId32 { network: None, id: AssetHubKusamaReceiver::get().into() }.into(); let native_assets: VersionedMultiAssets = (Here, amount).into(); let fee_asset_item = 0; let weight_limit = WeightLimit::Unlimited; @@ -40,14 +41,14 @@ fn teleport_native_assets_from_relay_to_assets_para() { }); // Receive XCM message in Assets Parachain - Statemine::execute_with(|| { - type RuntimeEvent = ::RuntimeEvent; + AssetHubKusama::execute_with(|| { + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( - Statemine, + AssetHubKusama, vec![ RuntimeEvent::Balances(pallet_balances::Event::Deposit { who, .. }) => { - who: *who == StatemineReceiver::get().into(), + who: *who == AssetHubKusamaReceiver::get().into(), }, ] ); @@ -55,7 +56,8 @@ fn teleport_native_assets_from_relay_to_assets_para() { // Check if balances are updated accordingly in Relay Chain and Assets Parachain let relay_sender_balance_after = Kusama::account_data_of(KusamaSender::get()).free; - let para_sender_balance_after = Statemine::account_data_of(StatemineReceiver::get()).free; + let para_sender_balance_after = + AssetHubKusama::account_data_of(AssetHubKusamaReceiver::get()).free; assert_eq!(relay_sender_balance_before - amount, relay_sender_balance_after); assert!(para_sender_balance_after > para_receiver_balance_before); diff --git a/parachains/integration-tests/emulated/assets/statemine/src/tests/transact.rs b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/transact.rs similarity index 77% rename from parachains/integration-tests/emulated/assets/statemine/src/tests/transact.rs rename to parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/transact.rs index 144c8cc9f21..79542395e74 100644 --- a/parachains/integration-tests/emulated/assets/statemine/src/tests/transact.rs +++ b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/transact.rs @@ -6,14 +6,14 @@ fn transact_sudo_from_relay_to_assets_para() { // Call to be executed in Assets Parachain const ASSET_ID: u32 = 1; - let call = ::RuntimeCall::Assets(pallet_assets::Call::< - ::Runtime, + let call = ::RuntimeCall::Assets(pallet_assets::Call::< + ::Runtime, Instance1, >::force_create { id: ASSET_ID.into(), is_sufficient: true, min_balance: 1000, - owner: StatemineSender::get().into(), + owner: AssetHubKusamaSender::get().into(), }) .encode() .into(); @@ -21,7 +21,7 @@ fn transact_sudo_from_relay_to_assets_para() { // XcmPallet send arguments let sudo_origin = ::RuntimeOrigin::root(); let assets_para_destination: VersionedMultiLocation = - Kusama::child_location_of(Statemine::para_id()).into(); + Kusama::child_location_of(AssetHubKusama::para_id()).into(); let weight_limit = WeightLimit::Unlimited; let require_weight_at_most = Weight::from_parts(1000000000, 200000); @@ -52,7 +52,7 @@ fn transact_sudo_from_relay_to_assets_para() { }); // Receive XCM message in Assets Parachain - Statemine::execute_with(|| { - assert!(::Assets::asset_exists(ASSET_ID)); + AssetHubKusama::execute_with(|| { + assert!(::Assets::asset_exists(ASSET_ID)); }); } diff --git a/parachains/integration-tests/emulated/assets/statemine/Cargo.toml b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml similarity index 90% rename from parachains/integration-tests/emulated/assets/statemine/Cargo.toml rename to parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml index 42ed5ac0605..b518257b1a5 100644 --- a/parachains/integration-tests/emulated/assets/statemine/Cargo.toml +++ b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "statemine-it" +name = "asset-hub-polkadot-integration-tests" version = "1.0.0" authors = ["Parity Technologies "] edition = "2021" -description = "Statemine parachain runtime integration tests with xcm-emulator" +description = "Asset Hub Polkadot runtime integration tests with xcm-emulator" [dependencies] codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false } @@ -29,7 +29,7 @@ pallet-xcm = { default-features = false, git = "https://github.com/paritytech/po # Cumulus parachains-common = { path = "../../../../common" } penpal-runtime = { path = "../../../../runtimes/testing/penpal" } -statemine-runtime = { path = "../../../../runtimes/assets/statemine" } +asset-hub-polkadot-runtime = { path = "../../../../runtimes/assets/asset-hub-polkadot" } # Local xcm-emulator = { default-features = false, path = "../../../../../xcm/xcm-emulator" } diff --git a/parachains/integration-tests/emulated/assets/statemint/src/lib.rs b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs similarity index 50% rename from parachains/integration-tests/emulated/assets/statemint/src/lib.rs rename to parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs index f7ca680a800..d29f9674dbf 100644 --- a/parachains/integration-tests/emulated/assets/statemint/src/lib.rs +++ b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs @@ -8,13 +8,14 @@ pub use integration_tests_common::{ polkadot::ED as POLKADOT_ED, PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3, }, - AccountId, BHKusama, BHKusamaPallet, BHKusamaReceiver, BHKusamaSender, BHPolkadot, - BHPolkadotPallet, BHPolkadotReceiver, BHPolkadotSender, Collectives, CollectivesPallet, - CollectivesReceiver, CollectivesSender, Kusama, KusamaMockNet, KusamaPallet, KusamaReceiver, - KusamaSender, PenpalKusama, PenpalKusamaReceiver, PenpalKusamaSender, PenpalPolkadot, - PenpalPolkadotReceiver, PenpalPolkadotSender, Polkadot, PolkadotMockNet, PolkadotPallet, - PolkadotReceiver, PolkadotSender, Statemine, StateminePallet, StatemineReceiver, - StatemineSender, Statemint, StatemintPallet, StatemintReceiver, StatemintSender, + AccountId, AssetHubKusama, AssetHubKusamaPallet, AssetHubKusamaReceiver, AssetHubKusamaSender, + AssetHubPolkadot, AssetHubPolkadotPallet, AssetHubPolkadotReceiver, AssetHubPolkadotSender, + BHKusama, BHKusamaPallet, BHKusamaReceiver, BHKusamaSender, BHPolkadot, BHPolkadotPallet, + BHPolkadotReceiver, BHPolkadotSender, Collectives, CollectivesPallet, CollectivesReceiver, + CollectivesSender, Kusama, KusamaMockNet, KusamaPallet, KusamaReceiver, KusamaSender, + PenpalKusama, PenpalKusamaReceiver, PenpalKusamaSender, PenpalPolkadot, PenpalPolkadotReceiver, + PenpalPolkadotSender, Polkadot, PolkadotMockNet, PolkadotPallet, PolkadotReceiver, + PolkadotSender, }; pub use polkadot_core_primitives::InboundDownwardMessage; pub use xcm::{ diff --git a/parachains/integration-tests/emulated/assets/statemint/src/tests/mod.rs b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/mod.rs similarity index 100% rename from parachains/integration-tests/emulated/assets/statemint/src/tests/mod.rs rename to parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/mod.rs diff --git a/parachains/integration-tests/emulated/assets/statemint/src/tests/reserve_transfer.rs b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs similarity index 78% rename from parachains/integration-tests/emulated/assets/statemint/src/tests/reserve_transfer.rs rename to parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs index b69222670b1..6b967ecf769 100644 --- a/parachains/integration-tests/emulated/assets/statemint/src/tests/reserve_transfer.rs +++ b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs @@ -5,13 +5,14 @@ fn reserve_transfer_native_asset_from_relay_to_assets() { // Init tests variables let amount = POLKADOT_ED * 1000; let relay_sender_balance_before = Polkadot::account_data_of(PolkadotSender::get()).free; - let para_receiver_balance_before = Statemint::account_data_of(StatemintReceiver::get()).free; + let para_receiver_balance_before = + AssetHubPolkadot::account_data_of(AssetHubPolkadotReceiver::get()).free; let origin = ::RuntimeOrigin::signed(PolkadotSender::get()); let assets_para_destination: VersionedMultiLocation = - Polkadot::child_location_of(Statemint::para_id()).into(); + Polkadot::child_location_of(AssetHubPolkadot::para_id()).into(); let beneficiary: VersionedMultiLocation = - AccountId32 { network: None, id: StatemintReceiver::get().into() }.into(); + AccountId32 { network: None, id: AssetHubPolkadotReceiver::get().into() }.into(); let native_assets: VersionedMultiAssets = (Here, amount).into(); let fee_asset_item = 0; let weight_limit = WeightLimit::Unlimited; @@ -40,11 +41,11 @@ fn reserve_transfer_native_asset_from_relay_to_assets() { }); // Receive XCM message in Assets Parachain - Statemint::execute_with(|| { - type RuntimeEvent = ::RuntimeEvent; + AssetHubPolkadot::execute_with(|| { + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( - Statemint, + AssetHubPolkadot, vec![ RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { outcome: Outcome::Incomplete(_, Error::UntrustedReserveLocation), @@ -56,7 +57,8 @@ fn reserve_transfer_native_asset_from_relay_to_assets() { // Check if balances are updated accordingly in Relay Chain and Assets Parachain let relay_sender_balance_after = Polkadot::account_data_of(PolkadotSender::get()).free; - let para_sender_balance_after = Statemint::account_data_of(StatemintReceiver::get()).free; + let para_sender_balance_after = + AssetHubPolkadot::account_data_of(AssetHubPolkadotReceiver::get()).free; assert_eq!(relay_sender_balance_before - amount, relay_sender_balance_after); assert_eq!(para_sender_balance_after, para_receiver_balance_before); diff --git a/parachains/integration-tests/emulated/assets/statemint/src/tests/teleport.rs b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs similarity index 73% rename from parachains/integration-tests/emulated/assets/statemint/src/tests/teleport.rs rename to parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs index 19aa5fe1f9e..eebdddfe506 100644 --- a/parachains/integration-tests/emulated/assets/statemint/src/tests/teleport.rs +++ b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs @@ -5,13 +5,14 @@ fn teleport_native_assets_from_relay_to_assets_para() { // Init tests variables let amount = POLKADOT_ED * 1000; let relay_sender_balance_before = Polkadot::account_data_of(PolkadotSender::get()).free; - let para_receiver_balance_before = Statemint::account_data_of(StatemintReceiver::get()).free; + let para_receiver_balance_before = + AssetHubPolkadot::account_data_of(AssetHubPolkadotReceiver::get()).free; let origin = ::RuntimeOrigin::signed(PolkadotSender::get()); let assets_para_destination: VersionedMultiLocation = - Polkadot::child_location_of(Statemint::para_id()).into(); + Polkadot::child_location_of(AssetHubPolkadot::para_id()).into(); let beneficiary: VersionedMultiLocation = - AccountId32 { network: None, id: StatemintReceiver::get().into() }.into(); + AccountId32 { network: None, id: AssetHubPolkadotReceiver::get().into() }.into(); let native_assets: VersionedMultiAssets = (Here, amount).into(); let fee_asset_item = 0; let weight_limit = WeightLimit::Unlimited; @@ -38,14 +39,14 @@ fn teleport_native_assets_from_relay_to_assets_para() { }); // Receive XCM message in Assets Parachain - Statemint::execute_with(|| { - type RuntimeEvent = ::RuntimeEvent; + AssetHubPolkadot::execute_with(|| { + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( - Statemint, + AssetHubPolkadot, vec![ RuntimeEvent::Balances(pallet_balances::Event::Deposit { who, .. }) => { - who: *who == StatemintReceiver::get().into(), + who: *who == AssetHubPolkadotReceiver::get().into(), }, ] ); @@ -53,7 +54,8 @@ fn teleport_native_assets_from_relay_to_assets_para() { // Check if balances are updated accordingly in Relay Chain and Assets Parachain let relay_sender_balance_after = Polkadot::account_data_of(PolkadotSender::get()).free; - let para_sender_balance_after = Statemint::account_data_of(StatemintReceiver::get()).free; + let para_sender_balance_after = + AssetHubPolkadot::account_data_of(AssetHubPolkadotReceiver::get()).free; assert_eq!(relay_sender_balance_before - amount, relay_sender_balance_after); assert!(para_sender_balance_after > para_receiver_balance_before); diff --git a/parachains/integration-tests/emulated/assets/statemint/src/tests/transact.rs b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/transact.rs similarity index 77% rename from parachains/integration-tests/emulated/assets/statemint/src/tests/transact.rs rename to parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/transact.rs index 9220d914e47..759e063dd93 100644 --- a/parachains/integration-tests/emulated/assets/statemint/src/tests/transact.rs +++ b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/transact.rs @@ -6,14 +6,14 @@ fn transact_sudo_from_relay_to_assets_para() { // Call to be executed in Assets Parachain const ASSET_ID: u32 = 1; - let call = ::RuntimeCall::Assets(pallet_assets::Call::< - ::Runtime, + let call = ::RuntimeCall::Assets(pallet_assets::Call::< + ::Runtime, Instance1, >::force_create { id: ASSET_ID.into(), is_sufficient: true, min_balance: 1000, - owner: StatemintSender::get().into(), + owner: AssetHubPolkadotSender::get().into(), }) .encode() .into(); @@ -21,7 +21,7 @@ fn transact_sudo_from_relay_to_assets_para() { // XcmPallet send arguments let sudo_origin = ::RuntimeOrigin::root(); let assets_para_destination: VersionedMultiLocation = - Polkadot::child_location_of(Statemint::para_id()).into(); + Polkadot::child_location_of(AssetHubPolkadot::para_id()).into(); let weight_limit = WeightLimit::Unlimited; let require_weight_at_most = Weight::from_parts(1000000000, 200000); @@ -52,7 +52,7 @@ fn transact_sudo_from_relay_to_assets_para() { }); // Receive XCM message in Assets Parachain - Statemint::execute_with(|| { - assert!(::Assets::asset_exists(ASSET_ID)); + AssetHubPolkadot::execute_with(|| { + assert!(::Assets::asset_exists(ASSET_ID)); }); } diff --git a/parachains/integration-tests/emulated/common/Cargo.toml b/parachains/integration-tests/emulated/common/Cargo.toml index a13ceac2cff..a05dd229798 100644 --- a/parachains/integration-tests/emulated/common/Cargo.toml +++ b/parachains/integration-tests/emulated/common/Cargo.toml @@ -41,8 +41,8 @@ parachains-common = { path = "../../../common" } parachain-info = { path = "../../../pallets/parachain-info" } cumulus-primitives-core = { path = "../../../../primitives/core" } penpal-runtime = { path = "../../../runtimes/testing/penpal" } -statemint-runtime = { path = "../../../runtimes/assets/statemint" } -statemine-runtime = { path = "../../../runtimes/assets/statemine" } +asset-hub-polkadot-runtime = { path = "../../../runtimes/assets/asset-hub-polkadot" } +asset-hub-kusama-runtime = { path = "../../../runtimes/assets/asset-hub-kusama" } collectives-polkadot-runtime = { path = "../../../runtimes/collectives/collectives-polkadot" } bridge-hub-kusama-runtime = { path = "../../../runtimes/bridge-hubs/bridge-hub-kusama" } bridge-hub-polkadot-runtime = { path = "../../../runtimes/bridge-hubs/bridge-hub-polkadot" } diff --git a/parachains/integration-tests/emulated/common/src/constants.rs b/parachains/integration-tests/emulated/common/src/constants.rs index 694137fe094..a4b3942c526 100644 --- a/parachains/integration-tests/emulated/common/src/constants.rs +++ b/parachains/integration-tests/emulated/common/src/constants.rs @@ -1,6 +1,6 @@ use grandpa::AuthorityId as GrandpaId; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; -pub use parachains_common::{AccountId, AuraId, Balance, BlockNumber, StatemintAuraId}; +pub use parachains_common::{AccountId, AssetHubPolkadotAuraId, AuraId, Balance, BlockNumber}; use polkadot_primitives::{AssignmentId, ValidatorId}; pub use polkadot_runtime_parachains::configuration::HostConfiguration; use polkadot_service::chain_spec::get_authority_keys_from_seed_no_beefy; @@ -71,15 +71,15 @@ pub mod accounts { pub mod collators { use super::*; - pub fn invulnerables_statemint() -> Vec<(AccountId, StatemintAuraId)> { + pub fn invulnerables_asset_hub_polkadot() -> Vec<(AccountId, AssetHubPolkadotAuraId)> { vec![ ( get_account_id_from_seed::("Alice"), - get_from_seed::("Alice"), + get_from_seed::("Alice"), ), ( get_account_id_from_seed::("Bob"), - get_from_seed::("Bob"), + get_from_seed::("Bob"), ), ] } @@ -305,29 +305,31 @@ pub mod kusama { } } -// Statemint -pub mod statemint { +// Asset Hub Polkadot +pub mod asset_hub_polkadot { use super::*; pub const PARA_ID: u32 = 1000; - pub const ED: Balance = statemint_runtime::constants::currency::EXISTENTIAL_DEPOSIT; + pub const ED: Balance = asset_hub_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT; pub fn genesis() -> Storage { - let genesis_config = statemint_runtime::GenesisConfig { - system: statemint_runtime::SystemConfig { - code: statemint_runtime::WASM_BINARY + let genesis_config = asset_hub_polkadot_runtime::GenesisConfig { + system: asset_hub_polkadot_runtime::SystemConfig { + code: asset_hub_polkadot_runtime::WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), }, - balances: statemint_runtime::BalancesConfig { + balances: asset_hub_polkadot_runtime::BalancesConfig { balances: accounts::init_balances() .iter() .cloned() .map(|k| (k, ED * 4096)) .collect(), }, - parachain_info: statemint_runtime::ParachainInfoConfig { parachain_id: PARA_ID.into() }, - collator_selection: statemint_runtime::CollatorSelectionConfig { - invulnerables: collators::invulnerables_statemint() + parachain_info: asset_hub_polkadot_runtime::ParachainInfoConfig { + parachain_id: PARA_ID.into(), + }, + collator_selection: asset_hub_polkadot_runtime::CollatorSelectionConfig { + invulnerables: collators::invulnerables_asset_hub_polkadot() .iter() .cloned() .map(|(acc, _)| acc) @@ -335,14 +337,14 @@ pub mod statemint { candidacy_bond: ED * 16, ..Default::default() }, - session: statemint_runtime::SessionConfig { - keys: collators::invulnerables_statemint() + session: asset_hub_polkadot_runtime::SessionConfig { + keys: collators::invulnerables_asset_hub_polkadot() .into_iter() .map(|(acc, aura)| { ( - acc.clone(), // account id - acc, // validator id - statemint_runtime::SessionKeys { aura }, // session keys + acc.clone(), // account id + acc, // validator id + asset_hub_polkadot_runtime::SessionKeys { aura }, // session keys ) }) .collect(), @@ -350,7 +352,7 @@ pub mod statemint { aura: Default::default(), aura_ext: Default::default(), parachain_system: Default::default(), - polkadot_xcm: statemint_runtime::PolkadotXcmConfig { + polkadot_xcm: asset_hub_polkadot_runtime::PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), }, }; @@ -359,28 +361,30 @@ pub mod statemint { } } -// Statemint -pub mod statemine { +// Asset Hub Kusama +pub mod asset_hub_kusama { use super::*; pub const PARA_ID: u32 = 1000; - pub const ED: Balance = statemine_runtime::constants::currency::EXISTENTIAL_DEPOSIT; + pub const ED: Balance = asset_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT; pub fn genesis() -> Storage { - let genesis_config = statemine_runtime::GenesisConfig { - system: statemine_runtime::SystemConfig { - code: statemine_runtime::WASM_BINARY + let genesis_config = asset_hub_kusama_runtime::GenesisConfig { + system: asset_hub_kusama_runtime::SystemConfig { + code: asset_hub_kusama_runtime::WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), }, - balances: statemine_runtime::BalancesConfig { + balances: asset_hub_kusama_runtime::BalancesConfig { balances: accounts::init_balances() .iter() .cloned() .map(|k| (k, ED * 4096)) .collect(), }, - parachain_info: statemine_runtime::ParachainInfoConfig { parachain_id: PARA_ID.into() }, - collator_selection: statemine_runtime::CollatorSelectionConfig { + parachain_info: asset_hub_kusama_runtime::ParachainInfoConfig { + parachain_id: PARA_ID.into(), + }, + collator_selection: asset_hub_kusama_runtime::CollatorSelectionConfig { invulnerables: collators::invulnerables() .iter() .cloned() @@ -389,14 +393,14 @@ pub mod statemine { candidacy_bond: ED * 16, ..Default::default() }, - session: statemine_runtime::SessionConfig { + session: asset_hub_kusama_runtime::SessionConfig { keys: collators::invulnerables() .into_iter() .map(|(acc, aura)| { ( - acc.clone(), // account id - acc, // validator id - statemine_runtime::SessionKeys { aura }, // session keys + acc.clone(), // account id + acc, // validator id + asset_hub_kusama_runtime::SessionKeys { aura }, // session keys ) }) .collect(), @@ -404,7 +408,7 @@ pub mod statemine { aura: Default::default(), aura_ext: Default::default(), parachain_system: Default::default(), - polkadot_xcm: statemine_runtime::PolkadotXcmConfig { + polkadot_xcm: asset_hub_kusama_runtime::PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), }, }; diff --git a/parachains/integration-tests/emulated/common/src/lib.rs b/parachains/integration-tests/emulated/common/src/lib.rs index 49e919b5de9..82ab42359e0 100644 --- a/parachains/integration-tests/emulated/common/src/lib.rs +++ b/parachains/integration-tests/emulated/common/src/lib.rs @@ -2,11 +2,11 @@ pub mod constants; pub use constants::{ accounts::{ALICE, BOB}, - bridge_hub_kusama, bridge_hub_polkadot, collectives, kusama, penpal, polkadot, statemine, - statemint, + asset_hub_kusama, asset_hub_polkadot, bridge_hub_kusama, bridge_hub_polkadot, collectives, + kusama, penpal, polkadot, }; use frame_support::{parameter_types, sp_io, sp_tracing}; -pub use parachains_common::{AccountId, AuraId, Balance, BlockNumber, StatemintAuraId}; +pub use parachains_common::{AccountId, AssetHubPolkadotAuraId, AuraId, Balance, BlockNumber}; pub use sp_core::{sr25519, storage::Storage, Get}; use xcm::prelude::*; use xcm_emulator::{ @@ -56,25 +56,25 @@ decl_test_relay_chains! { decl_test_parachains! { // Polkadot - pub struct Statemint { - genesis = statemint::genesis(), + pub struct AssetHubPolkadot { + genesis = asset_hub_polkadot::genesis(), on_init = (), runtime = { - Runtime: statemint_runtime::Runtime, - RuntimeOrigin: statemint_runtime::RuntimeOrigin, - RuntimeCall: statemint_runtime::RuntimeCall, - RuntimeEvent: statemint_runtime::RuntimeEvent, - XcmpMessageHandler: statemint_runtime::XcmpQueue, - DmpMessageHandler: statemint_runtime::DmpQueue, - LocationToAccountId: statemint_runtime::xcm_config::LocationToAccountId, - System: statemint_runtime::System, - Balances: statemint_runtime::Balances, - ParachainSystem: statemint_runtime::ParachainSystem, - ParachainInfo: statemint_runtime::ParachainInfo, + Runtime: asset_hub_polkadot_runtime::Runtime, + RuntimeOrigin: asset_hub_polkadot_runtime::RuntimeOrigin, + RuntimeCall: asset_hub_polkadot_runtime::RuntimeCall, + RuntimeEvent: asset_hub_polkadot_runtime::RuntimeEvent, + XcmpMessageHandler: asset_hub_polkadot_runtime::XcmpQueue, + DmpMessageHandler: asset_hub_polkadot_runtime::DmpQueue, + LocationToAccountId: asset_hub_polkadot_runtime::xcm_config::LocationToAccountId, + System: asset_hub_polkadot_runtime::System, + Balances: asset_hub_polkadot_runtime::Balances, + ParachainSystem: asset_hub_polkadot_runtime::ParachainSystem, + ParachainInfo: asset_hub_polkadot_runtime::ParachainInfo, }, pallets_extra = { - PolkadotXcm: statemint_runtime::PolkadotXcm, - Assets: statemint_runtime::Assets, + PolkadotXcm: asset_hub_polkadot_runtime::PolkadotXcm, + Assets: asset_hub_polkadot_runtime::Assets, } }, pub struct PenpalPolkadot { @@ -99,26 +99,26 @@ decl_test_parachains! { } }, // Kusama - pub struct Statemine { - genesis = statemine::genesis(), + pub struct AssetHubKusama { + genesis = asset_hub_kusama::genesis(), on_init = (), runtime = { - Runtime: statemine_runtime::Runtime, - RuntimeOrigin: statemine_runtime::RuntimeOrigin, - RuntimeCall: statemine_runtime::RuntimeCall, - RuntimeEvent: statemine_runtime::RuntimeEvent, - XcmpMessageHandler: statemine_runtime::XcmpQueue, - DmpMessageHandler: statemine_runtime::DmpQueue, - LocationToAccountId: statemine_runtime::xcm_config::LocationToAccountId, - System: statemine_runtime::System, - Balances: statemine_runtime::Balances, - ParachainSystem: statemine_runtime::ParachainSystem, - ParachainInfo: statemine_runtime::ParachainInfo, + Runtime: asset_hub_kusama_runtime::Runtime, + RuntimeOrigin: asset_hub_kusama_runtime::RuntimeOrigin, + RuntimeCall: asset_hub_kusama_runtime::RuntimeCall, + RuntimeEvent: asset_hub_kusama_runtime::RuntimeEvent, + XcmpMessageHandler: asset_hub_kusama_runtime::XcmpQueue, + DmpMessageHandler: asset_hub_kusama_runtime::DmpQueue, + LocationToAccountId: asset_hub_kusama_runtime::xcm_config::LocationToAccountId, + System: asset_hub_kusama_runtime::System, + Balances: asset_hub_kusama_runtime::Balances, + ParachainSystem: asset_hub_kusama_runtime::ParachainSystem, + ParachainInfo: asset_hub_kusama_runtime::ParachainInfo, }, pallets_extra = { - PolkadotXcm: statemine_runtime::PolkadotXcm, - Assets: statemine_runtime::Assets, - ForeignAssets: statemine_runtime::Assets, + PolkadotXcm: asset_hub_kusama_runtime::PolkadotXcm, + Assets: asset_hub_kusama_runtime::Assets, + ForeignAssets: asset_hub_kusama_runtime::Assets, } }, pub struct PenpalKusama { @@ -208,7 +208,7 @@ decl_test_networks! { pub struct PolkadotMockNet { relay_chain = Polkadot, parachains = vec![ - Statemint, + AssetHubPolkadot, PenpalPolkadot, Collectives, BHPolkadot, @@ -217,7 +217,7 @@ decl_test_networks! { pub struct KusamaMockNet { relay_chain = Kusama, parachains = vec![ - Statemine, + AssetHubKusama, PenpalKusama, BHKusama, ], @@ -231,12 +231,12 @@ parameter_types! { // Kusama pub KusamaSender: AccountId = Kusama::account_id_of(ALICE); pub KusamaReceiver: AccountId = Kusama::account_id_of(BOB); - // Statemint - pub StatemintSender: AccountId = Statemint::account_id_of(ALICE); - pub StatemintReceiver: AccountId = Statemint::account_id_of(BOB); - // Statemine - pub StatemineSender: AccountId = Statemine::account_id_of(ALICE); - pub StatemineReceiver: AccountId = Statemine::account_id_of(BOB); + // Asset Hub Polkadot + pub AssetHubPolkadotSender: AccountId = AssetHubPolkadot::account_id_of(ALICE); + pub AssetHubPolkadotReceiver: AccountId = AssetHubPolkadot::account_id_of(BOB); + // Asset Hub Kusama + pub AssetHubKusamaSender: AccountId = AssetHubKusama::account_id_of(ALICE); + pub AssetHubKusamaReceiver: AccountId = AssetHubKusama::account_id_of(BOB); // Penpal Polkadot pub PenpalPolkadotSender: AccountId = PenpalPolkadot::account_id_of(ALICE); pub PenpalPolkadotReceiver: AccountId = PenpalPolkadot::account_id_of(BOB); diff --git a/parachains/runtimes/assets/README.md b/parachains/runtimes/assets/README.md index 7f995d043c4..78145395cbf 100644 --- a/parachains/runtimes/assets/README.md +++ b/parachains/runtimes/assets/README.md @@ -1,9 +1,9 @@ # Assets Parachain -Implementation of _Statemint_, a blockchain to support generic assets in the Polkadot and Kusama -networks. +Implementation of Asset Hub, a blockchain to support generic assets in the Polkadot and Kusama +networks. Asset Hub was formerly known as "Statemint". -Statemint allows users to: +Asset Hub allows users to: - Deploy promise-backed assets, both fungible and non-fungible, with a DOT/KSM deposit. - Set admin roles to manage assets and asset classes. @@ -13,11 +13,11 @@ Statemint allows users to: - Transfer (and approve transfer) assets. - Interact with the chain via its transactional API or XCM. -Statemint must stay fully aligned with the Relay Chain it is connected to. As such, it will accept +Asset Hub must stay fully aligned with the Relay Chain it is connected to. As such, it will accept the Relay Chain's governance origins as its own. See -[the article on Statemint as common good parachain](https://www.parity.io/blog/statemint-generic-assets-chain-proposing-a-common-good-parachain-to-polkadot-governance/) +[the article on Asset Hub as common good parachain](https://www.parity.io/blog/statemint-generic-assets-chain-proposing-a-common-good-parachain-to-polkadot-governance/) for a higher level description. Wallets, custodians, etc. should see diff --git a/parachains/runtimes/assets/statemine/Cargo.toml b/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml similarity index 98% rename from parachains/runtimes/assets/statemine/Cargo.toml rename to parachains/runtimes/assets/asset-hub-kusama/Cargo.toml index 968e2339a36..b82cb096bb7 100644 --- a/parachains/runtimes/assets/statemine/Cargo.toml +++ b/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "statemine-runtime" -version = "2.0.0" +name = "asset-hub-kusama-runtime" +version = "0.9.420" authors = ["Parity Technologies "] edition = "2021" -description = "Kusama variant of Statemint parachain runtime" +description = "Kusama variant of Asset Hub parachain runtime" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } diff --git a/parachains/runtimes/assets/statemine/build.rs b/parachains/runtimes/assets/asset-hub-kusama/build.rs similarity index 100% rename from parachains/runtimes/assets/statemine/build.rs rename to parachains/runtimes/assets/asset-hub-kusama/build.rs diff --git a/parachains/runtimes/assets/statemine/src/constants.rs b/parachains/runtimes/assets/asset-hub-kusama/src/constants.rs similarity index 98% rename from parachains/runtimes/assets/statemine/src/constants.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/constants.rs index 95e8c166a96..7822698be6c 100644 --- a/parachains/runtimes/assets/statemine/src/constants.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/constants.rs @@ -73,7 +73,7 @@ pub mod fee { type Balance = Balance; fn polynomial() -> WeightToFeeCoefficients { // in Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT: - // in Statemine, we map to 1/10 of that, or 1/100 CENT + // in Asset Hub, we map to 1/10 of that, or 1/100 CENT let p = super::currency::CENTS; let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time()); diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs similarity index 98% rename from parachains/runtimes/assets/statemine/src/lib.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/lib.rs index e1f9fbe3dc2..f6e2a32eda8 100644 --- a/parachains/runtimes/assets/statemine/src/lib.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -//! # Statemine Runtime +//! # Asset Hub Kusama Runtime //! -//! Statemine is the canary network for its Polkadot cousin, Statemint. +//! Asset Hub Kusama, formerly known as "Statemine", is the canary network for its Polkadot cousin. #![cfg_attr(not(feature = "std"), no_std)] #![recursion_limit = "256"] @@ -94,6 +94,9 @@ impl_opaque_keys! { #[cfg(feature = "state-trie-version-1")] #[sp_version::runtime_version] pub const VERSION: RuntimeVersion = RuntimeVersion { + // Note: "statemine" is the legacy name for this chain. It has been renamed to + // "asset-hub-kusama". Many wallets/tools depend on the `spec_name`, so it remains "statemine" + // for the time being. Wallets/tools should update to treat "asset-hub-kusama" equally. spec_name: create_runtime_str!("statemine"), impl_name: create_runtime_str!("statemine"), authoring_version: 1, @@ -107,6 +110,9 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { #[cfg(not(feature = "state-trie-version-1"))] #[sp_version::runtime_version] pub const VERSION: RuntimeVersion = RuntimeVersion { + // Note: "statemine" is the legacy name for this change. It has been renamed to + // "asset-hub-kusama". Many wallets/tools depend on the `spec_name`, so it remains "statemine" + // for the time being. Wallets/tools should update to treat "asset-hub-kusama" equally. spec_name: create_runtime_str!("statemine"), impl_name: create_runtime_str!("statemine"), authoring_version: 1, diff --git a/parachains/runtimes/assets/statemine/src/weights/block_weights.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/block_weights.rs similarity index 100% rename from parachains/runtimes/assets/statemine/src/weights/block_weights.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/block_weights.rs diff --git a/parachains/runtimes/assets/statemine/src/weights/cumulus_pallet_xcmp_queue.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs similarity index 94% rename from parachains/runtimes/assets/statemine/src/weights/cumulus_pallet_xcmp_queue.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs index b19f8098775..89bf59acdb0 100644 --- a/parachains/runtimes/assets/statemine/src/weights/cumulus_pallet_xcmp_queue.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=cumulus_pallet_xcmp_queue @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/cumulus_pallet_xcmp_queue.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/extrinsic_weights.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/extrinsic_weights.rs similarity index 100% rename from parachains/runtimes/assets/statemine/src/weights/extrinsic_weights.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/extrinsic_weights.rs diff --git a/parachains/runtimes/assets/statemine/src/weights/frame_system.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs similarity index 97% rename from parachains/runtimes/assets/statemine/src/weights/frame_system.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs index 89098f48120..09c24b48259 100644 --- a/parachains/runtimes/assets/statemine/src/weights/frame_system.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=frame_system @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/frame_system.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/mod.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/mod.rs similarity index 100% rename from parachains/runtimes/assets/statemine/src/weights/mod.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/mod.rs diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_assets.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets.rs similarity index 99% rename from parachains/runtimes/assets/statemine/src/weights/pallet_assets.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets.rs index 29a01e5bb9a..410043bc4fe 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_assets.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets.rs @@ -20,13 +20,13 @@ //! DATE: 2023-03-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_assets @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_assets.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_balances.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs similarity index 97% rename from parachains/runtimes/assets/statemine/src/weights/pallet_balances.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs index 3842783d98c..563df00f845 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_balances.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_balances @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_balances.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_collator_selection.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs similarity index 98% rename from parachains/runtimes/assets/statemine/src/weights/pallet_collator_selection.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs index 7c518a45ddf..ece29bc35c4 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_collator_selection.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_collator_selection @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_collator_selection.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_multisig.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs similarity index 97% rename from parachains/runtimes/assets/statemine/src/weights/pallet_multisig.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs index 2753cea0a8f..04e704cc402 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_multisig.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_multisig @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_multisig.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_nfts.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs similarity index 99% rename from parachains/runtimes/assets/statemint/src/weights/pallet_nfts.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs index 1f1f718c9c5..689b1b750b9 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_nfts.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_nfts @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_nfts.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs similarity index 98% rename from parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs index 042af1203f5..27680ed3ea0 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_proxy @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_session.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs similarity index 94% rename from parachains/runtimes/assets/statemine/src/weights/pallet_session.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs index f0f02ace1eb..359ea9da901 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_session.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_session @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_session.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_timestamp.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs similarity index 94% rename from parachains/runtimes/assets/statemine/src/weights/pallet_timestamp.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs index 8ddde440fdf..ef8da150383 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_timestamp.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_timestamp @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_timestamp.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs similarity index 99% rename from parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs index 80c1adfe5e6..3c9372e2e5f 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_uniques @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_utility.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs similarity index 95% rename from parachains/runtimes/assets/statemine/src/weights/pallet_utility.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs index be360bb42b8..225e5cf0872 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_utility.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_utility @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_utility.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_xcm.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs similarity index 98% rename from parachains/runtimes/assets/statemine/src/weights/pallet_xcm.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs index 36672a02cd7..4f4bb37d748 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_xcm.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_xcm.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/paritydb_weights.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/paritydb_weights.rs similarity index 100% rename from parachains/runtimes/assets/statemine/src/weights/paritydb_weights.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/paritydb_weights.rs diff --git a/parachains/runtimes/assets/statemine/src/weights/rocksdb_weights.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/rocksdb_weights.rs similarity index 100% rename from parachains/runtimes/assets/statemine/src/weights/rocksdb_weights.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/rocksdb_weights.rs diff --git a/parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs similarity index 98% rename from parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs index 8247f75d5dd..4bdda361a2b 100644 --- a/parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs @@ -56,8 +56,8 @@ impl WeighMultiAssets for MultiAssets { } } -pub struct WestmintXcmWeight(core::marker::PhantomData); -impl XcmWeightInfo for WestmintXcmWeight { +pub struct AssetHubKusamaXcmWeight(core::marker::PhantomData); +impl XcmWeightInfo for AssetHubKusamaXcmWeight { fn withdraw_asset(assets: &MultiAssets) -> Weight { assets.weigh_multi_assets(XcmFungibleWeight::::withdraw_asset()) } diff --git a/parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs similarity index 97% rename from parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs index 8f802fb4211..d5dae072099 100644 --- a/parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs @@ -20,14 +20,14 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet // --template=./templates/xcm-bench-template.hbs -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm_benchmarks::fungible @@ -36,7 +36,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs similarity index 98% rename from parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_generic.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs index 9bd3f11c969..d2b1221476a 100644 --- a/parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_generic.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs @@ -20,14 +20,14 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet // --template=./templates/xcm-bench-template.hbs -// --chain=statemine-dev +// --chain=asset-hub-kusama-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm_benchmarks::generic @@ -36,7 +36,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_generic.rs +// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/xcm_config.rs b/parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs similarity index 98% rename from parachains/runtimes/assets/statemine/src/xcm_config.rs rename to parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs index 3ce1058ab35..ea4fcbfb012 100644 --- a/parachains/runtimes/assets/statemine/src/xcm_config.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs @@ -376,8 +376,8 @@ impl xcm_executor::Config for XcmConfig { type XcmSender = XcmRouter; type AssetTransactor = AssetTransactors; type OriginConverter = XcmOriginToTransactDispatchOrigin; - // Statemine does not recognize a reserve location for any asset. This does not prevent - // Statemine acting _as_ a reserve location for KSM and assets created under `pallet-assets`. + // Asset Hub Kusama does not recognize a reserve location for any asset. This does not prevent + // Asset Hub acting _as_ a reserve location for KSM and assets created under `pallet-assets`. // For KSM, users must use teleport where allowed (e.g. with the Relay Chain). type IsReserve = (); // We allow: @@ -390,7 +390,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalLocation = UniversalLocation; type Barrier = Barrier; type Weigher = WeightInfoBounds< - crate::weights::xcm::StatemineXcmWeight, + crate::weights::xcm::AssetHubKusamaXcmWeight, RuntimeCall, MaxInstructions, >; @@ -454,7 +454,7 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; type Weigher = WeightInfoBounds< - crate::weights::xcm::StatemineXcmWeight, + crate::weights::xcm::AssetHubKusamaXcmWeight, RuntimeCall, MaxInstructions, >; diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs similarity index 99% rename from parachains/runtimes/assets/statemine/tests/tests.rs rename to parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs index c25d09837b6..22d277c5d8c 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs @@ -1,3 +1,13 @@ +use asset_hub_kusama_runtime::xcm_config::{ + AssetFeeAsExistentialDepositMultiplierFeeCharger, KsmLocation, TrustBackedAssetsPalletLocation, +}; +pub use asset_hub_kusama_runtime::{ + constants::fee::WeightToFee, + xcm_config::{CheckingAccount, ForeignCreatorsSovereignAccountOf, XcmConfig}, + AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, + MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime, RuntimeCall, + RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance, +}; use asset_test_utils::{CollatorSessionKeys, ExtBuilder, RuntimeHelper}; use codec::{Decode, Encode}; use cumulus_primitives_utility::ChargeWeightInFungibles; @@ -7,16 +17,6 @@ use frame_support::{ weights::{Weight, WeightToFee as WeightToFeeT}, }; use parachains_common::{AccountId, AssetIdForTrustBackedAssets, AuraId, Balance}; -use statemine_runtime::xcm_config::{ - AssetFeeAsExistentialDepositMultiplierFeeCharger, KsmLocation, TrustBackedAssetsPalletLocation, -}; -pub use statemine_runtime::{ - constants::fee::WeightToFee, - xcm_config::{CheckingAccount, ForeignCreatorsSovereignAccountOf, XcmConfig}, - AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, - MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime, RuntimeCall, - RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance, -}; use xcm::latest::prelude::*; use xcm_executor::traits::{Convert, Identity, JustTry, WeightTrader}; diff --git a/parachains/runtimes/assets/statemint/Cargo.toml b/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml similarity index 98% rename from parachains/runtimes/assets/statemint/Cargo.toml rename to parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml index 468f1e7e899..149e71df130 100644 --- a/parachains/runtimes/assets/statemint/Cargo.toml +++ b/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "statemint-runtime" -version = "1.0.0" +name = "asset-hub-polkadot-runtime" +version = "0.9.420" authors = ["Parity Technologies "] edition = "2021" -description = "Statemint parachain runtime" +description = "Asset Hub Polkadot parachain runtime" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } diff --git a/parachains/runtimes/assets/statemint/build.rs b/parachains/runtimes/assets/asset-hub-polkadot/build.rs similarity index 100% rename from parachains/runtimes/assets/statemint/build.rs rename to parachains/runtimes/assets/asset-hub-polkadot/build.rs diff --git a/parachains/runtimes/assets/statemint/src/constants.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/constants.rs similarity index 98% rename from parachains/runtimes/assets/statemint/src/constants.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/constants.rs index 35e7f03695b..dea920979f6 100644 --- a/parachains/runtimes/assets/statemint/src/constants.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/constants.rs @@ -74,7 +74,7 @@ pub mod fee { type Balance = Balance; fn polynomial() -> WeightToFeeCoefficients { // in Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT: - // in Statemint, we map to 1/10 of that, or 1/100 CENT + // in Asset Hub, we map to 1/10 of that, or 1/100 CENT let p = super::currency::CENTS; let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time()); diff --git a/parachains/runtimes/assets/statemint/src/lib.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs similarity index 97% rename from parachains/runtimes/assets/statemint/src/lib.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs index 518fb3c4cab..41e443941ed 100644 --- a/parachains/runtimes/assets/statemint/src/lib.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs @@ -13,10 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -//! # Statemint Runtime +//! # Asset Hub Polkadot Runtime //! -//! Statemint is a parachain that provides an interface to create, manage, and use assets. Assets -//! may be fungible or non-fungible. +//! Asset Hub Polkadot is a parachain that provides an interface to create, manage, and use assets. +//! Assets may be fungible or non-fungible. +//! +//! ## Renaming +//! +//! This chain was originally known as "Statemint". You may see references to Statemint, Statemine, +//! and Westmint throughout the codebase. These are synonymous with "Asset Hub Polkadot, Kusama, and +//! Westend", respectively. //! //! ## Assets //! @@ -27,22 +33,22 @@ //! //! ### Native Balances //! -//! Statemint uses its parent DOT token as its native asset. +//! Asset Hub Polkadot uses its parent DOT token as its native asset. //! //! ### Governance //! -//! As a common good parachain, Statemint defers its governance (namely, its `Root` origin), to its +//! As a system parachain, Asset Hub defers its governance (namely, its `Root` origin), to its //! Relay Chain parent, Polkadot. //! //! ### Collator Selection //! -//! Statemint uses `pallet-collator-selection`, a simple first-come-first-served registration +//! Asset Hub uses `pallet-collator-selection`, a simple first-come-first-served registration //! system where collators can reserve a small bond to join the block producer set. There is no //! slashing. //! //! ### XCM //! -//! Because Statemint is fully under the control of the Relay Chain, it is meant to be a +//! Because Asset Hub is fully under the control of the Relay Chain, it is meant to be a //! `TrustedTeleporter`. It can also serve as a reserve location to other parachains for DOT as well //! as other local assets. @@ -93,8 +99,8 @@ use pallet_nfts::PalletFeatures; pub use parachains_common as common; use parachains_common::{ impls::{AssetsToBlockAuthor, DealWithFees}, - opaque, AccountId, AssetIdForTrustBackedAssets, Balance, BlockNumber, Hash, Header, Index, - Signature, StatemintAuraId as AuraId, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, + opaque, AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance, + BlockNumber, Hash, Header, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION, }; use xcm_config::{ @@ -122,6 +128,9 @@ impl_opaque_keys! { #[sp_version::runtime_version] pub const VERSION: RuntimeVersion = RuntimeVersion { + // Note: "statemint" is the legacy name for this chain. It has been renamed to + // "asset-hub-polkadot". Many wallets/tools depend on the `spec_name`, so it remains "statemint" + // for the time being. Wallets/tools should update to treat "asset-hub-polkadot" equally. spec_name: create_runtime_str!("statemint"), impl_name: create_runtime_str!("statemint"), authoring_version: 1, diff --git a/parachains/runtimes/assets/statemint/src/weights/block_weights.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/block_weights.rs similarity index 100% rename from parachains/runtimes/assets/statemint/src/weights/block_weights.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/block_weights.rs diff --git a/parachains/runtimes/assets/statemint/src/weights/cumulus_pallet_xcmp_queue.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs similarity index 93% rename from parachains/runtimes/assets/statemint/src/weights/cumulus_pallet_xcmp_queue.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs index 6b492b2c1e5..53147bb2324 100644 --- a/parachains/runtimes/assets/statemint/src/weights/cumulus_pallet_xcmp_queue.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=cumulus_pallet_xcmp_queue @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/cumulus_pallet_xcmp_queue.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/extrinsic_weights.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/extrinsic_weights.rs similarity index 100% rename from parachains/runtimes/assets/statemint/src/weights/extrinsic_weights.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/extrinsic_weights.rs diff --git a/parachains/runtimes/assets/statemint/src/weights/frame_system.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs similarity index 96% rename from parachains/runtimes/assets/statemint/src/weights/frame_system.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs index 9884d6d9c3d..763a58394ff 100644 --- a/parachains/runtimes/assets/statemint/src/weights/frame_system.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=frame_system @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/frame_system.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/mod.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/mod.rs similarity index 100% rename from parachains/runtimes/assets/statemint/src/weights/mod.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/mod.rs diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_assets.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets.rs similarity index 99% rename from parachains/runtimes/assets/statemint/src/weights/pallet_assets.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets.rs index cf9dae9dee3..20ac7e5e208 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_assets.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_assets @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_assets.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_balances.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs similarity index 97% rename from parachains/runtimes/assets/statemint/src/weights/pallet_balances.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs index 631d8b00c34..a2623edff67 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_balances.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_balances @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_balances.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_collator_selection.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs similarity index 98% rename from parachains/runtimes/assets/statemint/src/weights/pallet_collator_selection.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs index 37c59255469..9ac1b4a4444 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_collator_selection.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_collator_selection @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_collator_selection.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_multisig.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs similarity index 97% rename from parachains/runtimes/assets/statemint/src/weights/pallet_multisig.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs index 3f708111d83..39367ac6b88 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_multisig.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_multisig @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_multisig.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_nfts.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs similarity index 99% rename from parachains/runtimes/assets/statemine/src/weights/pallet_nfts.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs index 3655836b0a0..d2ca392417e 100644 --- a/parachains/runtimes/assets/statemine/src/weights/pallet_nfts.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemine-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_nfts @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_nfts.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs similarity index 98% rename from parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs index d6b2795b062..5ffc4b30df3 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_proxy @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_session.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs similarity index 94% rename from parachains/runtimes/assets/statemint/src/weights/pallet_session.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs index 5a44e8e80bf..9d7ea753c7c 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_session.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_session @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_session.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_timestamp.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs similarity index 93% rename from parachains/runtimes/assets/statemint/src/weights/pallet_timestamp.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs index 361bb6245fc..e6d26cbfaa4 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_timestamp.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_timestamp @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_timestamp.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs similarity index 99% rename from parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs index fe9d2d1399e..583e54840b8 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_uniques @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_utility.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs similarity index 95% rename from parachains/runtimes/assets/statemint/src/weights/pallet_utility.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs index 585bb7d7807..fecc38e475a 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_utility.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_utility @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_utility.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs similarity index 98% rename from parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs index a8e6dfaa951..d31ebcfe719 100644 --- a/parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/paritydb_weights.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/paritydb_weights.rs similarity index 100% rename from parachains/runtimes/assets/statemint/src/weights/paritydb_weights.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/paritydb_weights.rs diff --git a/parachains/runtimes/assets/statemint/src/weights/rocksdb_weights.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/rocksdb_weights.rs similarity index 100% rename from parachains/runtimes/assets/statemint/src/weights/rocksdb_weights.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/rocksdb_weights.rs diff --git a/parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/mod.rs similarity index 98% rename from parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/mod.rs index 23322418d2a..234ab204fbc 100644 --- a/parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/mod.rs @@ -56,8 +56,8 @@ impl WeighMultiAssets for MultiAssets { } } -pub struct StatemineXcmWeight(core::marker::PhantomData); -impl XcmWeightInfo for StatemineXcmWeight { +pub struct AssetHubPolkadotXcmWeight(core::marker::PhantomData); +impl XcmWeightInfo for AssetHubPolkadotXcmWeight { fn withdraw_asset(assets: &MultiAssets) -> Weight { assets.weigh_multi_assets(XcmFungibleWeight::::withdraw_asset()) } diff --git a/parachains/runtimes/assets/statemint/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs similarity index 97% rename from parachains/runtimes/assets/statemint/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs index d80e9ec335c..474a93465a9 100644 --- a/parachains/runtimes/assets/statemint/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs @@ -20,14 +20,14 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet // --template=./templates/xcm-bench-template.hbs -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm_benchmarks::fungible @@ -36,7 +36,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs similarity index 98% rename from parachains/runtimes/assets/statemint/src/weights/xcm/pallet_xcm_benchmarks_generic.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs index f38bec29144..6f65e27184a 100644 --- a/parachains/runtimes/assets/statemint/src/weights/xcm/pallet_xcm_benchmarks_generic.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs @@ -20,14 +20,14 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet // --template=./templates/xcm-bench-template.hbs -// --chain=statemint-dev +// --chain=asset-hub-polkadot-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm_benchmarks::generic @@ -36,7 +36,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/xcm/pallet_xcm_benchmarks_generic.rs +// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/statemint/src/xcm_config.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs similarity index 98% rename from parachains/runtimes/assets/statemint/src/xcm_config.rs rename to parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs index 82414a20a4b..0f12f5a99a2 100644 --- a/parachains/runtimes/assets/statemint/src/xcm_config.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs @@ -378,8 +378,8 @@ impl xcm_executor::Config for XcmConfig { type XcmSender = XcmRouter; type AssetTransactor = AssetTransactors; type OriginConverter = XcmOriginToTransactDispatchOrigin; - // Statemint does not recognize a reserve location for any asset. This does not prevent - // Statemint acting _as_ a reserve location for DOT and assets created under `pallet-assets`. + // Asset Hub Polkadot does not recognize a reserve location for any asset. This does not prevent + // Asset Hub acting _as_ a reserve location for DOT and assets created under `pallet-assets`. // For DOT, users must use teleport where allowed (e.g. with the Relay Chain). type IsReserve = (); // We allow: @@ -392,7 +392,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalLocation = UniversalLocation; type Barrier = Barrier; type Weigher = WeightInfoBounds< - crate::weights::xcm::StatemintXcmWeight, + crate::weights::xcm::AssetHubPolkadotXcmWeight, RuntimeCall, MaxInstructions, >; @@ -456,7 +456,7 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; type Weigher = WeightInfoBounds< - crate::weights::xcm::StatemintXcmWeight, + crate::weights::xcm::AssetHubPolkadotXcmWeight, RuntimeCall, MaxInstructions, >; diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs similarity index 98% rename from parachains/runtimes/assets/statemint/tests/tests.rs rename to parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs index bb4d52a1452..f78f53c5e6b 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs @@ -1,3 +1,12 @@ +use asset_hub_polkadot_runtime::xcm_config::{ + AssetFeeAsExistentialDepositMultiplierFeeCharger, CheckingAccount, DotLocation, + ForeignCreatorsSovereignAccountOf, TrustBackedAssetsPalletLocation, XcmConfig, +}; +pub use asset_hub_polkadot_runtime::{ + constants::fee::WeightToFee, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets, + ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime, + RuntimeCall, RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance, +}; use asset_test_utils::{CollatorSessionKeys, ExtBuilder, RuntimeHelper}; use codec::{Decode, Encode}; use cumulus_primitives_utility::ChargeWeightInFungibles; @@ -7,16 +16,7 @@ use frame_support::{ weights::{Weight, WeightToFee as WeightToFeeT}, }; use parachains_common::{ - AccountId, AssetIdForTrustBackedAssets, Balance, StatemintAuraId as AuraId, -}; -use statemint_runtime::xcm_config::{ - AssetFeeAsExistentialDepositMultiplierFeeCharger, CheckingAccount, DotLocation, - ForeignCreatorsSovereignAccountOf, TrustBackedAssetsPalletLocation, XcmConfig, -}; -pub use statemint_runtime::{ - constants::fee::WeightToFee, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets, - ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime, - RuntimeCall, RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance, + AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance, }; use xcm::latest::prelude::*; use xcm_executor::traits::{Convert, Identity, JustTry, WeightTrader}; @@ -73,7 +73,7 @@ fn test_asset_xcm_trader() { RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 400e9 weight - // Because of the ED being higher in statemine + // Because of the ED being higher in kusama's asset hub // and not to complicate things, we use a little // bit more of weight let bought = Weight::from_parts(400_000_000_000u64, 0); @@ -152,7 +152,7 @@ fn test_asset_xcm_trader_with_refund() { RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 400e9 weight - // Because of the ED being higher in statemine + // Because of the ED being higher in kusama's asset hub // and not to complicate things, we use a little // bit more of weight let bought = Weight::from_parts(400_000_000_000u64, 0); @@ -225,7 +225,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 50e9 weight - // Because of the ED being higher in statemine + // Because of the ED being higher in kusama's asset hub // and not to complicate things, we use a little // bit more of weight let bought = Weight::from_parts(50_000_000_000u64, 0); @@ -351,7 +351,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() { RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 400e9 weight - // Because of the ED being higher in statemine + // Because of the ED being higher in kusama's asset hub // and not to complicate things, we use a little // bit more of weight let bought = Weight::from_parts(400_000_000_000u64, 0); diff --git a/parachains/runtimes/assets/westmint/Cargo.toml b/parachains/runtimes/assets/asset-hub-westend/Cargo.toml similarity index 98% rename from parachains/runtimes/assets/westmint/Cargo.toml rename to parachains/runtimes/assets/asset-hub-westend/Cargo.toml index 80bea70f8dc..61405382404 100644 --- a/parachains/runtimes/assets/westmint/Cargo.toml +++ b/parachains/runtimes/assets/asset-hub-westend/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "westmint-runtime" -version = "1.0.0" +name = "asset-hub-westend-runtime" +version = "0.9.420" authors = ["Parity Technologies "] edition = "2021" -description = "Westend variant of Statemint parachain runtime" +description = "Westend variant of Asset Hub parachain runtime" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } diff --git a/parachains/runtimes/assets/westmint/build.rs b/parachains/runtimes/assets/asset-hub-westend/build.rs similarity index 100% rename from parachains/runtimes/assets/westmint/build.rs rename to parachains/runtimes/assets/asset-hub-westend/build.rs diff --git a/parachains/runtimes/assets/westmint/src/constants.rs b/parachains/runtimes/assets/asset-hub-westend/src/constants.rs similarity index 98% rename from parachains/runtimes/assets/westmint/src/constants.rs rename to parachains/runtimes/assets/asset-hub-westend/src/constants.rs index 11e6d1bf35b..e3e2dff1db9 100644 --- a/parachains/runtimes/assets/westmint/src/constants.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/constants.rs @@ -76,7 +76,7 @@ pub mod fee { type Balance = Balance; fn polynomial() -> WeightToFeeCoefficients { // in Westend, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT: - // in Westmint, we map to 1/10 of that, or 1/100 CENT + // in Asset Hub, we map to 1/10 of that, or 1/100 CENT let p = super::currency::CENTS; let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time()); diff --git a/parachains/runtimes/assets/westmint/src/lib.rs b/parachains/runtimes/assets/asset-hub-westend/src/lib.rs similarity index 99% rename from parachains/runtimes/assets/westmint/src/lib.rs rename to parachains/runtimes/assets/asset-hub-westend/src/lib.rs index b988d9b6d34..0d819abd844 100644 --- a/parachains/runtimes/assets/westmint/src/lib.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -//! # Westmint Runtime +//! # Asset Hub Westend Runtime //! -//! Westmint is the testnet for Statemint. +//! Testnet for Asset Hub Polkadot. #![cfg_attr(not(feature = "std"), no_std)] #![recursion_limit = "256"] @@ -93,6 +93,9 @@ impl_opaque_keys! { #[sp_version::runtime_version] pub const VERSION: RuntimeVersion = RuntimeVersion { + // Note: "westmint" is the legacy name for this chain. It has been renamed to + // "asset-hub-westend". Many wallets/tools depend on the `spec_name`, so it remains "westmint" + // for the time being. Wallets/tools should update to treat "asset-hub-westend" equally. spec_name: create_runtime_str!("westmint"), impl_name: create_runtime_str!("westmint"), authoring_version: 1, diff --git a/parachains/runtimes/assets/westmint/src/weights/block_weights.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/block_weights.rs similarity index 100% rename from parachains/runtimes/assets/westmint/src/weights/block_weights.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/block_weights.rs diff --git a/parachains/runtimes/assets/westmint/src/weights/cumulus_pallet_xcmp_queue.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs similarity index 93% rename from parachains/runtimes/assets/westmint/src/weights/cumulus_pallet_xcmp_queue.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs index 01d65b30b4a..8519e8329a6 100644 --- a/parachains/runtimes/assets/westmint/src/weights/cumulus_pallet_xcmp_queue.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=cumulus_pallet_xcmp_queue @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/cumulus_pallet_xcmp_queue.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/extrinsic_weights.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/extrinsic_weights.rs similarity index 100% rename from parachains/runtimes/assets/westmint/src/weights/extrinsic_weights.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/extrinsic_weights.rs diff --git a/parachains/runtimes/assets/westmint/src/weights/frame_system.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs similarity index 96% rename from parachains/runtimes/assets/westmint/src/weights/frame_system.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs index 2515235087d..90dced86bd0 100644 --- a/parachains/runtimes/assets/westmint/src/weights/frame_system.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=frame_system @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/frame_system.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/mod.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/mod.rs similarity index 100% rename from parachains/runtimes/assets/westmint/src/weights/mod.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/mod.rs diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_assets.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets.rs similarity index 99% rename from parachains/runtimes/assets/westmint/src/weights/pallet_assets.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets.rs index 75518b3ef41..a3d1d19438b 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_assets.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets.rs @@ -20,13 +20,13 @@ //! DATE: 2023-03-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_assets @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_assets.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_balances.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs similarity index 97% rename from parachains/runtimes/assets/westmint/src/weights/pallet_balances.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs index 865d674d6ce..4ff5b5075b9 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_balances.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_balances @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_balances.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_collator_selection.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs similarity index 98% rename from parachains/runtimes/assets/westmint/src/weights/pallet_collator_selection.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs index 8b157d96d76..962f1924179 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_collator_selection.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_collator_selection @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_collator_selection.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_multisig.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs similarity index 97% rename from parachains/runtimes/assets/westmint/src/weights/pallet_multisig.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs index a98f72512a0..0216364554d 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_multisig.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_multisig @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_multisig.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_nft_fractionalization.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs similarity index 92% rename from parachains/runtimes/assets/westmint/src/weights/pallet_nft_fractionalization.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs index d8db24f50e6..967bac75e96 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_nft_fractionalization.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_nft_fractionalization @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_nft_fractionalization.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_nfts.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs similarity index 99% rename from parachains/runtimes/assets/westmint/src/weights/pallet_nfts.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs index 437bbd74b77..a540881b8ca 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_nfts.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_nfts @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_nfts.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs similarity index 98% rename from parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs index dbee1b7b3e2..b92e3c4eede 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_proxy @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_session.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs similarity index 94% rename from parachains/runtimes/assets/westmint/src/weights/pallet_session.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs index b48ff8dd064..f768b5436a0 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_session.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_session @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_session.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_timestamp.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs similarity index 93% rename from parachains/runtimes/assets/westmint/src/weights/pallet_timestamp.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs index c1a9be38dbd..6380b2d4bdf 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_timestamp.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_timestamp @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_timestamp.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs similarity index 99% rename from parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs index d04f1800399..e2b3710f033 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_uniques @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_utility.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs similarity index 95% rename from parachains/runtimes/assets/westmint/src/weights/pallet_utility.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs index 4dce4a9b391..9584d32ac10 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_utility.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_utility @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_utility.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_xcm.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs similarity index 98% rename from parachains/runtimes/assets/westmint/src/weights/pallet_xcm.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs index aa43df9de84..cffebc3ea84 100644 --- a/parachains/runtimes/assets/westmint/src/weights/pallet_xcm.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs @@ -20,13 +20,13 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm @@ -35,7 +35,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/pallet_xcm.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/paritydb_weights.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/paritydb_weights.rs similarity index 100% rename from parachains/runtimes/assets/westmint/src/weights/paritydb_weights.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/paritydb_weights.rs diff --git a/parachains/runtimes/assets/westmint/src/weights/rocksdb_weights.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/rocksdb_weights.rs similarity index 100% rename from parachains/runtimes/assets/westmint/src/weights/rocksdb_weights.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/rocksdb_weights.rs diff --git a/parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs similarity index 98% rename from parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs index 768f2b152cd..4cc46939843 100644 --- a/parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs @@ -56,8 +56,8 @@ impl WeighMultiAssets for MultiAssets { } } -pub struct StatemintXcmWeight(core::marker::PhantomData); -impl XcmWeightInfo for StatemintXcmWeight { +pub struct AssetHubWestendXcmWeight(core::marker::PhantomData); +impl XcmWeightInfo for AssetHubWestendXcmWeight { fn withdraw_asset(assets: &MultiAssets) -> Weight { assets.weigh_multi_assets(XcmFungibleWeight::::withdraw_asset()) } diff --git a/parachains/runtimes/assets/westmint/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs similarity index 97% rename from parachains/runtimes/assets/westmint/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs index ce142a079d2..429c43a343c 100644 --- a/parachains/runtimes/assets/westmint/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs @@ -20,14 +20,14 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet // --template=./templates/xcm-bench-template.hbs -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm_benchmarks::fungible @@ -36,7 +36,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs similarity index 98% rename from parachains/runtimes/assets/westmint/src/weights/xcm/pallet_xcm_benchmarks_generic.rs rename to parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs index 886874d6662..7676d7b3a38 100644 --- a/parachains/runtimes/assets/westmint/src/weights/xcm/pallet_xcm_benchmarks_generic.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs @@ -20,14 +20,14 @@ //! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet // --template=./templates/xcm-bench-template.hbs -// --chain=westmint-dev +// --chain=asset-hub-westend-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm_benchmarks::generic @@ -36,7 +36,7 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/westmint/src/weights/xcm/pallet_xcm_benchmarks_generic.rs +// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] diff --git a/parachains/runtimes/assets/westmint/src/xcm_config.rs b/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs similarity index 98% rename from parachains/runtimes/assets/westmint/src/xcm_config.rs rename to parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs index a4dc99df33f..cf7968bf11e 100644 --- a/parachains/runtimes/assets/westmint/src/xcm_config.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs @@ -377,8 +377,8 @@ impl xcm_executor::Config for XcmConfig { type XcmSender = XcmRouter; type AssetTransactor = AssetTransactors; type OriginConverter = XcmOriginToTransactDispatchOrigin; - // Westmint does not recognize a reserve location for any asset. This does not prevent - // Westmint acting _as_ a reserve location for WND and assets created under `pallet-assets`. + // Asset Hub Westend does not recognize a reserve location for any asset. This does not prevent + // Asset Hub acting _as_ a reserve location for WND and assets created under `pallet-assets`. // For WND, users must use teleport where allowed (e.g. with the Relay Chain). type IsReserve = (); // We allow: @@ -391,7 +391,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalLocation = UniversalLocation; type Barrier = Barrier; type Weigher = WeightInfoBounds< - crate::weights::xcm::WestmintXcmWeight, + crate::weights::xcm::AssetHubWestendXcmWeight, RuntimeCall, MaxInstructions, >; @@ -451,7 +451,7 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; type Weigher = WeightInfoBounds< - crate::weights::xcm::WestmintXcmWeight, + crate::weights::xcm::AssetHubWestendXcmWeight, RuntimeCall, MaxInstructions, >; diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs similarity index 99% rename from parachains/runtimes/assets/westmint/tests/tests.rs rename to parachains/runtimes/assets/asset-hub-westend/tests/tests.rs index e378e7b1e52..87bfb4b699a 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs @@ -1,26 +1,26 @@ -use asset_test_utils::{CollatorSessionKeys, ExtBuilder, RuntimeHelper, XcmReceivedFrom}; -use codec::{Decode, DecodeLimit, Encode}; -use cumulus_primitives_utility::ChargeWeightInFungibles; -use frame_support::{ - assert_noop, assert_ok, sp_io, - traits::fungibles::InspectEnumerable, - weights::{Weight, WeightToFee as WeightToFeeT}, -}; -use parachains_common::{AccountId, AssetIdForTrustBackedAssets, AuraId, Balance}; -use std::convert::Into; -pub use westmint_runtime::{ +pub use asset_hub_westend_runtime::{ constants::fee::WeightToFee, xcm_config::{CheckingAccount, TrustBackedAssetsPalletLocation, XcmConfig}, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, ParachainSystem, Runtime, SessionKeys, System, TrustBackedAssetsInstance, }; -use westmint_runtime::{ +use asset_hub_westend_runtime::{ xcm_config::{ AssetFeeAsExistentialDepositMultiplierFeeCharger, ForeignCreatorsSovereignAccountOf, WestendLocation, }, MetadataDepositBase, MetadataDepositPerByte, RuntimeCall, RuntimeEvent, }; +use asset_test_utils::{CollatorSessionKeys, ExtBuilder, RuntimeHelper, XcmReceivedFrom}; +use codec::{Decode, DecodeLimit, Encode}; +use cumulus_primitives_utility::ChargeWeightInFungibles; +use frame_support::{ + assert_noop, assert_ok, sp_io, + traits::fungibles::InspectEnumerable, + weights::{Weight, WeightToFee as WeightToFeeT}, +}; +use parachains_common::{AccountId, AssetIdForTrustBackedAssets, AuraId, Balance}; +use std::convert::Into; use xcm::{latest::prelude::*, VersionedXcm, MAX_XCM_DECODE_DEPTH}; use xcm_executor::{ traits::{Convert, Identity, JustTry, WeightTrader}, diff --git a/parachains/runtimes/assets/test-utils/Cargo.toml b/parachains/runtimes/assets/test-utils/Cargo.toml index d4e7922c576..f683387e6eb 100644 --- a/parachains/runtimes/assets/test-utils/Cargo.toml +++ b/parachains/runtimes/assets/test-utils/Cargo.toml @@ -3,7 +3,7 @@ name = "asset-test-utils" version = "1.0.0" authors = ["Parity Technologies "] edition = "2021" -description = "Statemint parachain runtime" +description = "Test utils for Asset Hub runtimes." [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } diff --git a/parachains/runtimes/bridge-hubs/README.md b/parachains/runtimes/bridge-hubs/README.md index d457bc770ea..b187f1da2db 100644 --- a/parachains/runtimes/bridge-hubs/README.md +++ b/parachains/runtimes/bridge-hubs/README.md @@ -78,7 +78,7 @@ cargo build --release -p substrate-relay cp target/release/substrate-relay ~/local_bridge_testing/bin/substrate-relay --- -# 5. Build polkadot-parachain-mint binary with statemine/westmint for moving assets +# 5. Build polkadot-parachain-mint binary with `asset-hub-kusama`/`asset-hub-westend` for moving assets cd # TODO:check-parameter - change this when merged to master git checkout -b bko-transfer-asset-via-bridge --track origin/bko-transfer-asset-via-bridge @@ -195,26 +195,26 @@ RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ #### Local zombienet run -1. allow bridge transfer on statemine/westmint (governance-like): +1. allow bridge transfer on kusama/westend asset hubs (governance-like): ``` ./scripts/bridges_rococo_wococo.sh allow-transfers-local ``` -2. do (asset) transfer from statemine to westmint +2. do (asset) transfer from kusama's asset hub to westend's asset hub: ``` - ./scripts/bridges_rococo_wococo.sh transfer-asset-from-statemine-local + ./scripts/bridges_rococo_wococo.sh transfer-asset-from-asset-hub-kusama-local ``` -3. do (ping) transfer from statemine to westmint +3. do (ping) transfer from kusama's asset hub to westend's asset hub ``` - ./scripts/bridges_rococo_wococo.sh ping-via-bridge-from-statemine-local + ./scripts/bridges_rococo_wococo.sh ping-via-bridge-from-asset-hub-kusama-local ``` - open explorers: (see zombienets) - - Statemine (see events `xcmpQueue.XcmpMessageSent`, `bridgeTransfer.ReserveAssetsDeposited`, `bridgeTransfer.TransferInitiated`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:9910#/explorer + - Kusama Asset Hub (see events `xcmpQueue.XcmpMessageSent`, `bridgeTransfer.ReserveAssetsDeposited`, `bridgeTransfer.TransferInitiated`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:9910#/explorer - BridgeHubRococo (see `bridgeWococoMessages.MessageAccepted`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8943#/explorer - BridgeHubWococo (see `bridgeRococoMessages.MessagesReceived`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8945#/explorer - - Westmint (see `xcmpQueue.Success` for `transfer-asset` and `xcmpQueue.Fail` for `ping-via-bridge`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:9010#/explorer + - Westend Asset Hub (see `xcmpQueue.Success` for `transfer-asset` and `xcmpQueue.Fail` for `ping-via-bridge`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:9010#/explorer - BridgeHubRococo (see `bridgeWococoMessages.MessagesDelivered`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8943#/explorer #### Live Rockmine2 to Wockmint @@ -222,9 +222,9 @@ RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ ``` cd - ./scripts/bridges_rococo_wococo.sh transfer-asset-from-statemine-rococo + ./scripts/bridges_rococo_wococo.sh transfer-asset-from-asset-hub-rococo or - ./scripts/bridges_rococo_wococo.sh ping-via-bridge-from-statemine-rococo + ./scripts/bridges_rococo_wococo.sh ping-via-bridge-from-asset-hub-rococo ``` - open explorers: diff --git a/parachains/runtimes/contracts/contracts-rococo/src/constants.rs b/parachains/runtimes/contracts/contracts-rococo/src/constants.rs index 4598ddaa264..1147b935aa3 100644 --- a/parachains/runtimes/contracts/contracts-rococo/src/constants.rs +++ b/parachains/runtimes/contracts/contracts-rococo/src/constants.rs @@ -76,7 +76,7 @@ pub mod fee { type Balance = Balance; fn polynomial() -> WeightToFeeCoefficients { // in Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT: - // in Statemine, we map to 1/10 of that, or 1/100 CENT + // in Rococo Contracts, we map to 1/10 of that, or 1/100 CENT let p = super::currency::CENTS; let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time()); diff --git a/parachains/runtimes/testing/penpal/src/lib.rs b/parachains/runtimes/testing/penpal/src/lib.rs index 8ba89c803ce..fc66fa5f0ec 100644 --- a/parachains/runtimes/testing/penpal/src/lib.rs +++ b/parachains/runtimes/testing/penpal/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2022 Parity Technologies (UK) Ltd. +// Copyright 2019-2023 Parity Technologies (UK) Ltd. // This file is part of Cumulus. // Cumulus is free software: you can redistribute it and/or modify @@ -14,11 +14,13 @@ // You should have received a copy of the GNU General Public License // along with Cumulus. If not, see . -//! The Penpal runtime is designed as a test runtime that can be created using an arbitrary parachain id. -//! (and as such multiple parachains can be on the same relay node - though make sure you have enough relay -//! nodes running to support this or you will get the not scheduled on a core error message.) +//! The PenPal runtime is designed as a test runtime that can be created with an arbitrary `ParaId`, +//! such that multiple instances of the parachain can be on the same parent relay. Ensure that you +//! have enough nodes running to support this or you will get scheduling errors. //! -//! The penpal runtime's primary use is as a partner when testing statemine/t with reserve asset transfers. +//! The PenPal runtime's primary use is for testing interactions between System parachains and +//! other chains that are not trusted teleporters. + #![cfg_attr(not(feature = "std"), no_std)] // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. #![recursion_limit = "256"] diff --git a/parachains/runtimes/testing/penpal/src/xcm_config.rs b/parachains/runtimes/testing/penpal/src/xcm_config.rs index d005cc664a3..da1904c16c2 100644 --- a/parachains/runtimes/testing/penpal/src/xcm_config.rs +++ b/parachains/runtimes/testing/penpal/src/xcm_config.rs @@ -19,8 +19,8 @@ //! This configuration dictates how the Penpal chain will communicate with other chains. //! //! One of the main uses of the penpal chain will be to be a benefactor of reserve asset transfers -//! with statemine as the reserve. At present no derivative tokens are minted on receipt of a -//! ReserveAssetTransferDeposited message but that will but the intension will be to support this soon. +//! with Asset Hub as the reserve. At present no derivative tokens are minted on receipt of a +//! `ReserveAssetTransferDeposited` message but that will but the intension will be to support this soon. use super::{ AccountId, AllPalletsWithSystem, AssetId as AssetIdPalletAssets, Assets, Balance, Balances, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, @@ -94,7 +94,7 @@ pub type FungiblesTransactor = FungiblesAdapter< ConvertedConcreteId< AssetIdPalletAssets, Balance, - AsPrefixedGeneralIndex, + AsPrefixedGeneralIndex, JustTry, >, // Convert an XCM MultiLocation into a local account id: @@ -256,15 +256,16 @@ impl ContainsPair for MultiNativeAsset { } parameter_types! { - pub CommonGoodAssetsLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1000))); + /// The location that this chain recognizes as the Relay network's Asset Hub. + pub SystemAssetHubLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1000))); // ALWAYS ensure that the index in PalletInstance stays up-to-date with - // Statemint's Assets pallet index - pub CommonGoodAssetsPalletLocation: MultiLocation = + // the Relay Chain's Asset Hub's Assets pallet index + pub SystemAssetHubAssetsPalletLocation: MultiLocation = MultiLocation::new(1, X2(Parachain(1000), PalletInstance(50))); pub CheckingAccount: AccountId = PolkadotXcm::check_account(); } -pub type Reserves = (NativeAsset, AssetsFrom); +pub type Reserves = (NativeAsset, AssetsFrom); pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { diff --git a/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/parachains/runtimes/testing/rococo-parachain/src/lib.rs index 3060093b532..59ea3dbf0ec 100644 --- a/parachains/runtimes/testing/rococo-parachain/src/lib.rs +++ b/parachains/runtimes/testing/rococo-parachain/src/lib.rs @@ -321,7 +321,11 @@ pub type FungiblesTransactor = FungiblesAdapter< ConvertedConcreteId< AssetIdForTrustBackedAssets, u64, - AsPrefixedGeneralIndex, + AsPrefixedGeneralIndex< + SystemAssetHubAssetsPalletLocation, + AssetIdForTrustBackedAssets, + JustTry, + >, JustTry, >, // Convert an XCM MultiLocation into a local account id: @@ -370,11 +374,13 @@ parameter_types! { } match_types! { + // The parent or the parent's unit plurality. pub type ParentOrParentsUnitPlurality: impl Contains = { MultiLocation { parents: 1, interior: Here } | MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) } }; - pub type Statemint: impl Contains = { + // The location recognized as the Relay network's Asset Hub. + pub type AssetHub: impl Contains = { MultiLocation { parents: 1, interior: X1(Parachain(1000)) } }; } @@ -382,9 +388,10 @@ match_types! { pub type Barrier = ( TakeWeightCredit, AllowTopLevelPaidExecutionFrom, + // Parent & its unit plurality gets free execution. AllowExplicitUnpaidExecutionFrom, - // ^^^ Parent & its unit plurality gets free execution - AllowExplicitUnpaidExecutionFrom, + // The network's Asset Hub gets free execution. + AllowExplicitUnpaidExecutionFrom, // Expected responses are OK. AllowKnownQueryResponses, // Subscriptions for version tracking are OK. @@ -393,14 +400,14 @@ pub type Barrier = ( parameter_types! { pub MaxAssetsIntoHolding: u32 = 64; - pub StatemintLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1000))); + pub SystemAssetHubLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1000))); // ALWAYS ensure that the index in PalletInstance stays up-to-date with - // Statemint's Assets pallet index - pub StatemintAssetsPalletLocation: MultiLocation = + // the Relay Chain's Asset Hub's Assets pallet index + pub SystemAssetHubAssetsPalletLocation: MultiLocation = MultiLocation::new(1, X2(Parachain(1000), PalletInstance(50))); } -pub type Reserves = (NativeAsset, AssetsFrom); +pub type Reserves = (NativeAsset, AssetsFrom); pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { diff --git a/polkadot-parachain/Cargo.toml b/polkadot-parachain/Cargo.toml index 033e395722a..88eaef87cb6 100644 --- a/polkadot-parachain/Cargo.toml +++ b/polkadot-parachain/Cargo.toml @@ -25,9 +25,9 @@ rococo-parachain-runtime = { path = "../parachains/runtimes/testing/rococo-parac shell-runtime = { path = "../parachains/runtimes/starters/shell" } glutton-runtime = { path = "../parachains/runtimes/glutton/glutton-kusama" } 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" } +asset-hub-polkadot-runtime = { path = "../parachains/runtimes/assets/asset-hub-polkadot" } +asset-hub-kusama-runtime = { path = "../parachains/runtimes/assets/asset-hub-kusama" } +asset-hub-westend-runtime = { path = "../parachains/runtimes/assets/asset-hub-westend" } collectives-polkadot-runtime = { path = "../parachains/runtimes/collectives/collectives-polkadot" } contracts-rococo-runtime = { path = "../parachains/runtimes/contracts/contracts-rococo" } bridge-hub-rococo-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-rococo" } @@ -106,9 +106,9 @@ polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "maste default = [] runtime-benchmarks = [ "polkadot-service/runtime-benchmarks", - "statemint-runtime/runtime-benchmarks", - "statemine-runtime/runtime-benchmarks", - "westmint-runtime/runtime-benchmarks", + "asset-hub-polkadot-runtime/runtime-benchmarks", + "asset-hub-kusama-runtime/runtime-benchmarks", + "asset-hub-westend-runtime/runtime-benchmarks", "bridge-hub-rococo-runtime/runtime-benchmarks", "bridge-hub-kusama-runtime/runtime-benchmarks", "bridge-hub-polkadot-runtime/runtime-benchmarks", @@ -119,9 +119,9 @@ runtime-benchmarks = [ "penpal-runtime/runtime-benchmarks", ] try-runtime = [ - "statemint-runtime/try-runtime", - "statemine-runtime/try-runtime", - "westmint-runtime/try-runtime", + "asset-hub-polkadot-runtime/try-runtime", + "asset-hub-kusama-runtime/try-runtime", + "asset-hub-westend-runtime/try-runtime", "shell-runtime/try-runtime", "try-runtime-cli/try-runtime", ] diff --git a/polkadot-parachain/src/chain_spec/statemint.rs b/polkadot-parachain/src/chain_spec/asset_hubs.rs similarity index 71% rename from polkadot-parachain/src/chain_spec/statemint.rs rename to polkadot-parachain/src/chain_spec/asset_hubs.rs index e12a5d12e17..9188431bdf5 100644 --- a/polkadot-parachain/src/chain_spec/statemint.rs +++ b/polkadot-parachain/src/chain_spec/asset_hubs.rs @@ -19,61 +19,66 @@ use crate::chain_spec::{ }; use cumulus_primitives_core::ParaId; use hex_literal::hex; -use parachains_common::{AccountId, AuraId, Balance as StatemintBalance, StatemintAuraId}; +use parachains_common::{AccountId, AssetHubPolkadotAuraId, AuraId, Balance as AssetHubBalance}; use sc_service::ChainType; use sp_core::{crypto::UncheckedInto, sr25519}; /// Specialized `ChainSpec` for the normal parachain runtime. -pub type StatemintChainSpec = - sc_service::GenericChainSpec; -pub type StatemineChainSpec = - sc_service::GenericChainSpec; -pub type WestmintChainSpec = - sc_service::GenericChainSpec; +pub type AssetHubPolkadotChainSpec = + sc_service::GenericChainSpec; +pub type AssetHubKusamaChainSpec = + sc_service::GenericChainSpec; +pub type AssetHubWestendChainSpec = + sc_service::GenericChainSpec; -const STATEMINT_ED: StatemintBalance = statemint_runtime::constants::currency::EXISTENTIAL_DEPOSIT; -const STATEMINE_ED: StatemintBalance = statemine_runtime::constants::currency::EXISTENTIAL_DEPOSIT; -const WESTMINT_ED: StatemintBalance = westmint_runtime::constants::currency::EXISTENTIAL_DEPOSIT; +const ASSET_HUB_POLKADOT_ED: AssetHubBalance = + asset_hub_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT; +const ASSET_HUB_KUSAMA_ED: AssetHubBalance = + asset_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT; +const ASSET_HUB_WESTEND_ED: AssetHubBalance = + asset_hub_westend_runtime::constants::currency::EXISTENTIAL_DEPOSIT; /// Generate the session keys from individual elements. /// /// The input must be a tuple of individual keys (a single arg for now since we have just one key). -pub fn statemint_session_keys(keys: StatemintAuraId) -> statemint_runtime::SessionKeys { - statemint_runtime::SessionKeys { aura: keys } +pub fn asset_hub_polkadot_session_keys( + keys: AssetHubPolkadotAuraId, +) -> asset_hub_polkadot_runtime::SessionKeys { + asset_hub_polkadot_runtime::SessionKeys { aura: keys } } /// Generate the session keys from individual elements. /// /// The input must be a tuple of individual keys (a single arg for now since we have just one key). -pub fn statemine_session_keys(keys: AuraId) -> statemine_runtime::SessionKeys { - statemine_runtime::SessionKeys { aura: keys } +pub fn asset_hub_kusama_session_keys(keys: AuraId) -> asset_hub_kusama_runtime::SessionKeys { + asset_hub_kusama_runtime::SessionKeys { aura: keys } } /// Generate the session keys from individual elements. /// /// The input must be a tuple of individual keys (a single arg for now since we have just one key). -pub fn westmint_session_keys(keys: AuraId) -> westmint_runtime::SessionKeys { - westmint_runtime::SessionKeys { aura: keys } +pub fn asset_hub_westend_session_keys(keys: AuraId) -> asset_hub_westend_runtime::SessionKeys { + asset_hub_westend_runtime::SessionKeys { aura: keys } } -pub fn statemint_development_config() -> StatemintChainSpec { +pub fn asset_hub_polkadot_development_config() -> AssetHubPolkadotChainSpec { let mut properties = sc_chain_spec::Properties::new(); properties.insert("ss58Format".into(), 0.into()); properties.insert("tokenSymbol".into(), "DOT".into()); properties.insert("tokenDecimals".into(), 10.into()); - StatemintChainSpec::from_genesis( + AssetHubPolkadotChainSpec::from_genesis( // Name - "Statemint Development", + "Polkadot Asset Hub Development", // ID - "statemint_dev", + "asset-hub-polkadot-dev", ChainType::Local, move || { - statemint_genesis( + asset_hub_polkadot_genesis( // initial collators. vec![( get_account_id_from_seed::("Alice"), - get_collator_keys_from_seed::("Alice"), + get_collator_keys_from_seed::("Alice"), )], vec![ get_account_id_from_seed::("Alice"), @@ -93,29 +98,29 @@ pub fn statemint_development_config() -> StatemintChainSpec { ) } -pub fn statemint_local_config() -> StatemintChainSpec { +pub fn asset_hub_polkadot_local_config() -> AssetHubPolkadotChainSpec { let mut properties = sc_chain_spec::Properties::new(); properties.insert("ss58Format".into(), 0.into()); properties.insert("tokenSymbol".into(), "DOT".into()); properties.insert("tokenDecimals".into(), 10.into()); - StatemintChainSpec::from_genesis( + AssetHubPolkadotChainSpec::from_genesis( // Name - "Statemint Local", + "Polkadot Asset Hub Local", // ID - "statemint_local", + "asset-hub-polkadot-local", ChainType::Local, move || { - statemint_genesis( + asset_hub_polkadot_genesis( // initial collators. vec![ ( get_account_id_from_seed::("Alice"), - get_collator_keys_from_seed::("Alice"), + get_collator_keys_from_seed::("Alice"), ), ( get_account_id_from_seed::("Bob"), - get_collator_keys_from_seed::("Bob"), + get_collator_keys_from_seed::("Bob"), ), ], vec![ @@ -145,20 +150,20 @@ pub fn statemint_local_config() -> StatemintChainSpec { } // Not used for syncing, but just to determine the genesis values set for the upgrade from shell. -pub fn statemint_config() -> StatemintChainSpec { +pub fn asset_hub_polkadot_config() -> AssetHubPolkadotChainSpec { let mut properties = sc_chain_spec::Properties::new(); properties.insert("ss58Format".into(), 0.into()); properties.insert("tokenSymbol".into(), "DOT".into()); properties.insert("tokenDecimals".into(), 10.into()); - StatemintChainSpec::from_genesis( + AssetHubPolkadotChainSpec::from_genesis( // Name - "Statemint", + "Polkadot Asset Hub", // ID - "statemint", + "asset-hub-polkadot", ChainType::Live, move || { - statemint_genesis( + asset_hub_polkadot_genesis( // initial collators. vec![ ( @@ -204,34 +209,38 @@ pub fn statemint_config() -> StatemintChainSpec { ) } -fn statemint_genesis( - invulnerables: Vec<(AccountId, StatemintAuraId)>, +fn asset_hub_polkadot_genesis( + invulnerables: Vec<(AccountId, AssetHubPolkadotAuraId)>, endowed_accounts: Vec, id: ParaId, -) -> statemint_runtime::GenesisConfig { - statemint_runtime::GenesisConfig { - system: statemint_runtime::SystemConfig { - code: statemint_runtime::WASM_BINARY +) -> asset_hub_polkadot_runtime::GenesisConfig { + asset_hub_polkadot_runtime::GenesisConfig { + system: asset_hub_polkadot_runtime::SystemConfig { + code: asset_hub_polkadot_runtime::WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), }, - balances: statemint_runtime::BalancesConfig { - balances: endowed_accounts.iter().cloned().map(|k| (k, STATEMINT_ED * 4096)).collect(), + balances: asset_hub_polkadot_runtime::BalancesConfig { + balances: endowed_accounts + .iter() + .cloned() + .map(|k| (k, ASSET_HUB_POLKADOT_ED * 4096)) + .collect(), }, - parachain_info: statemint_runtime::ParachainInfoConfig { parachain_id: id }, - collator_selection: statemint_runtime::CollatorSelectionConfig { + parachain_info: asset_hub_polkadot_runtime::ParachainInfoConfig { parachain_id: id }, + collator_selection: asset_hub_polkadot_runtime::CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), - candidacy_bond: STATEMINT_ED * 16, + candidacy_bond: ASSET_HUB_POLKADOT_ED * 16, ..Default::default() }, - session: statemint_runtime::SessionConfig { + session: asset_hub_polkadot_runtime::SessionConfig { keys: invulnerables .into_iter() .map(|(acc, aura)| { ( - acc.clone(), // account id - acc, // validator id - statemint_session_keys(aura), // session keys + acc.clone(), // account id + acc, // validator id + asset_hub_polkadot_session_keys(aura), // session keys ) }) .collect(), @@ -241,26 +250,26 @@ fn statemint_genesis( aura: Default::default(), aura_ext: Default::default(), parachain_system: Default::default(), - polkadot_xcm: statemint_runtime::PolkadotXcmConfig { + polkadot_xcm: asset_hub_polkadot_runtime::PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), }, } } -pub fn statemine_development_config() -> StatemineChainSpec { +pub fn asset_hub_kusama_development_config() -> AssetHubKusamaChainSpec { let mut properties = sc_chain_spec::Properties::new(); properties.insert("ss58Format".into(), 2.into()); properties.insert("tokenSymbol".into(), "KSM".into()); properties.insert("tokenDecimals".into(), 12.into()); - StatemineChainSpec::from_genesis( + AssetHubKusamaChainSpec::from_genesis( // Name - "Statemine Development", + "Kusama Asset Hub Development", // ID - "statemine_dev", + "asset-hub-kusama-dev", ChainType::Local, move || { - statemine_genesis( + asset_hub_kusama_genesis( // initial collators. vec![( get_account_id_from_seed::("Alice"), @@ -284,20 +293,20 @@ pub fn statemine_development_config() -> StatemineChainSpec { ) } -pub fn statemine_local_config() -> StatemineChainSpec { +pub fn asset_hub_kusama_local_config() -> AssetHubKusamaChainSpec { let mut properties = sc_chain_spec::Properties::new(); properties.insert("ss58Format".into(), 2.into()); properties.insert("tokenSymbol".into(), "KSM".into()); properties.insert("tokenDecimals".into(), 12.into()); - StatemineChainSpec::from_genesis( + AssetHubKusamaChainSpec::from_genesis( // Name - "Statemine Local", + "Kusama Asset Hub Local", // ID - "statemine_local", + "asset-hub-kusama-local", ChainType::Local, move || { - statemine_genesis( + asset_hub_kusama_genesis( // initial collators. vec![ ( @@ -335,20 +344,20 @@ pub fn statemine_local_config() -> StatemineChainSpec { ) } -pub fn statemine_config() -> StatemineChainSpec { +pub fn asset_hub_kusama_config() -> AssetHubKusamaChainSpec { let mut properties = sc_chain_spec::Properties::new(); properties.insert("ss58Format".into(), 2.into()); properties.insert("tokenSymbol".into(), "KSM".into()); properties.insert("tokenDecimals".into(), 12.into()); - StatemineChainSpec::from_genesis( + AssetHubKusamaChainSpec::from_genesis( // Name - "Statemine", + "Kusama Asset Hub", // ID - "statemine", + "asset-hub-kusama", ChainType::Live, move || { - statemine_genesis( + asset_hub_kusama_genesis( // initial collators. vec![ ( @@ -389,38 +398,38 @@ pub fn statemine_config() -> StatemineChainSpec { ) } -fn statemine_genesis( +fn asset_hub_kusama_genesis( invulnerables: Vec<(AccountId, AuraId)>, endowed_accounts: Vec, id: ParaId, -) -> statemine_runtime::GenesisConfig { - statemine_runtime::GenesisConfig { - system: statemine_runtime::SystemConfig { - code: statemine_runtime::WASM_BINARY +) -> asset_hub_kusama_runtime::GenesisConfig { + asset_hub_kusama_runtime::GenesisConfig { + system: asset_hub_kusama_runtime::SystemConfig { + code: asset_hub_kusama_runtime::WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), }, - balances: statemine_runtime::BalancesConfig { + balances: asset_hub_kusama_runtime::BalancesConfig { balances: endowed_accounts .iter() .cloned() - .map(|k| (k, STATEMINE_ED * 524_288)) + .map(|k| (k, ASSET_HUB_KUSAMA_ED * 524_288)) .collect(), }, - parachain_info: statemine_runtime::ParachainInfoConfig { parachain_id: id }, - collator_selection: statemine_runtime::CollatorSelectionConfig { + parachain_info: asset_hub_kusama_runtime::ParachainInfoConfig { parachain_id: id }, + collator_selection: asset_hub_kusama_runtime::CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), - candidacy_bond: STATEMINE_ED * 16, + candidacy_bond: ASSET_HUB_KUSAMA_ED * 16, ..Default::default() }, - session: statemine_runtime::SessionConfig { + session: asset_hub_kusama_runtime::SessionConfig { keys: invulnerables .into_iter() .map(|(acc, aura)| { ( - acc.clone(), // account id - acc, // validator id - statemine_session_keys(aura), // session keys + acc.clone(), // account id + acc, // validator id + asset_hub_kusama_session_keys(aura), // session keys ) }) .collect(), @@ -428,25 +437,25 @@ fn statemine_genesis( aura: Default::default(), aura_ext: Default::default(), parachain_system: Default::default(), - polkadot_xcm: statemine_runtime::PolkadotXcmConfig { + polkadot_xcm: asset_hub_kusama_runtime::PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), }, } } -pub fn westmint_development_config() -> WestmintChainSpec { +pub fn asset_hub_westend_development_config() -> AssetHubWestendChainSpec { let mut properties = sc_chain_spec::Properties::new(); properties.insert("tokenSymbol".into(), "WND".into()); properties.insert("tokenDecimals".into(), 12.into()); - WestmintChainSpec::from_genesis( + AssetHubWestendChainSpec::from_genesis( // Name - "Westmint Development", + "Westend Asset Hub Development", // ID - "westmint_dev", + "asset-hub-westend-dev", ChainType::Local, move || { - westmint_genesis( + asset_hub_westend_genesis( // initial collators. vec![( get_account_id_from_seed::("Alice"), @@ -470,19 +479,19 @@ pub fn westmint_development_config() -> WestmintChainSpec { ) } -pub fn westmint_local_config() -> WestmintChainSpec { +pub fn asset_hub_westend_local_config() -> AssetHubWestendChainSpec { let mut properties = sc_chain_spec::Properties::new(); properties.insert("tokenSymbol".into(), "WND".into()); properties.insert("tokenDecimals".into(), 12.into()); - WestmintChainSpec::from_genesis( + AssetHubWestendChainSpec::from_genesis( // Name - "Westmint Local", + "Westend Asset Hub Local", // ID - "westmint_local", + "asset-hub-westend-local", ChainType::Local, move || { - westmint_genesis( + asset_hub_westend_genesis( // initial collators. vec![ ( @@ -520,19 +529,19 @@ pub fn westmint_local_config() -> WestmintChainSpec { ) } -pub fn westmint_config() -> WestmintChainSpec { +pub fn asset_hub_westend_config() -> AssetHubWestendChainSpec { let mut properties = sc_chain_spec::Properties::new(); properties.insert("tokenSymbol".into(), "WND".into()); properties.insert("tokenDecimals".into(), 12.into()); - WestmintChainSpec::from_genesis( + AssetHubWestendChainSpec::from_genesis( // Name - "Westmint", + "Westend Asset Hub", // ID - "westmint", + "asset-hub-westend", ChainType::Live, move || { - westmint_genesis( + asset_hub_westend_genesis( // initial collators. vec![ ( @@ -573,34 +582,38 @@ pub fn westmint_config() -> WestmintChainSpec { ) } -fn westmint_genesis( +fn asset_hub_westend_genesis( invulnerables: Vec<(AccountId, AuraId)>, endowed_accounts: Vec, id: ParaId, -) -> westmint_runtime::GenesisConfig { - westmint_runtime::GenesisConfig { - system: westmint_runtime::SystemConfig { - code: westmint_runtime::WASM_BINARY +) -> asset_hub_westend_runtime::GenesisConfig { + asset_hub_westend_runtime::GenesisConfig { + system: asset_hub_westend_runtime::SystemConfig { + code: asset_hub_westend_runtime::WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), }, - balances: westmint_runtime::BalancesConfig { - balances: endowed_accounts.iter().cloned().map(|k| (k, WESTMINT_ED * 4096)).collect(), + balances: asset_hub_westend_runtime::BalancesConfig { + balances: endowed_accounts + .iter() + .cloned() + .map(|k| (k, ASSET_HUB_WESTEND_ED * 4096)) + .collect(), }, - parachain_info: westmint_runtime::ParachainInfoConfig { parachain_id: id }, - collator_selection: westmint_runtime::CollatorSelectionConfig { + parachain_info: asset_hub_westend_runtime::ParachainInfoConfig { parachain_id: id }, + collator_selection: asset_hub_westend_runtime::CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), - candidacy_bond: WESTMINT_ED * 16, + candidacy_bond: ASSET_HUB_WESTEND_ED * 16, ..Default::default() }, - session: westmint_runtime::SessionConfig { + session: asset_hub_westend_runtime::SessionConfig { keys: invulnerables .into_iter() .map(|(acc, aura)| { ( - acc.clone(), // account id - acc, // validator id - westmint_session_keys(aura), // session keys + acc.clone(), // account id + acc, // validator id + asset_hub_westend_session_keys(aura), // session keys ) }) .collect(), @@ -610,7 +623,7 @@ fn westmint_genesis( aura: Default::default(), aura_ext: Default::default(), parachain_system: Default::default(), - polkadot_xcm: westmint_runtime::PolkadotXcmConfig { + polkadot_xcm: asset_hub_westend_runtime::PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), }, } diff --git a/polkadot-parachain/src/chain_spec/mod.rs b/polkadot-parachain/src/chain_spec/mod.rs index f53552768f3..d7014a9f43c 100644 --- a/polkadot-parachain/src/chain_spec/mod.rs +++ b/polkadot-parachain/src/chain_spec/mod.rs @@ -20,6 +20,7 @@ use serde::{Deserialize, Serialize}; use sp_core::{Pair, Public}; use sp_runtime::traits::{IdentifyAccount, Verify}; +pub mod asset_hubs; pub mod bridge_hubs; pub mod collectives; pub mod contracts; @@ -28,7 +29,6 @@ pub mod penpal; pub mod rococo_parachain; pub mod seedling; pub mod shell; -pub mod statemint; /// The default XCM version to set in genesis config. const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION; diff --git a/polkadot-parachain/src/cli.rs b/polkadot-parachain/src/cli.rs index 790951fb3b1..7be61810a7d 100644 --- a/polkadot-parachain/src/cli.rs +++ b/polkadot-parachain/src/cli.rs @@ -66,10 +66,10 @@ pub enum Subcommand { const AFTER_HELP_EXAMPLE: &str = color_print::cstr!( r#"Examples: - polkadot-parachain --chain statemint --sync warp -- --chain polkadot --sync warp - Launch a warp-syncing full node of the statemint parachain on the polkadot relay chain. - polkadot-parachain --chain statemint --sync warp --relay-chain-rpc-url ws://rpc.example.com -- --chain polkadot - Launch a warp-syncing full node of the statemint parachain on the polkadot relay chain. + polkadot-parachain --chain asset-hub-polkadot --sync warp -- --chain polkadot --sync warp + Launch a warp-syncing full node of the Asset Hub parachain on the Polkadot Relay Chain. + polkadot-parachain --chain asset-hub-polkadot --sync warp --relay-chain-rpc-url ws://rpc.example.com -- --chain polkadot + Launch a warp-syncing full node of the Asset Hub parachain on the Polkadot Relay Chain. Uses ws://rpc.example.com as remote relay chain node. "# ); diff --git a/polkadot-parachain/src/command.rs b/polkadot-parachain/src/command.rs index ab13c00099b..f59a58aa367 100644 --- a/polkadot-parachain/src/command.rs +++ b/polkadot-parachain/src/command.rs @@ -18,9 +18,10 @@ use crate::{ chain_spec, cli::{Cli, RelayChainCli, Subcommand}, service::{ - new_partial, Block, BridgeHubKusamaRuntimeExecutor, BridgeHubPolkadotRuntimeExecutor, - BridgeHubRococoRuntimeExecutor, CollectivesPolkadotRuntimeExecutor, GluttonRuntimeExecutor, - StatemineRuntimeExecutor, StatemintRuntimeExecutor, WestmintRuntimeExecutor, + new_partial, AssetHubKusamaExecutor, AssetHubPolkadotRuntimeExecutor, + AssetHubWestendExecutor, Block, BridgeHubKusamaRuntimeExecutor, + BridgeHubPolkadotRuntimeExecutor, BridgeHubRococoRuntimeExecutor, + CollectivesPolkadotRuntimeExecutor, GluttonRuntimeExecutor, }, }; use codec::Encode; @@ -28,7 +29,7 @@ use cumulus_client_cli::generate_genesis_block; use cumulus_primitives_core::ParaId; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use log::{info, warn}; -use parachains_common::{AuraId, StatemintAuraId}; +use parachains_common::{AssetHubPolkadotAuraId, AuraId}; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, @@ -47,9 +48,9 @@ enum Runtime { Default, Shell, Seedling, - Statemint, - Statemine, - Westmint, + AssetHubPolkadot, + AssetHubKusama, + AssetHubWestend, Penpal(ParaId), ContractsRococo, CollectivesPolkadot, @@ -93,12 +94,12 @@ fn runtime(id: &str) -> Runtime { Runtime::Shell } else if id.starts_with("seedling") { Runtime::Seedling - } else if id.starts_with("statemint") { - Runtime::Statemint - } else if id.starts_with("statemine") { - Runtime::Statemine - } else if id.starts_with("westmint") { - Runtime::Westmint + } else if id.starts_with("asset-hub-polkadot") | id.starts_with("statemint") { + Runtime::AssetHubPolkadot + } else if id.starts_with("asset-hub-kusama") | id.starts_with("statemine") { + Runtime::AssetHubKusama + } else if id.starts_with("asset-hub-westend") | id.starts_with("westmint") { + Runtime::AssetHubWestend } else if id.starts_with("penpal") { Runtime::Penpal(para_id.unwrap_or(ParaId::new(0))) } else if id.starts_with("contracts-rococo") { @@ -143,35 +144,47 @@ fn load_spec(id: &str) -> std::result::Result, String> { "shell" => Box::new(chain_spec::shell::get_shell_chain_spec()), "seedling" => Box::new(chain_spec::seedling::get_seedling_chain_spec()), - // -- Statemint - "statemint-dev" => Box::new(chain_spec::statemint::statemint_development_config()), - "statemint-local" => Box::new(chain_spec::statemint::statemint_local_config()), + // -- Asset Hub Polkadot + "asset-hub-polkadot-dev" | "statemint-dev" => + Box::new(chain_spec::asset_hubs::asset_hub_polkadot_development_config()), + "asset-hub-polkadot-local" | "statemint-local" => + Box::new(chain_spec::asset_hubs::asset_hub_polkadot_local_config()), // the chain spec as used for generating the upgrade genesis values - "statemint-genesis" => Box::new(chain_spec::statemint::statemint_config()), + "asset-hub-polkadot-genesis" | "statemint-genesis" => + Box::new(chain_spec::asset_hubs::asset_hub_polkadot_config()), // the shell-based chain spec as used for syncing - "statemint" => Box::new(chain_spec::statemint::StatemintChainSpec::from_json_bytes( - &include_bytes!("../../parachains/chain-specs/statemint.json")[..], - )?), + "asset-hub-polkadot" | "statemint" => + Box::new(chain_spec::asset_hubs::AssetHubPolkadotChainSpec::from_json_bytes( + &include_bytes!("../../parachains/chain-specs/asset-hub-polkadot.json")[..], + )?), - // -- Statemine - "statemine-dev" => Box::new(chain_spec::statemint::statemine_development_config()), - "statemine-local" => Box::new(chain_spec::statemint::statemine_local_config()), + // -- Asset Hub Kusama + "asset-hub-kusama-dev" | "statemine-dev" => + Box::new(chain_spec::asset_hubs::asset_hub_kusama_development_config()), + "asset-hub-kusama-local" | "statemine-local" => + Box::new(chain_spec::asset_hubs::asset_hub_kusama_local_config()), // the chain spec as used for generating the upgrade genesis values - "statemine-genesis" => Box::new(chain_spec::statemint::statemine_config()), + "asset-hub-kusama-genesis" | "statemine-genesis" => + Box::new(chain_spec::asset_hubs::asset_hub_kusama_config()), // the shell-based chain spec as used for syncing - "statemine" => Box::new(chain_spec::statemint::StatemineChainSpec::from_json_bytes( - &include_bytes!("../../parachains/chain-specs/statemine.json")[..], - )?), + "asset-hub-kusama" | "statemine" => + Box::new(chain_spec::asset_hubs::AssetHubKusamaChainSpec::from_json_bytes( + &include_bytes!("../../parachains/chain-specs/asset-hub-kusama.json")[..], + )?), - // -- Westmint - "westmint-dev" => Box::new(chain_spec::statemint::westmint_development_config()), - "westmint-local" => Box::new(chain_spec::statemint::westmint_local_config()), + // -- Asset Hub Westend + "asset-hub-westend-dev" | "westmint-dev" => + Box::new(chain_spec::asset_hubs::asset_hub_westend_development_config()), + "asset-hub-westend-local" | "westmint-local" => + Box::new(chain_spec::asset_hubs::asset_hub_westend_local_config()), // the chain spec as used for generating the upgrade genesis values - "westmint-genesis" => Box::new(chain_spec::statemint::westmint_config()), + "asset-hub-westend-genesis" | "westmint-genesis" => + Box::new(chain_spec::asset_hubs::asset_hub_westend_config()), // the shell-based chain spec as used for syncing - "westmint" => Box::new(chain_spec::statemint::WestmintChainSpec::from_json_bytes( - &include_bytes!("../../parachains/chain-specs/westmint.json")[..], - )?), + "asset-hub-westend" | "westmint" => + Box::new(chain_spec::asset_hubs::AssetHubWestendChainSpec::from_json_bytes( + &include_bytes!("../../parachains/chain-specs/asset-hub-westend.json")[..], + )?), // -- Polkadot Collectives "collectives-polkadot-dev" => @@ -239,12 +252,14 @@ fn load_spec(id: &str) -> std::result::Result, String> { path => { let path: PathBuf = path.into(); match path.runtime() { - Runtime::Statemint => - Box::new(chain_spec::statemint::StatemintChainSpec::from_json_file(path)?), - Runtime::Statemine => - Box::new(chain_spec::statemint::StatemineChainSpec::from_json_file(path)?), - Runtime::Westmint => - Box::new(chain_spec::statemint::WestmintChainSpec::from_json_file(path)?), + Runtime::AssetHubPolkadot => Box::new( + chain_spec::asset_hubs::AssetHubPolkadotChainSpec::from_json_file(path)?, + ), + Runtime::AssetHubKusama => + Box::new(chain_spec::asset_hubs::AssetHubKusamaChainSpec::from_json_file(path)?), + Runtime::AssetHubWestend => Box::new( + chain_spec::asset_hubs::AssetHubWestendChainSpec::from_json_file(path)?, + ), Runtime::CollectivesPolkadot | Runtime::CollectivesWestend => Box::new( chain_spec::collectives::CollectivesPolkadotChainSpec::from_json_file(path)?, ), @@ -338,9 +353,9 @@ impl SubstrateCli for Cli { fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { match chain_spec.runtime() { - Runtime::Statemint => &statemint_runtime::VERSION, - Runtime::Statemine => &statemine_runtime::VERSION, - Runtime::Westmint => &westmint_runtime::VERSION, + Runtime::AssetHubPolkadot => &asset_hub_polkadot_runtime::VERSION, + Runtime::AssetHubKusama => &asset_hub_kusama_runtime::VERSION, + Runtime::AssetHubWestend => &asset_hub_westend_runtime::VERSION, Runtime::CollectivesPolkadot | Runtime::CollectivesWestend => &collectives_polkadot_runtime::VERSION, Runtime::Shell => &shell_runtime::VERSION, @@ -399,24 +414,24 @@ impl SubstrateCli for RelayChainCli { macro_rules! construct_benchmark_partials { ($config:expr, |$partials:ident| $code:expr) => { match $config.chain_spec.runtime() { - Runtime::Statemine => { - let $partials = new_partial::( + Runtime::AssetHubKusama => { + let $partials = new_partial::( &$config, crate::service::aura_build_import_queue::<_, AuraId>, )?; $code }, - Runtime::Westmint => { - let $partials = new_partial::( + Runtime::AssetHubWestend => { + let $partials = new_partial::( &$config, crate::service::aura_build_import_queue::<_, AuraId>, )?; $code }, - Runtime::Statemint => { - let $partials = new_partial::( + Runtime::AssetHubPolkadot => { + let $partials = new_partial::( &$config, - crate::service::aura_build_import_queue::<_, StatemintAuraId>, + crate::service::aura_build_import_queue::<_, AssetHubPolkadotAuraId>, )?; $code }, @@ -436,9 +451,9 @@ macro_rules! construct_async_run { (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{ let runner = $cli.create_runner($cmd)?; match runner.config().chain_spec.runtime() { - Runtime::Westmint => { + Runtime::AssetHubWestend => { runner.async_run(|$config| { - let $components = new_partial::( + let $components = new_partial::( &$config, crate::service::aura_build_import_queue::<_, AuraId>, )?; @@ -446,9 +461,9 @@ macro_rules! construct_async_run { { $( $code )* }.map(|v| (v, task_manager)) }) }, - Runtime::Statemine => { + Runtime::AssetHubKusama => { runner.async_run(|$config| { - let $components = new_partial::( + let $components = new_partial::( &$config, crate::service::aura_build_import_queue::<_, AuraId>, )?; @@ -456,11 +471,11 @@ macro_rules! construct_async_run { { $( $code )* }.map(|v| (v, task_manager)) }) }, - Runtime::Statemint => { + Runtime::AssetHubPolkadot => { runner.async_run(|$config| { - let $components = new_partial::( + let $components = new_partial::( &$config, - crate::service::aura_build_import_queue::<_, StatemintAuraId>, + crate::service::aura_build_import_queue::<_, AssetHubPolkadotAuraId>, )?; let task_manager = $components.task_manager; { $( $code )* }.map(|v| (v, task_manager)) @@ -674,11 +689,11 @@ pub fn run() -> Result<()> { if cfg!(feature = "runtime-benchmarks") { runner.sync_run(|config| { match config.chain_spec.runtime() { - Runtime::Statemine => - cmd.run::(config), - Runtime::Westmint => cmd.run::(config), - Runtime::Statemint => - cmd.run::(config), + Runtime::AssetHubKusama => + cmd.run::(config), + Runtime::AssetHubWestend => cmd.run::(config), + Runtime::AssetHubPolkadot => + cmd.run::(config), Runtime::CollectivesPolkadot | Runtime::CollectivesWestend => cmd.run::(config), Runtime::BridgeHub(bridge_hub_runtime_type) => match bridge_hub_runtime_type { @@ -762,25 +777,25 @@ pub fn run() -> Result<()> { let info_provider = timestamp_with_aura_info(6000); match runner.config().chain_spec.runtime() { - Runtime::Statemine => runner.async_run(|_| { + Runtime::AssetHubKusama => runner.async_run(|_| { Ok(( - cmd.run::, _>(Some( + cmd.run::, _>(Some( info_provider, )), task_manager, )) }), - Runtime::Westmint => runner.async_run(|_| { + Runtime::AssetHubWestend => runner.async_run(|_| { Ok(( - cmd.run::, _>(Some( + cmd.run::, _>(Some( info_provider, )), task_manager, )) }), - Runtime::Statemint => runner.async_run(|_| { + Runtime::AssetHubPolkadot => runner.async_run(|_| { Ok(( - cmd.run::, _>(Some( + cmd.run::, _>(Some( info_provider, )), task_manager, @@ -858,6 +873,38 @@ pub fn run() -> Result<()> { let collator_options = cli.run.collator_options(); runner.run_node_until_exit(|config| async move { + // If Statemint (Statemine, Westmint, Rockmine) DB exists and we're using the + // asset-hub chain spec, then rename the base path to the new chain ID. In the case + // that both file paths exist, the node will exit, as the user must decide (by + // deleting one path) the information that they want to use as their DB. + let old_name = match config.chain_spec.id() { + "asset-hub-polkadot" => Some("statemint"), + "asset-hub-kusama" => Some("statemine"), + "asset-hub-westend" => Some("westmint"), + "asset-hub-rococo" => Some("rockmine"), + _ => None, + }; + + if let Some(old_name) = old_name { + let new_path = config.base_path.config_dir(config.chain_spec.id()); + let old_path = config.base_path.config_dir(old_name); + + if old_path.exists() && new_path.exists() { + return Err(format!( + "Found legacy {} path {} and new asset-hub path {}. Delete one path such that only one exists.", + old_name, old_path.display(), new_path.display() + ).into()) + } + + if old_path.exists() { + std::fs::rename(old_path.clone(), new_path.clone())?; + info!( + "Statemint renamed to Asset Hub. The filepath with associated data on disk has been renamed from {} to {}.", + old_path.display(), new_path.display() + ); + } + } + let hwbench = (!cli.no_hardware_benchmarks).then_some( config.database.path().map(|database_path| { let _ = std::fs::create_dir_all(database_path); @@ -900,22 +947,22 @@ pub fn run() -> Result<()> { } match config.chain_spec.runtime() { - Runtime::Statemint => crate::service::start_generic_aura_node::< - statemint_runtime::RuntimeApi, - StatemintAuraId, + Runtime::AssetHubPolkadot => crate::service::start_generic_aura_node::< + asset_hub_polkadot_runtime::RuntimeApi, + AssetHubPolkadotAuraId, >(config, polkadot_config, collator_options, id, hwbench) .await .map(|r| r.0) .map_err(Into::into), - Runtime::Statemine => crate::service::start_generic_aura_node::< - statemine_runtime::RuntimeApi, + Runtime::AssetHubKusama => crate::service::start_generic_aura_node::< + asset_hub_kusama_runtime::RuntimeApi, AuraId, >(config, polkadot_config, collator_options, id, hwbench) .await .map(|r| r.0) .map_err(Into::into), - Runtime::Westmint => crate::service::start_generic_aura_node::< - westmint_runtime::RuntimeApi, + Runtime::AssetHubWestend => crate::service::start_generic_aura_node::< + asset_hub_westend_runtime::RuntimeApi, AuraId, >(config, polkadot_config, collator_options, id, hwbench) .await @@ -1257,9 +1304,9 @@ mod tests { let path = store_configuration( &temp_dir, - Box::new(crate::chain_spec::statemint::statemine_local_config()), + Box::new(crate::chain_spec::asset_hubs::asset_hub_kusama_local_config()), ); - assert_eq!(Runtime::Statemine, path.runtime()); + assert_eq!(Runtime::AssetHubKusama, path.runtime()); let path = store_configuration( &temp_dir, diff --git a/polkadot-parachain/src/service.rs b/polkadot-parachain/src/service.rs index b4cc4ce4981..b493f3589ed 100644 --- a/polkadot-parachain/src/service.rs +++ b/polkadot-parachain/src/service.rs @@ -86,52 +86,52 @@ impl sc_executor::NativeExecutionDispatch for ShellRuntimeExecutor { } } -// Native Statemint executor instance. -pub struct StatemintRuntimeExecutor; +/// Native Asset Hub Polkadot (Statemint) executor instance. +pub struct AssetHubPolkadotRuntimeExecutor; -impl sc_executor::NativeExecutionDispatch for StatemintRuntimeExecutor { +impl sc_executor::NativeExecutionDispatch for AssetHubPolkadotRuntimeExecutor { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { - statemint_runtime::api::dispatch(method, data) + asset_hub_polkadot_runtime::api::dispatch(method, data) } fn native_version() -> sc_executor::NativeVersion { - statemint_runtime::native_version() + asset_hub_polkadot_runtime::native_version() } } -/// Native Statemine executor instance. -pub struct StatemineRuntimeExecutor; +/// Native Asset Hub Kusama (Statemine) executor instance. +pub struct AssetHubKusamaExecutor; -impl sc_executor::NativeExecutionDispatch for StatemineRuntimeExecutor { +impl sc_executor::NativeExecutionDispatch for AssetHubKusamaExecutor { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { - statemine_runtime::api::dispatch(method, data) + asset_hub_kusama_runtime::api::dispatch(method, data) } fn native_version() -> sc_executor::NativeVersion { - statemine_runtime::native_version() + asset_hub_kusama_runtime::native_version() } } -/// Native Westmint executor instance. -pub struct WestmintRuntimeExecutor; +/// Native Asset Hub Westend (Westmint) executor instance. +pub struct AssetHubWestendExecutor; -impl sc_executor::NativeExecutionDispatch for WestmintRuntimeExecutor { +impl sc_executor::NativeExecutionDispatch for AssetHubWestendExecutor { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { - westmint_runtime::api::dispatch(method, data) + asset_hub_westend_runtime::api::dispatch(method, data) } fn native_version() -> sc_executor::NativeVersion { - westmint_runtime::native_version() + asset_hub_westend_runtime::native_version() } } -// Native Polkadot Collectives executor instance. +/// Native Polkadot Collectives executor instance. pub struct CollectivesPolkadotRuntimeExecutor; impl sc_executor::NativeExecutionDispatch for CollectivesPolkadotRuntimeExecutor { @@ -146,7 +146,7 @@ impl sc_executor::NativeExecutionDispatch for CollectivesPolkadotRuntimeExecutor } } -// Native BridgeHubPolkadot executor instance. +/// Native BridgeHubPolkadot executor instance. pub struct BridgeHubPolkadotRuntimeExecutor; impl sc_executor::NativeExecutionDispatch for BridgeHubPolkadotRuntimeExecutor { @@ -161,7 +161,7 @@ impl sc_executor::NativeExecutionDispatch for BridgeHubPolkadotRuntimeExecutor { } } -// Native BridgeHubKusama executor instance. +/// Native BridgeHubKusama executor instance. pub struct BridgeHubKusamaRuntimeExecutor; impl sc_executor::NativeExecutionDispatch for BridgeHubKusamaRuntimeExecutor { @@ -176,7 +176,7 @@ impl sc_executor::NativeExecutionDispatch for BridgeHubKusamaRuntimeExecutor { } } -// Native BridgeHubRococo executor instance. +/// Native BridgeHubRococo executor instance. pub struct BridgeHubRococoRuntimeExecutor; impl sc_executor::NativeExecutionDispatch for BridgeHubRococoRuntimeExecutor { @@ -191,7 +191,7 @@ impl sc_executor::NativeExecutionDispatch for BridgeHubRococoRuntimeExecutor { } } -// Native contracts executor instance. +/// Native contracts executor instance. pub struct ContractsRococoRuntimeExecutor; impl sc_executor::NativeExecutionDispatch for ContractsRococoRuntimeExecutor { @@ -1068,7 +1068,7 @@ where } } -/// Build the import queue for Statemint and other Aura-based runtimes. +/// Build the import queue for Aura-based runtimes. pub fn aura_build_import_queue( client: Arc>, block_import: ParachainBlockImport, @@ -1134,8 +1134,7 @@ where Ok(BasicQueue::new(verifier, Box::new(block_import), None, &spawner, registry)) } -/// Start an aura powered parachain node. -/// (collective-polkadot and statemine/t use this) +/// Start an aura powered parachain node. Asset Hub and Collectives use this. pub async fn start_generic_aura_node( parachain_config: Configuration, polkadot_config: Configuration, diff --git a/polkadot-parachain/tests/benchmark_storage_works.rs b/polkadot-parachain/tests/benchmark_storage_works.rs index b1c05609217..df3078b4dab 100644 --- a/polkadot-parachain/tests/benchmark_storage_works.rs +++ b/polkadot-parachain/tests/benchmark_storage_works.rs @@ -8,7 +8,7 @@ use std::{ use tempfile::tempdir; /// The runtimes that this command supports. -static RUNTIMES: [&str; 3] = ["westmint", "statemine", "statemint"]; +static RUNTIMES: [&str; 3] = ["asset-hub-westend", "asset-hub-kusama", "asset-hub-polkadot"]; /// The `benchmark storage` command works for the dev runtimes. #[test] diff --git a/scripts/benchmarks.sh b/scripts/benchmarks.sh index be9aa9b8348..29d06905925 100755 --- a/scripts/benchmarks.sh +++ b/scripts/benchmarks.sh @@ -8,9 +8,9 @@ __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" ${__dir}/benchmarks-ci.sh collectives collectives-polkadot target/$target $steps $repeat -${__dir}/benchmarks-ci.sh assets statemine target/$target $steps $repeat -${__dir}/benchmarks-ci.sh assets statemint target/$target $steps $repeat -${__dir}/benchmarks-ci.sh assets westmint target/$target $steps $repeat +${__dir}/benchmarks-ci.sh assets asset-hub-kusama target/$target $steps $repeat +${__dir}/benchmarks-ci.sh assets asset-hub-polkadot target/$target $steps $repeat +${__dir}/benchmarks-ci.sh assets asset-hub-westend target/$target $steps $repeat ${__dir}/benchmarks-ci.sh bridge-hubs bridge-hub-polkadot target/$target $steps $repeat ${__dir}/benchmarks-ci.sh bridge-hubs bridge-hub-kusama target/$target $steps $repeat diff --git a/scripts/bridges_rococo_wococo.sh b/scripts/bridges_rococo_wococo.sh index 2d918e244a9..1117ed68109 100755 --- a/scripts/bridges_rococo_wococo.sh +++ b/scripts/bridges_rococo_wococo.sh @@ -2,10 +2,10 @@ # Address: 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY # AccountId: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] -STATEMINE_ACCOUNT_SEED_FOR_LOCAL="//Alice" +ASSET_HUB_KUSAMA_ACCOUNT_SEED_FOR_LOCAL="//Alice" # Address: 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY # AccountId: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] -WOCKMINT_ACCOUNT_ADDRESS_FOR_LOCAL="5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY" +ASSET_HUB_WOCOCO_ACCOUNT_SEED_FOR_LOCAL="5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY" # SovereignAccount for `MultiLocation { parents: 2, interior: X2(GlobalConsensus(Rococo), Parachain(1000)) }` => 5CfNu7eH3SJvqqPt3aJh38T8dcFvhGzEohp9tsd41ANhXDnQ # @@ -16,23 +16,23 @@ WOCKMINT_ACCOUNT_ADDRESS_FOR_LOCAL="5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGK # MultiLocation { parents: 2, interior: X2(GlobalConsensus(Kusama), Parachain(1000)) }).unwrap() # ).to_ss58check_with_version(42_u16.into()) # ); -ROCOCO_STATEMINE_1000_SOVEREIGN_ACCOUNT="5CfNu7eH3SJvqqPt3aJh38T8dcFvhGzEohp9tsd41ANhXDnQ" +ASSET_HUB_ROCOCO_1000_SOVEREIGN_ACCOUNT="5CfNu7eH3SJvqqPt3aJh38T8dcFvhGzEohp9tsd41ANhXDnQ" # Address: GegTpZJMyzkntLN7NJhRfHDk4GWukLbGSsag6PHrLSrCK4h -ROCKMINE2_ACCOUNT_SEED_FOR_ROCOCO="scatter feed race company oxygen trip extra elbow slot bundle auto canoe" +ASSET_HUB2_ROCOCO_1000_SOVEREIGN_ACCOUNT="scatter feed race company oxygen trip extra elbow slot bundle auto canoe" # Adress: 5Ge7YcbctWCP1CccugzxWDn9hFnTxvTh3bL6PNy4ubNJmp7Y / H9jCvwVWsDJkrS4gPp1QB99qr4hmbGsVyAqn3F2PPaoWyU3 # AccountId: [202, 107, 198, 135, 15, 25, 193, 165, 172, 73, 137, 218, 115, 177, 204, 0, 5, 155, 215, 86, 208, 51, 50, 130, 190, 110, 184, 143, 124, 50, 160, 20] -WOCKMINT_ACCOUNT_ADDRESS_FOR_ROCOCO="5Ge7YcbctWCP1CccugzxWDn9hFnTxvTh3bL6PNy4ubNJmp7Y" -WOCKMINT_ACCOUNT_SEED_FOR_WOCOCO="tone spirit magnet sunset cannon poverty forget lock river east blouse random" +ASSET_HUB_WOCOCO_ACCOUNT_ADDRESS_FOR_ROCOCO="5Ge7YcbctWCP1CccugzxWDn9hFnTxvTh3bL6PNy4ubNJmp7Y" +ASSET_HUB_WOCOCO_ACCOUNT_SEED_FOR_WOCOCO="tone spirit magnet sunset cannon poverty forget lock river east blouse random" function address_to_account_id_bytes() { local address=$1 local output=$2 echo "address_to_account_id_bytes - address: $address, output: $output" - if [ $address == "$WOCKMINT_ACCOUNT_ADDRESS_FOR_LOCAL" ]; then + if [ $address == "$ASSET_HUB_WOCOCO_ACCOUNT_SEED_FOR_LOCAL" ]; then jq --null-input '[212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125]' > $output - elif [ $address == "$WOCKMINT_ACCOUNT_ADDRESS_FOR_ROCOCO" ]; then + elif [ $address == "$ASSET_HUB_WOCOCO_ACCOUNT_ADDRESS_FOR_ROCOCO" ]; then jq --null-input '[202, 107, 198, 135, 15, 25, 193, 165, 172, 73, 137, 218, 115, 177, 204, 0, 5, 155, 215, 86, 208, 51, 50, 130, 190, 110, 184, 143, 124, 50, 160, 20]' > $output else echo -n "Sorry, unknown address: $address - please, add bytes here or function for that!" @@ -382,7 +382,7 @@ function remove_assets_transfer_send() { } # TODO: we need to fill sovereign account for bridge-hub, because, small ammouts does not match ExistentialDeposit, so no reserve pass -# SA for BH: MultiLocation { parents: 1, interior: X1(Parachain(1013)) } - 5Eg2fntRRwLinojmk3sh5xscp7F3S6Zzm5oDVtoLTALKiypR on Statemine +# SA for BH: MultiLocation { parents: 1, interior: X1(Parachain(1013)) } - 5Eg2fntRRwLinojmk3sh5xscp7F3S6Zzm5oDVtoLTALKiypR on Kusama Asset Hub function transfer_asset_via_bridge() { local url=$1 @@ -583,12 +583,12 @@ case "$1" in run_relay ;; allow-transfers-local) - # this allows send transfers on statemine (by governance-like) - ./$0 "allow-transfer-on-statemine-local" - # this allows receive transfers on westmint (by governance-like) - ./$0 "allow-transfer-on-westmint-local" + # this allows send transfers on asset hub kusama local (by governance-like) + ./$0 "allow-transfer-on-asset-hub-kusama-local" + # this allows receive transfers on asset hub westend local (by governance-like) + ./$0 "allow-transfer-on-asset-hub-westend-local" ;; - allow-transfer-on-statemine-local) + allow-transfer-on-asset-hub-kusama-local) ensure_polkadot_js_api allow_assets_transfer_send \ "ws://127.0.0.1:9942" \ @@ -598,7 +598,7 @@ case "$1" in 1013 \ "Wococo" 1000 ;; - allow-transfer-on-westmint-local) + allow-transfer-on-asset-hub-westend-local) ensure_polkadot_js_api allow_assets_transfer_receive \ "ws://127.0.0.1:9945" \ @@ -611,18 +611,18 @@ case "$1" in transfer_balance \ "ws://127.0.0.1:9010" \ "//Alice" \ - "$ROCOCO_STATEMINE_1000_SOVEREIGN_ACCOUNT" \ + "$ASSET_HUB_ROCOCO_1000_SOVEREIGN_ACCOUNT" \ $((1000000000 + 50000000000 * 20)) # ExistentialDeposit + maxTargetLocationFee * 20 - # create foreign assets for native Statemine token (yes, Kusama, because we are using Statemine runtime on rococo) + # create foreign assets for native Kusama token (yes, Kusama, because we are using Kusama Asset Hub runtime on rococo) force_create_foreign_asset \ "ws://127.0.0.1:9945" \ "//Alice" \ 1000 \ "ws://127.0.0.1:9010" \ "Kusama" \ - "$ROCOCO_STATEMINE_1000_SOVEREIGN_ACCOUNT" + "$ASSET_HUB_ROCOCO_1000_SOVEREIGN_ACCOUNT" ;; - remove-assets-transfer-from-statemine-local) + remove-assets-transfer-from-asset-hub-kusama-local) ensure_polkadot_js_api remove_assets_transfer_send \ "ws://127.0.0.1:9942" \ @@ -631,43 +631,43 @@ case "$1" in "ws://127.0.0.1:9910" \ "Wococo" ;; - transfer-asset-from-statemine-local) + transfer-asset-from-asset-hub-kusama-local) ensure_polkadot_js_api transfer_asset_via_bridge \ "ws://127.0.0.1:9910" \ - "$STATEMINE_ACCOUNT_SEED_FOR_LOCAL" \ - "$WOCKMINT_ACCOUNT_ADDRESS_FOR_LOCAL" \ + "$ASSET_HUB_KUSAMA_ACCOUNT_SEED_FOR_LOCAL" \ + "$ASSET_HUB_WOCOCO_ACCOUNT_SEED_FOR_LOCAL" \ "Wococo" ;; - ping-via-bridge-from-statemine-local) + ping-via-bridge-from-asset-hub-kusama-local) ensure_polkadot_js_api ping_via_bridge \ "ws://127.0.0.1:9910" \ - "$STATEMINE_ACCOUNT_SEED_FOR_LOCAL" \ - "$WOCKMINT_ACCOUNT_ADDRESS_FOR_LOCAL" \ + "$ASSET_HUB_KUSAMA_ACCOUNT_SEED_FOR_LOCAL" \ + "$ASSET_HUB_WOCOCO_ACCOUNT_SEED_FOR_LOCAL" \ "Wococo" ;; - transfer-asset-from-statemine-rococo) + transfer-asset-from-asset-hub-rococo) ensure_polkadot_js_api transfer_asset_via_bridge \ "wss://ws-rococo-rockmine2-collator-node-0.parity-testnet.parity.io" \ - "$ROCKMINE2_ACCOUNT_SEED_FOR_ROCOCO" \ - "$WOCKMINT_ACCOUNT_ADDRESS_FOR_ROCOCO" \ + "$ASSET_HUB2_ROCOCO_1000_SOVEREIGN_ACCOUNT" \ + "$ASSET_HUB_WOCOCO_ACCOUNT_ADDRESS_FOR_ROCOCO" \ "Wococo" ;; - ping-via-bridge-from-statemine-rococo) + ping-via-bridge-from-asset-hub-rococo) ensure_polkadot_js_api ping_via_bridge \ "wss://ws-rococo-rockmine2-collator-node-0.parity-testnet.parity.io" \ - "${ROCKMINE2_ACCOUNT_SEED_FOR_ROCOCO}" \ - "$WOCKMINT_ACCOUNT_ADDRESS_FOR_ROCOCO" \ + "${ASSET_HUB2_ROCOCO_1000_SOVEREIGN_ACCOUNT}" \ + "$ASSET_HUB_WOCOCO_ACCOUNT_ADDRESS_FOR_ROCOCO" \ "Wococo" ;; drip) transfer_balance \ "ws://127.0.0.1:9010" \ "//Alice" \ - "$ROCOCO_STATEMINE_1000_SOVEREIGN_ACCOUNT" \ + "$ASSET_HUB_ROCOCO_1000_SOVEREIGN_ACCOUNT" \ $((1000000000 + 50000000000 * 20)) ;; stop) @@ -682,14 +682,14 @@ case "$1" in Local (zombienet) run: - run-relay - allow-transfers-local - - allow-transfer-on-statemine-local - - allow-transfer-on-westmint-local - - remove-assets-transfer-from-statemine-local - - transfer-asset-from-statemine-local - - ping-via-bridge-from-statemine-local + - allow-transfer-on-asset-hub-kusama-local + - allow-transfer-on-asset-hub-westend-local + - remove-assets-transfer-from-asset-hub-kusama-local + - transfer-asset-from-asset-hub-kusama-local + - ping-via-bridge-from-asset-hub-kusama-local Live Rococo/Wococo run: - - transfer-asset-from-statemine-rococo - - ping-via-bridge-from-statemine-rococo"; + - transfer-asset-from-asset-hub-rococo + - ping-via-bridge-from-asset-hub-rococo"; exit 1 ;; esac diff --git a/scripts/ci/gitlab/pipeline/benchmarks.yml b/scripts/ci/gitlab/pipeline/benchmarks.yml index d1fdd64c341..011e750a735 100644 --- a/scripts/ci/gitlab/pipeline/benchmarks.yml +++ b/scripts/ci/gitlab/pipeline/benchmarks.yml @@ -22,13 +22,13 @@ benchmarks-assets: before_script: - !reference [.docker-env, before_script] script: - - ./scripts/benchmarks-ci.sh assets statemine ./artifacts - - ./scripts/benchmarks-ci.sh assets statemint ./artifacts - - ./scripts/benchmarks-ci.sh assets westmint ./artifacts + - ./scripts/benchmarks-ci.sh assets asset-hub-kusama ./artifacts + - ./scripts/benchmarks-ci.sh assets asset-hub-polkadot ./artifacts + - ./scripts/benchmarks-ci.sh assets asset-hub-westend ./artifacts - export CURRENT_TIME=$(date '+%s') - - export BRANCHNAME="weights-statemint-${CI_COMMIT_BRANCH}-${CURRENT_TIME}" + - export BRANCHNAME="weights-asset-hub-polkadot-${CI_COMMIT_BRANCH}-${CURRENT_TIME}" - !reference [.git-commit-push, script] - - ./scripts/ci/create-benchmark-pr.sh "[benchmarks] Update weights for statemine/t" "$BRANCHNAME" + - ./scripts/ci/create-benchmark-pr.sh "[benchmarks] Update weights for asset-hub-kusama/t" "$BRANCHNAME" - rm -f ./artifacts/polkadot-parachain - rm -f ./artifacts/test-parachain after_script: diff --git a/scripts/generate_genesis_value.sh b/scripts/generate_genesis_value.sh index 07e9fca59d7..178e15fb8a9 100755 --- a/scripts/generate_genesis_value.sh +++ b/scripts/generate_genesis_value.sh @@ -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 parachains/chain-specs/shell-statemint.json --tmp\n" + echo -e "target/release/polkadot-parachain --chain parachains/chain-specs/shell.json --tmp\n" read -p "You can abort with CTRL+C if this is not correct, otherwise press ENTER " fi diff --git a/scripts/parachains_integration_tests.sh b/scripts/parachains_integration_tests.sh index ed920f430fc..2a06b930e22 100755 --- a/scripts/parachains_integration_tests.sh +++ b/scripts/parachains_integration_tests.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash tests=( - statemine - statemint + asset-hub-kusama + asset-hub-polkadot ) rm -R logs &> /dev/null diff --git a/xcm/xcm-emulator/README.md b/xcm/xcm-emulator/README.md index aa1bd3d5406..d188c99eecf 100644 --- a/xcm/xcm-emulator/README.md +++ b/xcm/xcm-emulator/README.md @@ -2,7 +2,7 @@ XCM-Emulator is a tool to emulate XCM program execution using pre-configured runtimes, including those used to run on live -networks, such as Kusama, Polkadot, Statemine et cetera. +networks, such as Kusama, Polkadot, Asset Hubs, et cetera. This allows for testing cross-chain message passing and verifying outcomes, weights, and side-effects. It is faster than spinning up a zombienet and as all the chains are in one process debugging using Clion is easy. diff --git a/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml b/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml index 7badbe51d63..4e1260f9e41 100644 --- a/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml +++ b/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml @@ -64,7 +64,7 @@ cumulus_based = true [[parachains]] id = 1000 -chain = "statemine-local" +chain = "asset-hub-kusama-local" cumulus_based = true [[parachains.collators]] diff --git a/zombienet/bridge-hubs/bridge_hub_wococo_local_network.toml b/zombienet/bridge-hubs/bridge_hub_wococo_local_network.toml index 53247b6fdc8..7dcc8dd7232 100644 --- a/zombienet/bridge-hubs/bridge_hub_wococo_local_network.toml +++ b/zombienet/bridge-hubs/bridge_hub_wococo_local_network.toml @@ -64,7 +64,7 @@ cumulus_based = true [[parachains]] id = 1000 -chain = "westmint-local" +chain = "asset-hub-westend-local" cumulus_based = true [[parachains.collators]] diff --git a/zombienet/examples/small_network.toml b/zombienet/examples/small_network.toml index ac5ee11e5bb..06ac0d0e5e7 100644 --- a/zombienet/examples/small_network.toml +++ b/zombienet/examples/small_network.toml @@ -14,7 +14,7 @@ chain = "rococo-local" [[parachains]] id = 2000 cumulus_based = true -chain = "statemine-local" +chain = "asset-hub-kusama-local" # run charlie as parachain collator [[parachains.collators]] diff --git a/zombienet/examples/statemine_kusama_local_network.toml b/zombienet/examples/statemine_kusama_local_network.toml index 01d1b0b2d21..1f3debfb9d2 100644 --- a/zombienet/examples/statemine_kusama_local_network.toml +++ b/zombienet/examples/statemine_kusama_local_network.toml @@ -21,7 +21,7 @@ chain = "kusama-local" [[parachains]] id = 1000 -chain = "statemine-local" +chain = "asset-hub-kusama-local" cumulus_based = true # run alice as parachain collator