"]
+ edition = "2021"
+ repository = "https://github.com/paritytech/parity-bridges-common.git"
+ license = "GPL-3.0-only"
+
[workspace]
resolver = "2"
diff --git a/cumulus/.github/ISSUE_TEMPLATE/release-client.md b/cumulus/.github/ISSUE_TEMPLATE/release-client.md
deleted file mode 100644
index bb7f206157674634e395631eb2434659c5ad026e..0000000000000000000000000000000000000000
--- a/cumulus/.github/ISSUE_TEMPLATE/release-client.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Release Checklist for Client
-about: Release Checklist for Client
-title: Release Checklist for Client {{ env.VERSION }}
----
-
-# Release Checklist - Client
-
-### Client Release
-
-- [ ] build a new `polkadot-parachain` binary and publish it to S3
-- [ ] new `polkadot-parachain` version has [run on the network](../../docs/release.md#burnin)
- without issue for at least 12h
-- [ ] a draft release has been created in the [Github Releases page](https://github.com/paritytech/cumulus/releases) with the relevant release-notes
-- [ ] the [build artifacts](../../docs/release.md#build-artifacts) have been added to the
- draft-release.
-
----
-
-Read more about the [release documentation](../../docs/release.md).
diff --git a/cumulus/.github/ISSUE_TEMPLATE/release-runtime.md b/cumulus/.github/ISSUE_TEMPLATE/release-runtime.md
deleted file mode 100644
index 0f3543759afd924ca6c74011ed6e64dc1e5005f4..0000000000000000000000000000000000000000
--- a/cumulus/.github/ISSUE_TEMPLATE/release-runtime.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-name: Release Checklist for Runtime
-about: Release Checklist for Runtime
-title: Release Checklist for Runtime {{ env.VERSION }}
----
-
-# Release Checklist - Runtimes
-
-**All** following checks must be completed before publishing a new release.
-The release process is owned and led by @paritytech/release-engineering team.
-The checks marked with :crab: are meant to be checked by [a runtime engineer](https://github.com/paritytech/cumulus/issues/1761).
-
-## Runtimes Release
-
-### Codebase
-These checks should be performed on the codebase.
-
-- [ ] the [`spec_version`](https://github.com/paritytech/cumulus/blob/master/docs/release.md#spec-version) has been incremented since the
- last release for any native runtimes from any existing use on public (non-private/test) networks
-- [ ] :crab: previously [completed migrations](https://github.com/paritytech/cumulus/blob/master/docs/release.md#old-migrations-removed) are removed for any public (non-private/test) networks
-- [ ] pallet and [extrinsic ordering](https://github.com/paritytech/cumulus/blob/master/docs/release.md#extrinsic-ordering--storage) as well as `SignedExtension`s have stayed
- the same. Bump `transaction_version` otherwise
-- [ ] the [benchmarks](https://github.com/paritytech/ci_cd/wiki/Benchmarks:-cumulus) ran
-- [ ] the weights have been updated for any modified runtime logic
-- [ ] :crab: the new weights are sane, there are no significant (>50%) drops or rises with no reason
-- [ ] :crab: XCM config is compatible with the configurations and versions of relevant interlocutors, like the Relay Chain.
-
-### On the release branch
-
-The following checks can be performed after we have forked off to the release-candidate branch or started an additional release candidate branch (rc-2, rc-3, etc)
-
-- [ ] Verify [new migrations](https://github.com/paritytech/cumulus/blob/master/docs/release.md#new-migrations) complete successfully, and the
- runtime state is correctly updated for any public (non-private/test)
- networks
-- [ ] Run [integration tests](https://github.com/paritytech/cumulus/blob/master/docs/release.md#integration-tests), and make sure they pass.
-- [ ] Push runtime upgrade to Asset Hub Westend and verify network stability
-- [ ] Push runtime upgrade to Collectives and verify network stability
-- [ ] Push runtime upgrade to Bridge-Hub-Kusama and verify network stability
-
-
-### Github
-
-- [ ] Check that a draft release has been created at the [Github Releases page](https://github.com/paritytech/cumulus/releases) with relevant [release
- notes](https://github.com/paritytech/cumulus/blob/master/docs/release.md#release-notes)
-- [ ] Check that [build artifacts](https://github.com/paritytech/cumulus/blob/master/docs/release.md#build-artifacts) have been added to the
- draft-release.
-
-# Post release
-
-- [ ] :crab: all commits (runtime version bumps, fixes) on this release branch have been merged back to master.
-
----
-
-Read more about the [release documentation](https://github.com/paritytech/cumulus/blob/master/docs/release.md).
diff --git a/cumulus/.github/workflows/release-50_publish-docker.yml b/cumulus/.github/workflows/release-50_publish-docker.yml
deleted file mode 100644
index 6ad943c3903ca597b38dedf64061e62a6c39cf6e..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/release-50_publish-docker.yml
+++ /dev/null
@@ -1,206 +0,0 @@
-name: Release - Publish Docker Image
-
-# This workflow listens to pubished releases or can be triggered manually.
-# It includes releases and rc candidates.
-# It fetches the binaries, checks sha256 and GPG
-# signatures, then builds an injected docker
-# image and publishes it.
-
-on:
- release:
- types:
- - published
- workflow_dispatch:
- inputs:
- release_id:
- description: |
- Release ID.
- You can find it using the command:
- curl -s \
- -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/$OWNER/$REPO/releases | \
- jq '.[] | { name: .name, id: .id }'
- required: true
- type: string
- image_type:
- description: Type of the image to be published
- required: true
- default: rc
- type: choice
- options:
- - rc
- - release
- registry:
- description: Container registry
- required: true
- type: string
- default: docker.io
- owner:
- description: Owner of the container image repo
- required: true
- type: string
- default: parity
-
-env:
- RELEASE_ID: ${{ inputs.release_id }}
- ENGINE: docker
- REGISTRY: ${{ inputs.registry }}
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- DOCKER_OWNER: ${{ inputs.owner || github.repository_owner }}
- REPO: ${{ github.repository }}
- BINARY: polkadot-parachain
- EVENT_ACTION: ${{ github.event.action }}
- EVENT_NAME: ${{ github.event_name }}
- IMAGE_TYPE: ${{ inputs.image_type }}
-
-jobs:
- fetch-artifacts:
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout sources
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-
- - name: Prepare temp folder
- run: |
- TMP=$(mktemp -d)
- echo "TMP=$TMP" >> "$GITHUB_ENV"
- pwd
- ls -al "$TMP"
-
- - name: Fetch lib.sh from polkadot repo
- working-directory: ${{ env.TMP }}
- run: |
- curl -O -L \
- -H "Accept: application/vnd.github.v3.raw" \
- https://raw.githubusercontent.com/paritytech/polkadot/master/scripts/ci/common/lib.sh
-
- chmod a+x lib.sh
- ls -al
-
- - name: Fetch release artifacts based on final release tag
- #this step runs only if the workflow is triggered automatically when new release is published
- if: ${{ env.EVENT_NAME == 'release' && env.EVENT_ACTION != '' && env.EVENT_ACTION == 'published' }}
- run: |
- mkdir -p release-artifacts && cd release-artifacts
-
- for f in $BINARY $BINARY.asc $BINARY.sha256; do
- URL="https://github.com/${{ github.event.repository.full_name }}/releases/download/${{ github.event.release.tag_name }}/$f"
- echo " - Fetching $f from $URL"
- wget "$URL" -O "$f"
- done
- chmod a+x $BINARY
- cp -f ${TMP}/lib.sh .
- ls -al
-
- - name: Fetch rc artifacts or release artifacts based on release id
- #this step runs only if the workflow is triggered manually
- if: ${{ env.EVENT_NAME == 'workflow_dispatch' }}
- run: |
- . ${TMP}/lib.sh
-
- fetch_release_artifacts
-
- chmod a+x release-artifacts/$BINARY
- ls -al
-
- cp -f ${TMP}/lib.sh release-artifacts/
-
- - name: Cache the artifacts
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
- with:
- key: artifacts-${{ github.sha }}
- path: |
- ./release-artifacts/**/*
-
- build-container:
- runs-on: ubuntu-latest
- needs: fetch-artifacts
-
- steps:
- - name: Checkout sources
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-
- - name: Get artifacts from cache
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
- with:
- key: artifacts-${{ github.sha }}
- fail-on-cache-miss: true
- path: |
- ./release-artifacts/**/*
-
- - name: Check sha256 ${{ env.BINARY }}
- working-directory: ./release-artifacts
- run: |
- . ./lib.sh
-
- echo "Checking binary $BINARY"
- check_sha256 $BINARY && echo "OK" || echo "ERR"
-
- - name: Check GPG ${{ env.BINARY }}
- working-directory: ./release-artifacts
- run: |
- . ./lib.sh
- import_gpg_keys
- check_gpg $BINARY
-
- - name: Build Injected Container image for ${{ env.BINARY }}
- env:
- IMAGE_NAME: ${{ env.BINARY }}
- OWNER: ${{ env.DOCKER_OWNER }}
- run: |
- ls -al
- echo "Building container for $BINARY"
- ./docker/scripts/build-injected-image.sh
-
- - name: Fetch rc commit and tag
- if: ${{ env.IMAGE_TYPE == 'rc' }}
- id: fetch_rc_refs
- run: |
- release=release-${{ inputs.release_id }} && \
- echo "release=${release}" >> $GITHUB_OUTPUT
-
- commit=$(git rev-parse --short HEAD) && \
- echo "commit=${commit}" >> $GITHUB_OUTPUT
-
- tag=$(git name-rev --tags --name-only $(git rev-parse HEAD)) && \
- [ "${tag}" != "undefined" ] && echo "tag=${tag}" >> $GITHUB_OUTPUT || \
- echo "No tag, doing without"
-
- - name: Fetch release tags
- if: ${{ env.IMAGE_TYPE == 'release' || env.EVENT_NAME == 'release' && env.EVENT_ACTION != '' && env.EVENT_ACTION == 'published' }}
- id: fetch_release_refs
- run: |
- VERSION=$(docker run --pull never --rm $DOCKER_OWNER/$BINARY --version | awk '{ print $2 }' )
- release=$( echo $VERSION | cut -f1 -d- )
- echo "tag=latest" >> $GITHUB_OUTPUT
- echo "release=${release}" >> $GITHUB_OUTPUT
-
-
- - name: Login to Dockerhub
- uses: docker/login-action@v2
- with:
- username: ${{ secrets.DOCKERHUB_USERNAME }}
- password: ${{ secrets.DOCKERHUB_TOKEN }}
-
- - name: Tag and Push Container image for ${{ env.BINARY }}
- id: docker_push
- env:
- TAGS: ${{ join(steps.fetch_rc_refs.outputs.*, ',') || join(steps.fetch_release_refs.outputs.*, ',') }}
- run: |
- TAGS=${TAGS[@]:-latest}
- IFS=',' read -r -a TAG_ARRAY <<< "$TAGS"
-
- echo "The image ${BINARY} will be tagged with ${TAG_ARRAY[*]}"
- for TAG in "${TAG_ARRAY[@]}"; do
- $ENGINE tag ${DOCKER_OWNER}/${BINARY} ${DOCKER_OWNER}/${BINARY}:${TAG}
- $ENGINE push ${DOCKER_OWNER}/${BINARY}:${TAG}
- done
-
- $ENGINE images | grep ${BINARY}
-
- - name: Check version for the published image for ${{ env.BINARY }}
- env:
- RELEASE_TAG: ${{ steps.fetch_rc_refs.outputs.release || steps.fetch_release_refs.outputs.release }}
- run: |
- echo "Checking tag ${RELEASE_TAG} for image ${REGISTRY}/${DOCKER_OWNER}/${BINARY}"
- $ENGINE run -i ${REGISTRY}/${DOCKER_OWNER}/${BINARY}:${RELEASE_TAG} --version
diff --git a/cumulus/CODEOWNERS b/cumulus/CODEOWNERS
deleted file mode 100644
index 3e5e8bd062dda4d1fd5675b49daaf7186b3a034e..0000000000000000000000000000000000000000
--- a/cumulus/CODEOWNERS
+++ /dev/null
@@ -1,23 +0,0 @@
-# Lists some code owners.
-#
-# A codeowner just oversees some part of the codebase. If an owned file is changed then the
-# corresponding codeowner receives a review request. An approval of the codeowner might be
-# required for merging a PR (depends on repository settings).
-#
-# For details about syntax, see:
-# https://help.github.com/en/articles/about-code-owners
-# But here are some important notes:
-#
-# - Glob syntax is git-like, e.g. `/core` means the core directory in the root, unlike `core`
-# which can be everywhere.
-# - Multiple owners are supported.
-# - Either handle (e.g, @github_user or @github/team) or email can be used. Keep in mind,
-# that handles might work better because they are more recognizable on GitHub,
-# eyou can use them for mentioning unlike an email.
-# - The latest matching rule, if multiple, takes precedence.
-
-# CI
-/.github/ @paritytech/ci @paritytech/release-engineering
-/.gitlab-ci.yml @paritytech/ci
-/scripts/ci/ @paritytech/ci @paritytech/release-engineering
-
diff --git a/cumulus/README.md b/cumulus/README.md
index 419e293a0abd3a032de6e591d60b7006c64aa628..19f9f3f113dd06655c418a4caf6b30a9cad6ee9f 100644
--- a/cumulus/README.md
+++ b/cumulus/README.md
@@ -2,59 +2,53 @@
[](https://paritytech.github.io/cumulus/)
-This repository contains both the Cumulus SDK and also specific chains implemented on top of this
-SDK.
+This repository contains both the Cumulus SDK and also specific chains implemented on top of this SDK.
-If you only want to run a **Polkadot Parachain Node**, check out our [container
-section](./docs/container.md).
+If you only want to run a **Polkadot Parachain Node**, check out our [container section](./docs/container.md).
## Cumulus SDK
-A set of tools for writing [Substrate](https://substrate.io/)-based
-[Polkadot](https://wiki.polkadot.network/en/)
-[parachains](https://wiki.polkadot.network/docs/en/learn-parachains). Refer to the included
-[overview](docs/overview.md) for architectural details, and the [Connect to a relay chain how-to
-guide](https://docs.substrate.io/reference/how-to-guides/parachains/connect-to-a-relay-chain/) for a
-guided walk-through of using these tools.
+A set of tools for writing [Substrate](https://substrate.io/)-based [Polkadot](https://wiki.polkadot.network/en/)
+[parachains](https://wiki.polkadot.network/docs/en/learn-parachains). Refer to the included [overview](docs/overview.md)
+for architectural details, and the [Connect to a relay chain how-to
+guide](https://docs.substrate.io/reference/how-to-guides/parachains/connect-to-a-relay-chain/) for a guided walk-through
+of using these tools.
-It's easy to write blockchains using Substrate, and the overhead of writing parachains'
-distribution, p2p, database, and synchronization layers should be just as low. This project aims to
-make it easy to write parachains for Polkadot by leveraging the power of Substrate.
+It's easy to write blockchains using Substrate, and the overhead of writing parachains' distribution, p2p, database, and
+synchronization layers should be just as low. This project aims to make it easy to write parachains for Polkadot by
+leveraging the power of Substrate.
-Cumulus clouds are shaped sort of like dots; together they form a system that is intricate,
-beautiful and functional.
+Cumulus clouds are shaped sort of like dots; together they form a system that is intricate, beautiful and functional.
### Consensus
[`parachain-consensus`](https://github.com/paritytech/polkadot-sdk/blob/master/cumulus/client/consensus/common/src/parachain_consensus.rs)
-is a [consensus engine](https://docs.substrate.io/v3/advanced/consensus) for Substrate that follows
-a Polkadot [relay chain](https://wiki.polkadot.network/docs/en/learn-architecture#relay-chain). This
-will run a Polkadot node internally, and dictate to the client and synchronization algorithms which
-chain to follow,
-[finalize](https://wiki.polkadot.network/docs/en/learn-consensus#probabilistic-vs-provable-finality),
-and treat as best.
+is a [consensus engine](https://docs.substrate.io/v3/advanced/consensus) for Substrate that follows a Polkadot [relay
+chain](https://wiki.polkadot.network/docs/en/learn-architecture#relay-chain). This will run a Polkadot node internally,
+and dictate to the client and synchronization algorithms which chain to follow,
+[finalize](https://wiki.polkadot.network/docs/en/learn-consensus#probabilistic-vs-provable-finality), and treat as best.
### Collator
-A Polkadot [collator](https://wiki.polkadot.network/docs/en/learn-collator) for the parachain is
-implemented by the `polkadot-parachain` binary (previously called `polkadot-collator`).
+A Polkadot [collator](https://wiki.polkadot.network/docs/en/learn-collator) for the parachain is implemented by the
+`polkadot-parachain` binary (previously called `polkadot-collator`).
-You may run `polkadot-parachain` locally after building it or using one of the container option
-described [here](./docs/container.md).
+You may run `polkadot-parachain` locally after building it or using one of the container option described
+[here](./docs/container.md).
-### Relay Chain Interaction
-To operate a parachain node, a connection to the corresponding relay
-chain is necessary. This can be achieved in one of three ways:
-1. Run a full relay chain node within the parachain node (default)
-2. Connect to an external relay chain node via WebSocket RPC
+### Relay Chain Interaction
+To operate a parachain node, a connection to the corresponding relay chain is necessary. This can be achieved in one of
+three ways:
+1. Run a full relay chain node within the parachain node (default)
+2. Connect to an external relay chain node via WebSocket RPC
3. Run a light client for the relay chain
#### In-process Relay Chain Node
-If an external relay chain node is not specified (default behavior), then a full relay chain node is
-spawned within the same process.
+If an external relay chain node is not specified (default behavior), then a full relay chain node is spawned within the
+same process.
-This node has all of the typical components of a regular Polkadot node and will have to fully sync
-with the relay chain to work.
+This node has all of the typical components of a regular Polkadot node and will have to fully sync with the relay chain
+to work.
##### Example command
```bash
@@ -66,19 +60,16 @@ polkadot-parachain \
```
#### External Relay Chain Node
-An external relay chain node is connected via WebsSocket RPC by using the
-`--relay-chain-rpc-urls` command line argument. This option accepts one or more
-space-separated WebSocket URLs to a full relay chain node. By default, only the
-first URL will be used, with the rest as a backup in case the connection to the
-first node is lost.
+An external relay chain node is connected via WebsSocket RPC by using the `--relay-chain-rpc-urls` command line
+argument. This option accepts one or more space-separated WebSocket URLs to a full relay chain node. By default, only
+the first URL will be used, with the rest as a backup in case the connection to the first node is lost.
-Parachain nodes using this feature won't have to fully sync with the relay chain
-to work, so in general they will use fewer system resources.
+Parachain nodes using this feature won't have to fully sync with the relay chain to work, so in general they will use
+fewer system resources.
-**Note:** At this time, any parachain nodes using this feature will still spawn a
-significantly cut-down relay chain node in-process. Even though they lack the
-majority of normal Polkadot subsystems, they will still need to connect directly
-to the relay chain network.
+**Note:** At this time, any parachain nodes using this feature will still spawn a significantly cut-down relay chain
+node in-process. Even though they lack the majority of normal Polkadot subsystems, they will still need to connect
+directly to the relay chain network.
##### Example command
@@ -94,17 +85,15 @@ polkadot-parachain \
```
#### Relay Chain Light Client
-An internal relay chain light client provides a fast and lightweight approach
-for connecting to the relay chain network. It provides relay chain notifications
-and facilitates runtime calls.
+An internal relay chain light client provides a fast and lightweight approach for connecting to the relay chain network.
+It provides relay chain notifications and facilitates runtime calls.
-To specify which chain the light client should connect to, users need to supply
-a relay chain chain-spec as part of the relay chain arguments.
+To specify which chain the light client should connect to, users need to supply a relay chain chain-spec as part of the
+relay chain arguments.
-**Note:** At this time, any parachain nodes using this feature will still spawn
-a significantly cut-down relay chain node in-process. Even though they lack the
-majority of normal Polkadot subsystems, they will still need to connect directly
-to the relay chain network.
+**Note:** At this time, any parachain nodes using this feature will still spawn a significantly cut-down relay chain
+node in-process. Even though they lack the majority of normal Polkadot subsystems, they will still need to connect
+directly to the relay chain network.
##### Example command
@@ -118,23 +107,22 @@ polkadot-parachain \
```
## Installation and Setup
-Before building Cumulus SDK based nodes / runtimes prepare your environment by
-following Substrate [installation instructions](https://docs.substrate.io/main-docs/install/).
+Before building Cumulus SDK based nodes / runtimes prepare your environment by following Substrate [installation
+instructions](https://docs.substrate.io/main-docs/install/).
-To launch a local network, you can use [zombienet](https://github.com/paritytech/zombienet)
-for quick setup and experimentation or follow the [manual setup](#manual-setup).
+To launch a local network, you can use [zombienet](https://github.com/paritytech/zombienet) for quick setup and
+experimentation or follow the [manual setup](#manual-setup).
### Zombienet
-We use Zombienet to spin up networks for integration tests and local networks.
-Follow [these installation steps](https://github.com/paritytech/zombienet#requirements-by-provider)
-to set it up on your machine. A simple network specification with two relay chain
-nodes and one collator is located at [zombienet/examples/small_network.toml](zombienet/examples/small_network.toml).
+We use Zombienet to spin up networks for integration tests and local networks. Follow [these installation
+steps](https://github.com/paritytech/zombienet#requirements-by-provider) to set it up on your machine. A simple network
+specification with two relay chain nodes and one collator is located at
+[zombienet/examples/small_network.toml](zombienet/examples/small_network.toml).
#### Which provider should I use?
Zombienet offers multiple providers to run networks. Choose the one that best fits your needs:
- **Podman:** Choose this if you want to spin up a network quick and easy.
-- **Native:** Choose this if you want to develop and deploy your changes. Requires compilation
-of the binaries.
+- **Native:** Choose this if you want to develop and deploy your changes. Requires compilation of the binaries.
- **Kubernetes:** Choose this for advanced use-cases or running on cloud-infrastructure.
#### How to run
@@ -183,13 +171,16 @@ cargo build --release --bin polkadot-parachain
./target/release/polkadot-parachain export-genesis-wasm > genesis-wasm
# Collator1
-./target/release/polkadot-parachain --collator --alice --force-authoring --tmp --port 40335 --rpc-port 9946 -- --chain ../polkadot/rococo-local-cfde.json --port 30335
+./target/release/polkadot-parachain --collator --alice --force-authoring \
+ --tmp --port 40335 --rpc-port 9946 -- --chain ../polkadot/rococo-local-cfde.json --port 30335
# Collator2
-./target/release/polkadot-parachain --collator --bob --force-authoring --tmp --port 40336 --rpc-port 9947 -- --chain ../polkadot/rococo-local-cfde.json --port 30336
+./target/release/polkadot-parachain --collator --bob --force-authoring \
+ --tmp --port 40336 --rpc-port 9947 -- --chain ../polkadot/rococo-local-cfde.json --port 30336
# Parachain Full Node 1
-./target/release/polkadot-parachain --tmp --port 40337 --rpc-port 9948 -- --chain ../polkadot/rococo-local-cfde.json --port 30337
+./target/release/polkadot-parachain --tmp --port 40337 --rpc-port 9948 -- \
+ --chain ../polkadot/rococo-local-cfde.json --port 30337
```
#### Register the parachain
@@ -199,8 +190,8 @@ cargo build --release --bin polkadot-parachain
## Asset Hub 🪙
-This repository also contains the Asset Hub runtimes. Asset Hub 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
@@ -228,20 +219,18 @@ See [the `contracts-rococo` readme](parachains/runtimes/contracts/contracts-roco
See [the `bridge-hubs` readme](parachains/runtimes/bridge-hubs/README.md) for details.
## Rococo 👑
-[Rococo](https://polkadot.js.org/apps/?rpc=wss://rococo-rpc.polkadot.io) is becoming a
-[Community Parachain Testbed](https://polkadot.network/blog/rococo-revamp-becoming-a-community-parachain-testbed/)
-for parachain teams in the Polkadot ecosystem. It supports multiple parachains with the
-differentiation of long-term connections and recurring short-term connections, to see
-which parachains are currently connected and how long they will be connected for
-[see here](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-rpc.polkadot.io#/parachains).
+[Rococo](https://polkadot.js.org/apps/?rpc=wss://rococo-rpc.polkadot.io) is becoming a [Community Parachain
+Testbed](https://polkadot.network/blog/rococo-revamp-becoming-a-community-parachain-testbed/) for parachain teams in the
+Polkadot ecosystem. It supports multiple parachains with the differentiation of long-term connections and recurring
+short-term connections, to see which parachains are currently connected and how long they will be connected for [see
+here](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-rpc.polkadot.io#/parachains).
-Rococo is an elaborate style of design and the name describes the painstaking effort that
-has gone into this project.
+Rococo is an elaborate style of design and the name describes the painstaking effort that has gone into this project.
### Build & Launch Rococo Collators
-Collators are similar to validators in the relay chain. These nodes build the blocks that
-will eventually be included by the relay chain for a parachain.
+Collators are similar to validators in the relay chain. These nodes build the blocks that will eventually be included by
+the relay chain for a parachain.
To run a Rococo collator you will need to compile the following binary:
@@ -250,8 +239,7 @@ To run a Rococo collator you will need to compile the following binary:
cargo build --release --locked --bin polkadot-parachain
```
-Once the executable is built, launch collators for each parachain (repeat once each for chain
-`tick`, `trick`, `track`):
+Once the executable is built, launch collators for each parachain (repeat once each for chain `tick`, `trick`, `track`):
```bash
./target/release/polkadot-parachain --chain $CHAIN --validator
@@ -261,10 +249,10 @@ You can also build [using a container](./docs/container.md).
### Parachains
-* [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)
+- [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)
-The network uses horizontal message passing (HRMP) to enable communication between
-parachains and the relay chain and, in turn, between parachains. This means that every
-message is sent to the relay chain, and from the relay chain to its destination parachain.
+The network uses horizontal message passing (HRMP) to enable communication between parachains and the relay chain and,
+in turn, between parachains. This means that every message is sent to the relay chain, and from the relay chain to its
+destination parachain.
diff --git a/cumulus/bridges/SECURITY.md b/cumulus/bridges/SECURITY.md
deleted file mode 100644
index 65f2f3bff05dd94786f7f3c8d084af2ca9fe236f..0000000000000000000000000000000000000000
--- a/cumulus/bridges/SECURITY.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Security Policy
-
-Thanks for helping make the Parity ecosystem more secure. Security is one of our first priorities.
-
-## Reporting a vulnerability
-
-If you find something that can be treated as a security vulnerability, please do not use the issue tracker or discuss it in the public forum as it can cause more damage, rather than giving real help to the ecosystem.
-
-Security vulnerabilities should be reported by the [contact form](https://security-submission.parity.io/).
-
-If you think that your report might be eligible for the Bug Bounty Program, please mark this during the submission. Please check up-to-date [Parity Bug Bounty Program rules](https://www.parity.io/bug-bounty) to find out the information about our Bug Bounty Program.
-
-**Warning**: This is an unified SECURITY.md file for Paritytech GitHub Organization. The presence of this file does not mean that this repository is covered by the Bug Bounty program. Please always check the Bug Bounty Program scope for information.
-
diff --git a/cumulus/bridges/docs/high-level-overview.md b/cumulus/bridges/docs/high-level-overview.md
deleted file mode 100644
index 449224124afd77a4e53d55e7cf6b3b9a65961802..0000000000000000000000000000000000000000
--- a/cumulus/bridges/docs/high-level-overview.md
+++ /dev/null
@@ -1,181 +0,0 @@
-# High-Level Bridge Documentation
-
-This document gives a brief, abstract description of main components that may be found in this repository.
-If you want to see how we're using them to build Rococo <> Wococo (Kusama <> Polkadot) bridge, please
-refer to the [Polkadot <> Kusama Bridge](./polkadot-kusama-bridge-overview.md).
-
-## Purpose
-
-This repo contains all components required to build a trustless connection between standalone Substrate chains,
-that are using GRANDPA finality, their parachains or any combination of those. On top of this connection, we
-offer a messaging pallet that provides means to organize messages exchange.
-
-On top of that layered infrastructure, anyone may build their own bridge applications - e.g. [XCM messaging](./polkadot-kusama-bridge-overview.md),
-[encoded calls messaging](https://github.com/paritytech/parity-bridges-common/releases/tag/encoded-calls-messaging) and so on.
-
-## Terminology
-
-Even though we support (and require) two-way bridging, the documentation will generally talk about
-a one-sided interaction. That's to say, we will only talk about syncing finality proofs and messages
-from a _source_ chain to a _target_ chain. This is because the two-sided interaction is really just the
-one-sided interaction with the source and target chains switched.
-
-The bridge has both on-chain (pallets) and offchain (relayers) components.
-
-## On-chain components
-
-On-chain bridge components are pallets that are deployed at the chain runtime. Finality pallets require
-deployment at the target chain, while messages pallet needs to be deployed at both, source
-and target chains.
-
-### Bridge GRANDPA Finality Pallet
-
-A GRANDPA light client of the source chain built into the target chain's runtime. It provides a "source of truth"
-about the source chain headers which have been finalized. This is useful for higher level applications.
-
-The pallet tracks current GRANDPA authorities set and only accepts finality proofs (GRANDPA justifications),
-generated by the current authorities set. The GRANDPA protocol itself requires current authorities set to
-generate explicit justification for the header that enacts next authorities set. Such headers and their finality
-proofs are called mandatory in the pallet and relayer pays no fee for such headers submission.
-
-The pallet does not require all headers to be imported or provided. The relayer itself chooses which headers
-he wants to submit (with the exception of mandatory headers).
-
-More: [pallet level documentation and code](../modules/grandpa/).
-
-### Bridge Parachains Finality Pallet
-
-Parachains are not supposed to have their own finality, so we can't use bridge GRANDPA pallet to verify their
-finality proofs. Instead, they rely on their relay chain finality. The parachain header is considered final,
-when it is accepted by the [`paras` pallet](https://github.com/paritytech/polkadot/tree/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras)
-at its relay chain. Obviously, the relay chain block, where it is accepted, must also be finalized by the relay
-chain GRANDPA gadget.
-
-That said, the bridge parachains pallet accepts storage proof of one or several parachain heads, inserted to the
-[`Heads`](https://github.com/paritytech/polkadot/blob/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras/mod.rs#L642)
-map of the [`paras` pallet](https://github.com/paritytech/polkadot/tree/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras).
-To verify this storage proof, the pallet uses relay chain header, imported earlier by the bridge GRANDPA pallet.
-
-The pallet may track multiple parachains at once and those parachains may use different primitives. So the
-parachain header decoding never happens at the pallet level. For maintaining the headers order, the pallet
-uses relay chain header number.
-
-More: [pallet level documentation and code](../modules/parachains/).
-
-### Bridge Messages Pallet
-
-The pallet is responsible for queuing messages at the source chain and receiving the messages proofs at the
-target chain. The messages are sent to the particular _lane_, where they are guaranteed to be received in the
-same order they are sent. The pallet supports many lanes.
-
-The lane has two ends. Outbound lane end is storing number of messages that have been sent and the number of
-messages that have been received. Inbound lane end stores the number of messages that have been received and
-also a map that maps messages to relayers that have delivered those messages to the target chain.
-
-The pallet has three main entrypoints:
-- the `send_message` may be used by the other runtime pallets to send the messages;
-- the `receive_messages_proof` is responsible for parsing the messages proof and handing messages over to the
-dispatch code;
-- the `receive_messages_delivery_proof` is responsible for parsing the messages delivery proof and rewarding
-relayers that have delivered the message.
-
-Many things are abstracted by the pallet:
-- the message itself may mean anything, the pallet doesn't care about its content;
-- the message dispatch happens during delivery, but it is decoupled from the pallet code;
-- the messages proof and messages delivery proof are verified outside of the pallet;
-- the relayers incentivization scheme is defined outside of the pallet.
-
-Outside of the messaging pallet, we have a set of adapters, where messages and delivery proofs are regular
-storage proofs. The proofs are generated at the bridged chain and require bridged chain finality. So messages
-pallet, in this case, depends on one of the finality pallets. The messages are XCM messages and we are using
-XCM executor to dispatch them on receival. You may find more info in [Polkadot <> Kusama Bridge](./polkadot-kusama-bridge-overview.md)
-document.
-
-More: [pallet level documentation and code](../modules/messages/).
-
-### Bridge Relayers Pallet
-
-The pallet is quite simple. It just registers relayer rewards and has an entrypoint to collect them. When
-the rewards are registered and the reward amount is configured outside of the pallet.
-
-More: [pallet level documentation and code](../modules/relayers/).
-
-## Offchain Components
-
-Offchain bridge components are separate processes, called relayers. Relayers are connected both to the
-source chain and target chain nodes. Relayers are reading state of the source chain, compare it to the
-state of the target chain and, if state at target chain needs to be updated, submits target chain
-transaction.
-
-### GRANDPA Finality Relay
-
-The task of relay is to submit source chain GRANDPA justifications and their corresponding headers to
-the Bridge GRANDPA Finality Pallet, deployed at the target chain. For that, the relay subscribes to
-the source chain GRANDPA justifications stream and submits every new justification it sees to the
-target chain GRANDPA light client. In addition, relay is searching for mandatory headers and
-submits their justifications - without that the pallet will be unable to move forward.
-
-More: [GRANDPA Finality Relay Sequence Diagram](./grandpa-finality-relay.html), [pallet level documentation and code](../relays/finality/).
-
-### Parachains Finality Relay
-
-The relay connects to the source _relay_ chain and the target chain nodes. It doesn't need to connect to the
-tracked parachain nodes. The relay looks at the [`Heads`](https://github.com/paritytech/polkadot/blob/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras/mod.rs#L642)
-map of the [`paras` pallet](https://github.com/paritytech/polkadot/tree/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras)
-in source chain, and compares the value with the best parachain head, stored in the bridge parachains pallet at
-the target chain. If new parachain head appears at the relay chain block `B`, the relay process **waits**
-until header `B` or one of its ancestors appears at the target chain. Once it is available, the storage
-proof of the map entry is generated and is submitted to the target chain.
-
-As its on-chain component (which requires bridge GRANDPA pallet to be deployed nearby), the parachains
-finality relay requires GRANDPA finality relay to be running in parallel. Without it, the header `B` or
-any of its children's finality at source won't be relayed at target, and target chain
-won't be able to verify generated storage proof.
-
-More: [Parachains Finality Relay Sequence Diagram](./parachains-finality-relay.html), [code](../relays/parachains/).
-
-### Messages Relay
-
-Messages relay is actually two relays that are running in a single process: messages delivery relay and
-delivery confirmation relay. Even though they are more complex and have many caveats, the overall algorithm
-is the same as in other relays.
-
-Message delivery relay connects to the source chain and looks at the outbound lane end, waiting until new
-messages are queued there. Once they appear at the source block `B`, the relay start waiting for the block
-`B` or its descendant appear at the target chain. Then the messages storage proof is generated and submitted
-to the bridge messages pallet at the target chain. In addition, the transaction may include the storage proof
-of the outbound lane state - that proves that relayer rewards have been paid and this data (map of relay
-accounts to the delivered messages) may be pruned from the inbound lane state at the target chain.
-
-Delivery confirmation relay connects to the target chain and starts watching the inbound lane end. When new
-messages are delivered to the target chain, the corresponding _source chain account_ is inserted to the
-map in the inbound lane data. Relay detects that, say, at the target chain block `B` and waits until that
-block or its descendant appears at the source chain. Once that happens, the relay crafts a storage proof of
-that data and sends it to the messages pallet, deployed at the source chain.
-
-As you can see, the messages relay also requires finality relay to be operating in parallel. Since messages
-relay submits transactions to both source and target chains, it requires both _source-to-target_ and
-_target-to-source_ finality relays. They can be GRANDPA finality relays or GRANDPA+parachains finality relays,
-depending on the type of connected chain.
-
-More: [Messages Relay Sequence Diagram](./messages-relay.html), [pallet level documentation and code](../relays/messages/).
-
-### Complex Relay
-
-Every relay transaction has its cost. The only transaction, that is "free" to relayer is when the mandatory
-GRANDPA header is submitted. The relay that feeds the bridge with every relay chain and/or parachain head it
-sees, will have to pay a (quite large) cost. And if no messages are sent through the bridge, that is just
-waste of money.
-
-We have a special relay mode, called _complex relay_, where relay mostly sleeps and only submits transactions
-that are required for the messages/confirmations delivery. This mode starts two message relays (in both
-directions). All required finality relays are also started in a special _on-demand_ mode. In this mode they
-do not submit any headers without special request. As always, the only exception is when GRANDPA finality
-relay sees the mandatory header - it is submitted without such request.
-
-The message relays are watching their lanes and when, at some block `B`, they see new messages/confirmations
-to be delivered, they are asking on-demand relays to relay this block `B`. On-demand relays does that and
-then message relay may perform its job. If on-demand relay is a parachain finality relay, it also runs its
-own on-demand GRANDPA relay, which is used to relay required relay chain headers.
-
-More: [Complex Relay Sequence Diagram](./complex-relay.html), [code](../relays/bin-substrate/src/cli/relay_headers_and_messages/).
diff --git a/cumulus/bridges/modules/messages/README.md b/cumulus/bridges/modules/messages/README.md
deleted file mode 100644
index b5250d0dca0b23be3943fecb3926be4ea7097be0..0000000000000000000000000000000000000000
--- a/cumulus/bridges/modules/messages/README.md
+++ /dev/null
@@ -1,242 +0,0 @@
-# Bridge Messages Pallet
-
-The messages pallet is used to deliver messages from source chain to target chain. Message is
-(almost) opaque to the module and the final goal is to hand message to the message dispatch
-mechanism.
-
-## Contents
-
-- [Overview](#overview)
-- [Message Workflow](#message-workflow)
-- [Integrating Message Lane Module into Runtime](#integrating-messages-module-into-runtime)
-- [Non-Essential Functionality](#non-essential-functionality)
-- [Weights of Module Extrinsics](#weights-of-module-extrinsics)
-
-## Overview
-
-Message lane is an unidirectional channel, where messages are sent from source chain to the target
-chain. At the same time, a single instance of messages module supports both outbound lanes and
-inbound lanes. So the chain where the module is deployed (this chain), may act as a source chain for
-outbound messages (heading to a bridged chain) and as a target chain for inbound messages (coming
-from a bridged chain).
-
-Messages module supports multiple message lanes. Every message lane is identified with a 4-byte
-identifier. Messages sent through the lane are assigned unique (for this lane) increasing integer
-value that is known as nonce ("number that can only be used once"). Messages that are sent over the
-same lane are guaranteed to be delivered to the target chain in the same order they're sent from
-the source chain. In other words, message with nonce `N` will be delivered right before delivering a
-message with nonce `N+1`.
-
-Single message lane may be seen as a transport channel for single application (onchain, offchain or
-mixed). At the same time the module itself never dictates any lane or message rules. In the end, it
-is the runtime developer who defines what message lane and message mean for this runtime.
-
-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 Polkadot <> Kusama Asset Hub communications. Other lanes may be used to
-bridge other parachains.
-
-## Message Workflow
-
-The pallet is not intended to be used by end users and provides no public calls to send the message.
-Instead, it provides runtime-internal method that allows other pallets (or other runtime code) to queue
-outbound messages.
-
-The message "appears" when some runtime code calls the `send_message()` method of the pallet.
-The submitter specifies the lane that they're willing to use and the message itself. If some fee must
-be paid for sending the message, it must be paid outside of the pallet. If a message passes all checks
-(that include, for example, message size check, disabled lane check, ...), the nonce is assigned and
-the message is stored in the module storage. The message is in an "undelivered" state now.
-
-We assume that there are external, offchain actors, called relayers, that are submitting module
-related transactions to both target and source chains. The pallet itself has no assumptions about
-relayers incentivization scheme, but it has some callbacks for paying rewards. See
-[Integrating Messages Module into runtime](#Integrating-Messages-Module-into-runtime)
-for details.
-
-Eventually, some relayer would notice this message in the "undelivered" state and it would decide to
-deliver this message. Relayer then crafts `receive_messages_proof()` transaction (aka delivery
-transaction) for the messages module instance, deployed at the target chain. Relayer provides
-its account id at the source chain, the proof of message (or several messages), the number of
-messages in the transaction and their cumulative dispatch weight. Once a transaction is mined, the
-message is considered "delivered".
-
-Once a message is delivered, the relayer may want to confirm delivery back to the source chain.
-There are two reasons why it would want to do that. The first is that we intentionally limit number
-of "delivered", but not yet "confirmed" messages at inbound lanes
-(see [What about other Constants in the Messages Module Configuration Trait](#What-about-other-Constants-in-the-Messages-Module-Configuration-Trait) for explanation).
-So at some point, the target chain may stop accepting new messages until relayers confirm some of
-these. The second is that if the relayer wants to be rewarded for delivery, it must prove the fact
-that it has actually delivered the message. And this proof may only be generated after the delivery
-transaction is mined. So relayer crafts the `receive_messages_delivery_proof()` transaction (aka
-confirmation transaction) for the messages module instance, deployed at the source chain. Once
-this transaction is mined, the message is considered "confirmed".
-
-The "confirmed" state is the final state of the message. But there's one last thing related to the
-message - the fact that it is now "confirmed" and reward has been paid to the relayer (or at least
-callback for this has been called), must be confirmed to the target chain. Otherwise, we may reach
-the limit of "unconfirmed" messages at the target chain and it will stop accepting new messages. So
-relayer sometimes includes a nonce of the latest "confirmed" message in the next
-`receive_messages_proof()` transaction, proving that some messages have been confirmed.
-
-## Integrating Messages Module into Runtime
-
-As it has been said above, the messages module supports both outbound and inbound message lanes.
-So if we will integrate a module in some runtime, it may act as the source chain runtime for
-outbound messages and as the target chain runtime for inbound messages. In this section, we'll
-sometimes refer to the chain we're currently integrating with, as "this chain" and the other
-chain as "bridged chain".
-
-Messages module doesn't simply accept transactions that are claiming that the bridged chain has
-some updated data for us. Instead of this, the module assumes that the bridged chain is able to
-prove that updated data in some way. The proof is abstracted from the module and may be of any kind.
-In our Substrate-to-Substrate bridge we're using runtime storage proofs. Other bridges may use
-transaction proofs, Substrate header digests or anything else that may be proved.
-
-**IMPORTANT NOTE**: everything below in this chapter describes details of the messages module
-configuration. But if you're interested in well-probed and relatively easy integration of two
-Substrate-based chains, you may want to look at the
-[bridge-runtime-common](../../bin/runtime-common/) crate. This crate is providing a lot of
-helpers for integration, which may be directly used from within your runtime. Then if you'll decide
-to change something in this scheme, get back here for detailed information.
-
-### General Information
-
-The messages module supports instances. Every module instance is supposed to bridge this chain
-and some bridged chain. To bridge with another chain, using another instance is suggested (this
-isn't forced anywhere in the code, though). Keep in mind, that the pallet may be used to build
-virtual channels between multiple chains, as we do in our [Polkadot <> Kusama bridge](../../docs/polkadot-kusama-bridge-overview.md).
-There, the pallet actually bridges only two parachains - Kusama Bridge Hub and Polkadot
-Bridge Hub. However, other Kusama and Polkadot parachains are able to send (XCM) messages to their
-Bridge Hubs. The messages will be delivered to the other side of the bridge and routed to the proper
-destination parachain within the bridged chain consensus.
-
-Message submitters may track message progress by inspecting module events. When Message is accepted,
-the `MessageAccepted` event is emitted. The event contains both message lane identifier and nonce that
-has been assigned to the message. When a message is delivered to the target chain, the `MessagesDelivered`
-event is emitted from the `receive_messages_delivery_proof()` transaction. The `MessagesDelivered` contains
-the message lane identifier and inclusive range of delivered message nonces.
-
-The pallet provides no means to get the result of message dispatch at the target chain. If that is
-required, it must be done outside of the pallet. For example, XCM messages, when dispatched, have
-special instructions to send some data back to the sender. Other dispatchers may use similar
-mechanism for that.
-### How to plug-in Messages Module to Send Messages to the Bridged Chain?
-
-The `pallet_bridge_messages::Config` trait has 3 main associated types that are used to work with
-outbound messages. The `pallet_bridge_messages::Config::TargetHeaderChain` defines how we see the
-bridged chain as the target for our outbound messages. It must be able to check that the bridged
-chain may accept our message - like that the message has size below maximal possible transaction
-size of the chain and so on. And when the relayer sends us a confirmation transaction, this
-implementation must be able to parse and verify the proof of messages delivery. Normally, you would
-reuse the same (configurable) type on all chains that are sending messages to the same bridged
-chain.
-
-The `pallet_bridge_messages::Config::LaneMessageVerifier` defines a single callback to verify outbound
-messages. The simplest callback may just accept all messages. But in this case you'll need to answer
-many questions first. Who will pay for the delivery and confirmation transaction? Are we sure that
-someone will ever deliver this message to the bridged chain? Are we sure that we don't bloat our
-runtime storage by accepting this message? What if the message is improperly encoded or has some
-fields set to invalid values? Answering all those (and similar) questions would lead to correct
-implementation.
-
-There's another thing to consider when implementing type for use in
-`pallet_bridge_messages::Config::LaneMessageVerifier`. It is whether we treat all message lanes
-identically, or they'll have different sets of verification rules? For example, you may reserve
-lane#1 for messages coming from some 'wrapped-token' pallet - then you may verify in your
-implementation that the origin is associated with this pallet. Lane#2 may be reserved for 'system'
-messages and you may charge zero fee for such messages. You may have some rate limiting for messages
-sent over the lane#3. Or you may just verify the same rules set for all outbound messages - it is
-all up to the `pallet_bridge_messages::Config::LaneMessageVerifier` implementation.
-
-The last type is the `pallet_bridge_messages::Config::DeliveryConfirmationPayments`. When confirmation
-transaction is received, we call the `pay_reward()` method, passing the range of delivered messages.
-You may use the [`pallet-bridge-relayers`](../relayers/) pallet and its
-[`DeliveryConfirmationPaymentsAdapter`](../relayers/src/payment_adapter.rs) adapter as a possible
-implementation. It allows you to pay fixed reward for relaying the message and some of its portion
-for confirming delivery.
-
-### I have a Messages Module in my Runtime, but I Want to Reject all Outbound Messages. What shall I do?
-
-You should be looking at the `bp_messages::source_chain::ForbidOutboundMessages` structure
-[`bp_messages::source_chain`](../../primitives/messages/src/source_chain.rs). It implements
-all required traits and will simply reject all transactions, related to outbound messages.
-
-### How to plug-in Messages Module to Receive Messages from the Bridged Chain?
-
-The `pallet_bridge_messages::Config` trait has 2 main associated types that are used to work with
-inbound messages. The `pallet_bridge_messages::Config::SourceHeaderChain` defines how we see the
-bridged chain as the source of our inbound messages. When relayer sends us a delivery transaction,
-this implementation must be able to parse and verify the proof of messages wrapped in this
-transaction. Normally, you would reuse the same (configurable) type on all chains that are sending
-messages to the same bridged chain.
-
-The `pallet_bridge_messages::Config::MessageDispatch` defines a way on how to dispatch delivered
-messages. Apart from actually dispatching the message, the implementation must return the correct
-dispatch weight of the message before dispatch is called.
-
-### I have a Messages Module in my Runtime, but I Want to Reject all Inbound Messages. What shall I do?
-
-You should be looking at the `bp_messages::target_chain::ForbidInboundMessages` structure from
-the [`bp_messages::target_chain`](../../primitives/messages/src/target_chain.rs) module. It
-implements all required traits and will simply reject all transactions, related to inbound messages.
-
-### What about other Constants in the Messages Module Configuration Trait?
-
-Two settings that are used to check messages in the `send_message()` function. The
-`pallet_bridge_messages::Config::ActiveOutboundLanes` is an array of all message lanes, that
-may be used to send messages. All messages sent using other lanes are rejected. All messages that have
-size above `pallet_bridge_messages::Config::MaximalOutboundPayloadSize` will also be rejected.
-
-To be able to reward the relayer for delivering messages, we store a map of message nonces range =>
-identifier of the relayer that has delivered this range at the target chain runtime storage. If a
-relayer delivers multiple consequent ranges, they're merged into single entry. So there may be more
-than one entry for the same relayer. Eventually, this whole map must be delivered back to the source
-chain to confirm delivery and pay rewards. So to make sure we are able to craft this confirmation
-transaction, we need to: (1) keep the size of this map below a certain limit and (2) make sure that
-the weight of processing this map is below a certain limit. Both size and processing weight mostly
-depend on the number of entries. The number of entries is limited with the
-`pallet_bridge_messages::ConfigMaxUnrewardedRelayerEntriesAtInboundLane` parameter. Processing weight
-also depends on the total number of messages that are being confirmed, because every confirmed
-message needs to be read. So there's another
-`pallet_bridge_messages::Config::MaxUnconfirmedMessagesAtInboundLane` parameter for that.
-
-When choosing values for these parameters, you must also keep in mind that if proof in your scheme
-is based on finality of headers (and it is the most obvious option for Substrate-based chains with
-finality notion), then choosing too small values for these parameters may cause significant delays
-in message delivery. That's because there are too many actors involved in this scheme: 1) authorities
-that are finalizing headers of the target chain need to finalize header with non-empty map; 2) the
-headers relayer then needs to submit this header and its finality proof to the source chain; 3) the
-messages relayer must then send confirmation transaction (storage proof of this map) to the source
-chain; 4) when the confirmation transaction will be mined at some header, source chain authorities
-must finalize this header; 5) the headers relay then needs to submit this header and its finality
-proof to the target chain; 6) only now the messages relayer may submit new messages from the source
-to target chain and prune the entry from the map.
-
-Delivery transaction requires the relayer to provide both number of entries and total number of
-messages in the map. This means that the module never charges an extra cost for delivering a map -
-the relayer would need to pay exactly for the number of entries+messages it has delivered. So the
-best guess for values of these parameters would be the pair that would occupy `N` percent of the
-maximal transaction size and weight of the source chain. The `N` should be large enough to process
-large maps, at the same time keeping reserve for future source chain upgrades.
-
-## Non-Essential Functionality
-
-There may be a special account in every runtime where the messages module is deployed. This
-account, named 'module owner', is like a module-level sudo account - he's able to halt and
-resume all module operations without requiring runtime upgrade. Calls that are related to this
-account are:
-- `fn set_owner()`: current module owner may call it to transfer "ownership" to another account;
-- `fn halt_operations()`: the module owner (or sudo account) may call this function to stop all
- module operations. After this call, all message-related transactions will be rejected until
- further `resume_operations` call'. This call may be used when something extraordinary happens with
- the bridge;
-- `fn resume_operations()`: module owner may call this function to resume bridge operations. The
- module will resume its regular operations after this call.
-
-If pallet owner is not defined, the governance may be used to make those calls.
-
-## Messages Relay
-
-We have an offchain actor, who is watching for new messages and submits them to the bridged chain.
-It is the messages relay - you may look at the [crate level documentation and the code](../../relays/messages/).
diff --git a/cumulus/bridges/rustfmt.toml b/cumulus/bridges/rustfmt.toml
deleted file mode 100644
index 082150daf04ee39ada660c315fd0f5bbcf99dea0..0000000000000000000000000000000000000000
--- a/cumulus/bridges/rustfmt.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Basic
-hard_tabs = true
-max_width = 100
-use_small_heuristics = "Max"
-# Imports
-imports_granularity = "Crate"
-reorder_imports = true
-# Consistency
-newline_style = "Unix"
-# Format comments
-comment_width = 100
-wrap_comments = true
-# Misc
-chain_width = 80
-spaces_around_ranges = false
-binop_separator = "Back"
-reorder_impl_items = false
-match_arm_leading_pipes = "Preserve"
-match_arm_blocks = false
-match_block_trailing_comma = true
-trailing_comma = "Vertical"
-trailing_semicolon = false
-use_field_init_shorthand = true
-
diff --git a/cumulus/client/cli/Cargo.toml b/cumulus/client/cli/Cargo.toml
index 6c44d5f5fd3b6631a7cfa0449d9d04adaa300a1f..c45b669fc6d1e58cad16dde5e45111fe5a9a74d4 100644
--- a/cumulus/client/cli/Cargo.toml
+++ b/cumulus/client/cli/Cargo.toml
@@ -5,7 +5,7 @@ authors.workspace = true
edition.workspace = true
[dependencies]
-clap = { version = "4.4.2", features = ["derive"] }
+clap = { version = "4.4.4", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0" }
url = "2.4.0"
diff --git a/cumulus/client/consensus/aura/src/collators/lookahead.rs b/cumulus/client/consensus/aura/src/collators/lookahead.rs
index 58d8e9d1a062f7538b498f34c1f510593d2f5412..57cd646fbcdef58fca265454eeeb677c35beee7b 100644
--- a/cumulus/client/consensus/aura/src/collators/lookahead.rs
+++ b/cumulus/client/consensus/aura/src/collators/lookahead.rs
@@ -34,7 +34,8 @@
use codec::{Codec, Encode};
use cumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use cumulus_client_consensus_common::{
- self as consensus_common, ParachainBlockImportMarker, ParentSearchParams,
+ self as consensus_common, load_abridged_host_configuration, ParachainBlockImportMarker,
+ ParentSearchParams,
};
use cumulus_client_consensus_proposer::ProposerInterface;
use cumulus_primitives_aura::AuraUnincludedSegmentApi;
@@ -44,11 +45,13 @@ use cumulus_primitives_core::{
use cumulus_relay_chain_interface::RelayChainInterface;
use polkadot_node_primitives::SubmitCollationParams;
-use polkadot_node_subsystem::messages::CollationGenerationMessage;
+use polkadot_node_subsystem::messages::{
+ CollationGenerationMessage, RuntimeApiMessage, RuntimeApiRequest,
+};
use polkadot_overseer::Handle as OverseerHandle;
use polkadot_primitives::{CollatorPair, Id as ParaId, OccupiedCoreAssumption};
-use futures::prelude::*;
+use futures::{channel::oneshot, prelude::*};
use sc_client_api::{backend::AuxStore, BlockBackend, BlockOf};
use sc_consensus::BlockImport;
use sc_consensus_aura::standalone as aura_internal;
@@ -180,6 +183,17 @@ where
while let Some(relay_parent_header) = import_notifications.next().await {
let relay_parent = relay_parent_header.hash();
+ if !is_para_scheduled(relay_parent, params.para_id, &mut params.overseer_handle).await {
+ tracing::trace!(
+ target: crate::LOG_TARGET,
+ ?relay_parent,
+ ?params.para_id,
+ "Para is not scheduled on any core, skipping import notification",
+ );
+
+ continue
+ }
+
let max_pov_size = match params
.relay_client
.persisted_validation_data(
@@ -416,16 +430,68 @@ where
Some(SlotClaim::unchecked::(author_pub, slot, timestamp))
}
+/// Reads allowed ancestry length parameter from the relay chain storage at the given relay parent.
+///
+/// Falls back to 0 in case of an error.
async fn max_ancestry_lookback(
- _relay_parent: PHash,
- _relay_client: &impl RelayChainInterface,
+ relay_parent: PHash,
+ relay_client: &impl RelayChainInterface,
) -> usize {
- // TODO [https://github.com/paritytech/cumulus/issues/2706]
- // We need to read the relay-chain state to know what the maximum
- // age truly is, but that depends on those pallets existing.
- //
- // For now, just provide the conservative value of '2'.
- // Overestimating can cause problems, as we'd be building on forks of the
- // chain that can never get included. Underestimating is less of an issue.
- 2
+ match load_abridged_host_configuration(relay_parent, relay_client).await {
+ Ok(Some(config)) => config.async_backing_params.allowed_ancestry_len as usize,
+ Ok(None) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ "Active config is missing in relay chain storage",
+ );
+ 0
+ },
+ Err(err) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ ?err,
+ ?relay_parent,
+ "Failed to read active config from relay chain client",
+ );
+ 0
+ },
+ }
+}
+
+// Checks if there exists a scheduled core for the para at the provided relay parent.
+//
+// Falls back to `false` in case of an error.
+async fn is_para_scheduled(
+ relay_parent: PHash,
+ para_id: ParaId,
+ overseer_handle: &mut OverseerHandle,
+) -> bool {
+ let (tx, rx) = oneshot::channel();
+ let request = RuntimeApiRequest::AvailabilityCores(tx);
+ overseer_handle
+ .send_msg(RuntimeApiMessage::Request(relay_parent, request), "LookaheadCollator")
+ .await;
+
+ let cores = match rx.await {
+ Ok(Ok(cores)) => cores,
+ Ok(Err(error)) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ ?error,
+ ?relay_parent,
+ "Failed to query availability cores runtime API",
+ );
+ return false
+ },
+ Err(oneshot::Canceled) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ ?relay_parent,
+ "Sender for availability cores runtime request dropped",
+ );
+ return false
+ },
+ };
+
+ cores.iter().any(|core| core.para_id() == Some(para_id))
}
diff --git a/cumulus/client/consensus/common/src/lib.rs b/cumulus/client/consensus/common/src/lib.rs
index edd97cf02a2557b372f3a88234267a0a4e639929..08bceabb2bd4a49ac8917e82caf1b97cd9eac183 100644
--- a/cumulus/client/consensus/common/src/lib.rs
+++ b/cumulus/client/consensus/common/src/lib.rs
@@ -20,8 +20,8 @@ use polkadot_primitives::{
};
use cumulus_primitives_core::{
- relay_chain::{BlockId as RBlockId, OccupiedCoreAssumption},
- ParaId,
+ relay_chain::{self, BlockId as RBlockId, OccupiedCoreAssumption},
+ AbridgedHostConfiguration, ParaId,
};
use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface};
@@ -211,6 +211,7 @@ pub trait ParachainBlockImportMarker {}
impl ParachainBlockImportMarker for ParachainBlockImport {}
/// Parameters when searching for suitable parents to build on top of.
+#[derive(Debug)]
pub struct ParentSearchParams {
/// The relay-parent that is intended to be used.
pub relay_parent: PHash,
@@ -228,6 +229,7 @@ pub struct ParentSearchParams {
}
/// A potential parent block returned from [`find_potential_parents`]
+#[derive(Debug, PartialEq)]
pub struct PotentialParent {
/// The hash of the block.
pub hash: B::Hash,
@@ -412,3 +414,18 @@ pub fn relay_slot_and_timestamp(
})
.ok()
}
+
+/// Reads abridged host configuration from the relay chain storage at the given relay parent.
+pub async fn load_abridged_host_configuration(
+ relay_parent: PHash,
+ relay_client: &impl RelayChainInterface,
+) -> Result, RelayChainError> {
+ relay_client
+ .get_storage_by_key(relay_parent, relay_chain::well_known_keys::ACTIVE_CONFIG)
+ .await?
+ .map(|bytes| {
+ AbridgedHostConfiguration::decode(&mut &bytes[..])
+ .map_err(RelayChainError::DeserializationError)
+ })
+ .transpose()
+}
diff --git a/cumulus/client/consensus/common/src/tests.rs b/cumulus/client/consensus/common/src/tests.rs
index 15586d81d9bfff8d177cf392c89a4c90606ad3bf..22d3dd3abd49dfbe4a0bb548ce4b2c35cf5ed839 100644
--- a/cumulus/client/consensus/common/src/tests.rs
+++ b/cumulus/client/consensus/common/src/tests.rs
@@ -19,7 +19,10 @@ use crate::*;
use async_trait::async_trait;
use codec::Encode;
use cumulus_client_pov_recovery::RecoveryKind;
-use cumulus_primitives_core::{relay_chain::BlockId, InboundDownwardMessage, InboundHrmpMessage};
+use cumulus_primitives_core::{
+ relay_chain::{self, BlockId},
+ CumulusDigestItem, InboundDownwardMessage, InboundHrmpMessage,
+};
use cumulus_relay_chain_interface::{
CommittedCandidateReceipt, OccupiedCoreAssumption, OverseerHandle, PHeader, ParaId,
RelayChainInterface, RelayChainResult, SessionIndex, StorageValue, ValidatorId,
@@ -42,12 +45,21 @@ use std::{
time::Duration,
};
+fn relay_block_num_from_hash(hash: &PHash) -> relay_chain::BlockNumber {
+ hash.to_low_u64_be() as u32
+}
+
+fn relay_hash_from_block_num(block_number: relay_chain::BlockNumber) -> PHash {
+ PHash::from_low_u64_be(block_number as u64)
+}
+
struct RelaychainInner {
new_best_heads: Option>,
finalized_heads: Option>,
new_best_heads_sender: mpsc::UnboundedSender,
finalized_heads_sender: mpsc::UnboundedSender,
relay_chain_hash_to_header: HashMap,
+ relay_chain_hash_to_header_pending: HashMap,
}
impl RelaychainInner {
@@ -61,6 +73,7 @@ impl RelaychainInner {
new_best_heads: Some(new_best_heads),
finalized_heads: Some(finalized_heads),
relay_chain_hash_to_header: Default::default(),
+ relay_chain_hash_to_header_pending: Default::default(),
}
}
}
@@ -110,20 +123,17 @@ impl RelayChainInterface for Relaychain {
&self,
hash: PHash,
_: ParaId,
- _: OccupiedCoreAssumption,
+ assumption: OccupiedCoreAssumption,
) -> RelayChainResult> {
- Ok(Some(PersistedValidationData {
- parent_head: self
- .inner
- .lock()
- .unwrap()
- .relay_chain_hash_to_header
- .get(&hash)
- .unwrap()
- .encode()
- .into(),
- ..Default::default()
- }))
+ let inner = self.inner.lock().unwrap();
+ let relay_to_header = match assumption {
+ OccupiedCoreAssumption::Included => &inner.relay_chain_hash_to_header_pending,
+ _ => &inner.relay_chain_hash_to_header,
+ };
+ let Some(parent_head) = relay_to_header.get(&hash).map(|head| head.encode().into()) else {
+ return Ok(None)
+ };
+ Ok(Some(PersistedValidationData { parent_head, ..Default::default() }))
}
async fn candidate_pending_availability(
@@ -135,7 +145,7 @@ impl RelayChainInterface for Relaychain {
}
async fn session_index_for_child(&self, _: PHash) -> RelayChainResult {
- unimplemented!("Not needed for test")
+ Ok(0)
}
async fn import_notification_stream(
@@ -210,8 +220,23 @@ impl RelayChainInterface for Relaychain {
.boxed())
}
- async fn header(&self, _block_id: BlockId) -> RelayChainResult> {
- unimplemented!("Not needed for test")
+ async fn header(&self, block_id: BlockId) -> RelayChainResult> {
+ let number = match block_id {
+ BlockId::Hash(hash) => relay_block_num_from_hash(&hash),
+ BlockId::Number(block_number) => block_number,
+ };
+ let parent_hash = number
+ .checked_sub(1)
+ .map(relay_hash_from_block_num)
+ .unwrap_or_else(|| PHash::zero());
+
+ Ok(Some(PHeader {
+ parent_hash,
+ number,
+ digest: sp_runtime::Digest::default(),
+ state_root: PHash::zero(),
+ extrinsics_root: PHash::zero(),
+ }))
}
}
@@ -238,6 +263,7 @@ fn build_block(
sproof: RelayStateSproofBuilder,
at: Option,
timestamp: Option,
+ relay_parent: Option,
) -> Block {
let builder = match at {
Some(at) => match timestamp {
@@ -249,10 +275,17 @@ fn build_block(
let mut block = builder.build().unwrap().block;
- // Simulate some form of post activity (like a Seal or Other generic things).
- // This is mostly used to exercise the `LevelMonitor` correct behavior.
- // (in practice we want that header post-hash != pre-hash)
- block.header.digest.push(sp_runtime::DigestItem::Other(vec![1, 2, 3]));
+ if let Some(relay_parent) = relay_parent {
+ block
+ .header
+ .digest
+ .push(CumulusDigestItem::RelayParent(relay_parent).to_digest_item());
+ } else {
+ // Simulate some form of post activity (like a Seal or Other generic things).
+ // This is mostly used to exercise the `LevelMonitor` correct behavior.
+ // (in practice we want that header post-hash != pre-hash)
+ block.header.digest.push(sp_runtime::DigestItem::Other(vec![1, 2, 3]));
+ }
block
}
@@ -292,13 +325,14 @@ fn build_and_import_block_ext>(
importer: &mut I,
at: Option,
timestamp: Option,
+ relay_parent: Option,
) -> Block {
let sproof = match at {
None => sproof_with_best_parent(client),
Some(at) => sproof_with_parent_by_hash(client, at),
};
- let block = build_block(client, sproof, at, timestamp);
+ let block = build_block(client, sproof, at, timestamp, relay_parent);
import_block_sync(importer, block.clone(), origin, import_as_best);
block
}
@@ -311,6 +345,7 @@ fn build_and_import_block(mut client: Arc, import_as_best: bool) -> Bloc
&mut client,
None,
None,
+ None,
)
}
@@ -372,7 +407,7 @@ fn follow_new_best_with_dummy_recovery_works() {
let header = client.header(best).ok().flatten().expect("No header for best");
sproof_with_parent(HeadData(header.encode()))
};
- let block = build_block(&*client, sproof, None, None);
+ let block = build_block(&*client, sproof, None, None, None);
let block_clone = block.clone();
let client_clone = client.clone();
@@ -638,6 +673,7 @@ fn prune_blocks_on_level_overflow() {
&mut para_import,
None,
None,
+ None,
);
let id0 = block0.header.hash();
@@ -650,6 +686,7 @@ fn prune_blocks_on_level_overflow() {
&mut para_import,
Some(id0),
Some(i as u64 * TIMESTAMP_MULTIPLIER),
+ None,
)
})
.collect::>();
@@ -664,6 +701,7 @@ fn prune_blocks_on_level_overflow() {
&mut para_import,
Some(id10),
Some(i as u64 * TIMESTAMP_MULTIPLIER),
+ None,
)
})
.collect::>();
@@ -692,6 +730,7 @@ fn prune_blocks_on_level_overflow() {
&mut para_import,
Some(id0),
Some(LEVEL_LIMIT as u64 * TIMESTAMP_MULTIPLIER),
+ None,
);
// Expected scenario
@@ -711,6 +750,7 @@ fn prune_blocks_on_level_overflow() {
&mut para_import,
Some(id0),
Some(2 * LEVEL_LIMIT as u64 * TIMESTAMP_MULTIPLIER),
+ None,
);
// Expected scenario
@@ -749,6 +789,7 @@ fn restore_limit_monitor() {
&mut para_import,
None,
None,
+ None,
);
let id00 = block00.header.hash();
@@ -761,6 +802,7 @@ fn restore_limit_monitor() {
&mut para_import,
Some(id00),
Some(i as u64 * TIMESTAMP_MULTIPLIER),
+ None,
)
})
.collect::>();
@@ -775,6 +817,7 @@ fn restore_limit_monitor() {
&mut para_import,
Some(id10),
Some(i as u64 * TIMESTAMP_MULTIPLIER),
+ None,
)
})
.collect::>();
@@ -809,6 +852,7 @@ fn restore_limit_monitor() {
&mut para_import,
Some(id00),
Some(LEVEL_LIMIT as u64 * TIMESTAMP_MULTIPLIER),
+ None,
);
// Expected scenario
@@ -830,3 +874,487 @@ fn restore_limit_monitor() {
}));
assert_eq!(*monitor.freshness.get(&block13.header.hash()).unwrap(), monitor.import_counter);
}
+
+#[test]
+fn find_potential_parents_in_allowed_ancestry() {
+ sp_tracing::try_init_simple();
+
+ let backend = Arc::new(Backend::new_test(1000, 1));
+ let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
+ let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+
+ let relay_parent = relay_hash_from_block_num(10);
+ let block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::Own,
+ true,
+ &mut para_import,
+ None,
+ None,
+ Some(relay_parent),
+ );
+
+ let relay_chain = Relaychain::new();
+ {
+ let included_map = &mut relay_chain.inner.lock().unwrap().relay_chain_hash_to_header;
+ included_map.insert(relay_parent, block.header().clone());
+ }
+
+ let potential_parents = block_on(find_potential_parents(
+ ParentSearchParams {
+ relay_parent,
+ para_id: ParaId::from(100),
+ ancestry_lookback: 0,
+ max_depth: 0,
+ ignore_alternative_branches: true,
+ },
+ &*backend,
+ &relay_chain,
+ ))
+ .unwrap();
+ assert_eq!(potential_parents.len(), 1);
+ let parent = &potential_parents[0];
+
+ assert_eq!(parent.hash, block.hash());
+ assert_eq!(&parent.header, block.header());
+ assert_eq!(parent.depth, 0);
+ assert!(parent.aligned_with_pending);
+
+ // New block is not pending or included.
+ let block_relay_parent = relay_hash_from_block_num(11);
+ let search_relay_parent = relay_hash_from_block_num(13);
+ {
+ let included_map = &mut relay_chain.inner.lock().unwrap().relay_chain_hash_to_header;
+ included_map.insert(search_relay_parent, block.header().clone());
+ }
+ let block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::Own,
+ true,
+ &mut para_import,
+ Some(block.header().hash()),
+ None,
+ Some(block_relay_parent),
+ );
+ let potential_parents = block_on(find_potential_parents(
+ ParentSearchParams {
+ relay_parent: search_relay_parent,
+ para_id: ParaId::from(100),
+ ancestry_lookback: 2,
+ max_depth: 1,
+ ignore_alternative_branches: true,
+ },
+ &*backend,
+ &relay_chain,
+ ))
+ .unwrap();
+
+ assert_eq!(potential_parents.len(), 2);
+ let parent = &potential_parents[1];
+
+ assert_eq!(parent.hash, block.hash());
+ assert_eq!(&parent.header, block.header());
+ assert_eq!(parent.depth, 1);
+ assert!(parent.aligned_with_pending);
+
+ // Reduce allowed ancestry.
+ let potential_parents = block_on(find_potential_parents(
+ ParentSearchParams {
+ relay_parent: search_relay_parent,
+ para_id: ParaId::from(100),
+ ancestry_lookback: 1,
+ max_depth: 1,
+ ignore_alternative_branches: true,
+ },
+ &*backend,
+ &relay_chain,
+ ))
+ .unwrap();
+ assert_eq!(potential_parents.len(), 1);
+ let parent = &potential_parents[0];
+ assert_ne!(parent.hash, block.hash());
+}
+
+/// Tests that pending availability block is always potential parent.
+#[test]
+fn find_potential_pending_parent() {
+ sp_tracing::try_init_simple();
+
+ let backend = Arc::new(Backend::new_test(1000, 1));
+ let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
+ let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+
+ let relay_parent = relay_hash_from_block_num(10);
+ let included_block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::Own,
+ true,
+ &mut para_import,
+ None,
+ None,
+ Some(relay_parent),
+ );
+ let relay_parent = relay_hash_from_block_num(12);
+ let pending_block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::Own,
+ true,
+ &mut para_import,
+ Some(included_block.header().hash()),
+ None,
+ Some(relay_parent),
+ );
+
+ let relay_chain = Relaychain::new();
+ let search_relay_parent = relay_hash_from_block_num(15);
+ {
+ let relay_inner = &mut relay_chain.inner.lock().unwrap();
+ relay_inner
+ .relay_chain_hash_to_header
+ .insert(search_relay_parent, included_block.header().clone());
+ relay_inner
+ .relay_chain_hash_to_header_pending
+ .insert(search_relay_parent, pending_block.header().clone());
+ }
+
+ let potential_parents = block_on(find_potential_parents(
+ ParentSearchParams {
+ relay_parent: search_relay_parent,
+ para_id: ParaId::from(100),
+ ancestry_lookback: 0,
+ max_depth: 1,
+ ignore_alternative_branches: true,
+ },
+ &*backend,
+ &relay_chain,
+ ))
+ .unwrap();
+ assert_eq!(potential_parents.len(), 2);
+ let included_parent = &potential_parents[0];
+
+ assert_eq!(included_parent.hash, included_block.hash());
+ assert_eq!(&included_parent.header, included_block.header());
+ assert_eq!(included_parent.depth, 0);
+ assert!(included_parent.aligned_with_pending);
+
+ let pending_parent = &potential_parents[1];
+
+ assert_eq!(pending_parent.hash, pending_block.hash());
+ assert_eq!(&pending_parent.header, pending_block.header());
+ assert_eq!(pending_parent.depth, 1);
+ assert!(pending_parent.aligned_with_pending);
+}
+
+#[test]
+fn find_potential_parents_with_max_depth() {
+ sp_tracing::try_init_simple();
+
+ const NON_INCLUDED_CHAIN_LEN: usize = 5;
+
+ let backend = Arc::new(Backend::new_test(1000, 1));
+ let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
+ let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+
+ let relay_parent = relay_hash_from_block_num(10);
+ let included_block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::Own,
+ true,
+ &mut para_import,
+ None,
+ None,
+ Some(relay_parent),
+ );
+
+ let relay_chain = Relaychain::new();
+ {
+ let included_map = &mut relay_chain.inner.lock().unwrap().relay_chain_hash_to_header;
+ included_map.insert(relay_parent, included_block.header().clone());
+ }
+
+ let mut blocks = Vec::new();
+ let mut parent = included_block.header().hash();
+ for _ in 0..NON_INCLUDED_CHAIN_LEN {
+ let block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::Own,
+ true,
+ &mut para_import,
+ Some(parent),
+ None,
+ Some(relay_parent),
+ );
+ parent = block.header().hash();
+ blocks.push(block);
+ }
+ for max_depth in 0..=NON_INCLUDED_CHAIN_LEN {
+ let potential_parents = block_on(find_potential_parents(
+ ParentSearchParams {
+ relay_parent,
+ para_id: ParaId::from(100),
+ ancestry_lookback: 0,
+ max_depth,
+ ignore_alternative_branches: true,
+ },
+ &*backend,
+ &relay_chain,
+ ))
+ .unwrap();
+ assert_eq!(potential_parents.len(), max_depth + 1);
+ let expected_parents: Vec<_> =
+ std::iter::once(&included_block).chain(blocks.iter().take(max_depth)).collect();
+
+ for i in 0..(max_depth + 1) {
+ let parent = &potential_parents[i];
+ let expected = &expected_parents[i];
+
+ assert_eq!(parent.hash, expected.hash());
+ assert_eq!(&parent.header, expected.header());
+ assert_eq!(parent.depth, i);
+ assert!(parent.aligned_with_pending);
+ }
+ }
+}
+
+#[test]
+fn find_potential_parents_aligned_with_pending() {
+ sp_tracing::try_init_simple();
+
+ const NON_INCLUDED_CHAIN_LEN: usize = 5;
+
+ let backend = Arc::new(Backend::new_test(1000, 1));
+ let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
+ let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+
+ let relay_parent = relay_hash_from_block_num(10);
+ // Choose different relay parent for alternative chain to get new hashes.
+ let search_relay_parent = relay_hash_from_block_num(11);
+ let included_block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::NetworkInitialSync,
+ true,
+ &mut para_import,
+ None,
+ None,
+ Some(relay_parent),
+ );
+ let pending_block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::Own,
+ true,
+ &mut para_import,
+ Some(included_block.header().hash()),
+ None,
+ Some(relay_parent),
+ );
+
+ let relay_chain = Relaychain::new();
+ {
+ let relay_inner = &mut relay_chain.inner.lock().unwrap();
+ relay_inner
+ .relay_chain_hash_to_header
+ .insert(search_relay_parent, included_block.header().clone());
+ relay_inner
+ .relay_chain_hash_to_header_pending
+ .insert(search_relay_parent, pending_block.header().clone());
+ }
+
+ // Build two sibling chains from the included block.
+ let mut aligned_blocks = Vec::new();
+ let mut parent = pending_block.header().hash();
+ for _ in 1..NON_INCLUDED_CHAIN_LEN {
+ let block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::Own,
+ true,
+ &mut para_import,
+ Some(parent),
+ None,
+ Some(relay_parent),
+ );
+ parent = block.header().hash();
+ aligned_blocks.push(block);
+ }
+
+ let mut alt_blocks = Vec::new();
+ let mut parent = included_block.header().hash();
+ for _ in 0..NON_INCLUDED_CHAIN_LEN {
+ let block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::NetworkInitialSync,
+ true,
+ &mut para_import,
+ Some(parent),
+ None,
+ Some(search_relay_parent),
+ );
+ parent = block.header().hash();
+ alt_blocks.push(block);
+ }
+
+ // Ignore alternative branch:
+ for max_depth in 0..=NON_INCLUDED_CHAIN_LEN {
+ let potential_parents = block_on(find_potential_parents(
+ ParentSearchParams {
+ relay_parent: search_relay_parent,
+ para_id: ParaId::from(100),
+ ancestry_lookback: 1, // aligned chain is in ancestry.
+ max_depth,
+ ignore_alternative_branches: true,
+ },
+ &*backend,
+ &relay_chain,
+ ))
+ .unwrap();
+ assert_eq!(potential_parents.len(), max_depth + 1);
+ let expected_parents: Vec<_> = [&included_block, &pending_block]
+ .into_iter()
+ .chain(aligned_blocks.iter())
+ .take(max_depth + 1)
+ .collect();
+
+ for i in 0..(max_depth + 1) {
+ let parent = &potential_parents[i];
+ let expected = &expected_parents[i];
+
+ assert_eq!(parent.hash, expected.hash());
+ assert_eq!(&parent.header, expected.header());
+ assert_eq!(parent.depth, i);
+ assert!(parent.aligned_with_pending);
+ }
+ }
+
+ // Do not ignore:
+ for max_depth in 0..=NON_INCLUDED_CHAIN_LEN {
+ let potential_parents = block_on(find_potential_parents(
+ ParentSearchParams {
+ relay_parent: search_relay_parent,
+ para_id: ParaId::from(100),
+ ancestry_lookback: 1, // aligned chain is in ancestry.
+ max_depth,
+ ignore_alternative_branches: false,
+ },
+ &*backend,
+ &relay_chain,
+ ))
+ .unwrap();
+
+ let expected_len = 2 * max_depth + 1;
+ assert_eq!(potential_parents.len(), expected_len);
+ let expected_aligned: Vec<_> = [&included_block, &pending_block]
+ .into_iter()
+ .chain(aligned_blocks.iter())
+ .take(max_depth + 1)
+ .collect();
+ let expected_alt = alt_blocks.iter().take(max_depth);
+
+ let expected_parents: Vec<_> =
+ expected_aligned.clone().into_iter().chain(expected_alt).collect();
+ // Check correctness.
+ assert_eq!(expected_parents.len(), expected_len);
+
+ for i in 0..expected_len {
+ let parent = &potential_parents[i];
+ let expected = expected_parents
+ .iter()
+ .find(|block| block.header().hash() == parent.hash)
+ .expect("missing parent");
+
+ let is_aligned = expected_aligned.contains(&expected);
+
+ assert_eq!(parent.hash, expected.hash());
+ assert_eq!(&parent.header, expected.header());
+
+ assert_eq!(parent.aligned_with_pending, is_aligned);
+ }
+ }
+}
+
+/// Tests that no potential parent gets discarded if there's no pending availability block.
+#[test]
+fn find_potential_parents_aligned_no_pending() {
+ sp_tracing::try_init_simple();
+
+ const NON_INCLUDED_CHAIN_LEN: usize = 5;
+
+ let backend = Arc::new(Backend::new_test(1000, 1));
+ let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
+ let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+
+ let relay_parent = relay_hash_from_block_num(10);
+ // Choose different relay parent for alternative chain to get new hashes.
+ let search_relay_parent = relay_hash_from_block_num(11);
+ let included_block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::Own,
+ true,
+ &mut para_import,
+ None,
+ None,
+ Some(relay_parent),
+ );
+
+ let relay_chain = Relaychain::new();
+ {
+ let included_map = &mut relay_chain.inner.lock().unwrap().relay_chain_hash_to_header;
+ included_map.insert(search_relay_parent, included_block.header().clone());
+ }
+
+ // Build two sibling chains from the included block.
+ let mut parent = included_block.header().hash();
+ for _ in 0..NON_INCLUDED_CHAIN_LEN {
+ let block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::Own,
+ true,
+ &mut para_import,
+ Some(parent),
+ None,
+ Some(relay_parent),
+ );
+ parent = block.header().hash();
+ }
+
+ let mut parent = included_block.header().hash();
+ for _ in 0..NON_INCLUDED_CHAIN_LEN {
+ let block = build_and_import_block_ext(
+ &client,
+ BlockOrigin::NetworkInitialSync,
+ true,
+ &mut para_import,
+ Some(parent),
+ None,
+ Some(search_relay_parent),
+ );
+ parent = block.header().hash();
+ }
+
+ for max_depth in 0..=NON_INCLUDED_CHAIN_LEN {
+ let potential_parents_aligned = block_on(find_potential_parents(
+ ParentSearchParams {
+ relay_parent: search_relay_parent,
+ para_id: ParaId::from(100),
+ ancestry_lookback: 1, // aligned chain is in ancestry.
+ max_depth,
+ ignore_alternative_branches: true,
+ },
+ &*backend,
+ &relay_chain,
+ ))
+ .unwrap();
+ let potential_parents = block_on(find_potential_parents(
+ ParentSearchParams {
+ relay_parent: search_relay_parent,
+ para_id: ParaId::from(100),
+ ancestry_lookback: 1,
+ max_depth,
+ ignore_alternative_branches: false,
+ },
+ &*backend,
+ &relay_chain,
+ ))
+ .unwrap();
+ assert_eq!(potential_parents.len(), 2 * max_depth + 1);
+ assert_eq!(potential_parents, potential_parents_aligned);
+ }
+}
diff --git a/cumulus/client/consensus/proposer/Cargo.toml b/cumulus/client/consensus/proposer/Cargo.toml
index f7edbc695e3864dc21c8b34a4eab7087998b1e6e..29720a8f4791124536095ffba44189762de47f90 100644
--- a/cumulus/client/consensus/proposer/Cargo.toml
+++ b/cumulus/client/consensus/proposer/Cargo.toml
@@ -8,7 +8,7 @@ edition.workspace = true
[dependencies]
anyhow = "1.0"
async-trait = "0.1.73"
-thiserror = "1.0.47"
+thiserror = "1.0.48"
# Substrate
sp-consensus = { path = "../../../../substrate/primitives/consensus/common" }
diff --git a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
index c198b22cad4a8bd0bed0bafd1ba5993cff54b733..39eda5075e29e9477ced48a37db3d45e00c67705 100644
--- a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
@@ -37,7 +37,7 @@ sp-keyring = { path = "../../../substrate/primitives/keyring" }
# Polkadot
polkadot-primitives = { path = "../../../polkadot/primitives" }
polkadot-test-client = { path = "../../../polkadot/node/test/client" }
-metered = { package = "prioritized-metered-channel", version = "0.2.0" }
+metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features=["futures_channel"] }
# Cumulus
cumulus-test-service = { path = "../../test/service" }
diff --git a/cumulus/client/relay-chain-interface/Cargo.toml b/cumulus/client/relay-chain-interface/Cargo.toml
index b81cc1b4780761fa86ca819653b90159f19749e9..3da7ab0b0e8212d7a05d972ca3fb7c82a0955bd3 100644
--- a/cumulus/client/relay-chain-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-interface/Cargo.toml
@@ -16,6 +16,6 @@ sc-client-api = { path = "../../../substrate/client/api" }
futures = "0.3.28"
async-trait = "0.1.73"
-thiserror = "1.0.47"
+thiserror = "1.0.48"
jsonrpsee-core = "0.16.2"
parity-scale-codec = "3.6.4"
diff --git a/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs b/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
index 491758c1329a3427f9e206b8f118053cb4f304bf..bea2fc330a24e3c9875f2359cde5f4388de0e6ae 100644
--- a/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
@@ -36,13 +36,14 @@ use polkadot_node_network_protocol::{
use polkadot_node_subsystem_util::metrics::{prometheus::Registry, Metrics};
use polkadot_overseer::{
BlockInfo, DummySubsystem, Handle, Overseer, OverseerConnector, OverseerHandle, SpawnGlue,
- KNOWN_LEAVES_CACHE_SIZE,
+ UnpinHandle, KNOWN_LEAVES_CACHE_SIZE,
};
use polkadot_primitives::CollatorPair;
use sc_authority_discovery::Service as AuthorityDiscoveryService;
use sc_network::NetworkStateInfo;
use sc_service::TaskManager;
+use sc_utils::mpsc::tracing_unbounded;
use sp_runtime::traits::Block as BlockT;
use cumulus_primitives_core::relay_chain::{Block, Hash as PHash};
@@ -221,20 +222,25 @@ async fn forward_collator_events(
) -> Result<(), RelayChainError> {
let mut finality = client.finality_notification_stream().await?.fuse();
let mut imports = client.import_notification_stream().await?.fuse();
+ // Collators do no need to pin any specific blocks
+ let (dummy_sink, _) = tracing_unbounded("does-not-matter", 42);
+ let dummy_unpin_handle = UnpinHandle::new(Default::default(), dummy_sink);
loop {
select! {
f = finality.next() => {
match f {
Some(header) => {
+ let hash = header.hash();
tracing::info!(
target: "minimal-polkadot-node",
"Received finalized block via RPC: #{} ({} -> {})",
header.number,
header.parent_hash,
- header.hash()
+ hash,
);
- let block_info = BlockInfo { hash: header.hash(), parent_hash: header.parent_hash, number: header.number };
+ let unpin_handle = dummy_unpin_handle.clone();
+ let block_info = BlockInfo { hash, parent_hash: header.parent_hash, number: header.number, unpin_handle };
handle.block_finalized(block_info).await;
}
None => return Err(RelayChainError::GenericError("Relay chain finality stream ended.".to_string())),
@@ -243,14 +249,16 @@ async fn forward_collator_events(
i = imports.next() => {
match i {
Some(header) => {
+ let hash = header.hash();
tracing::info!(
target: "minimal-polkadot-node",
"Received imported block via RPC: #{} ({} -> {})",
header.number,
header.parent_hash,
- header.hash()
+ hash,
);
- let block_info = BlockInfo { hash: header.hash(), parent_hash: header.parent_hash, number: header.number };
+ let unpin_handle = dummy_unpin_handle.clone();
+ let block_info = BlockInfo { hash, parent_hash: header.parent_hash, number: header.number, unpin_handle };
handle.block_imported(block_info).await;
}
None => return Err(RelayChainError::GenericError("Relay chain import stream ended.".to_string())),
diff --git a/cumulus/client/relay-chain-rpc-interface/Cargo.toml b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
index 9797c512505ce38ac4dcb60466403a80d0f78a29..0f09377e106ce4274ddf0d59028476af3127a51b 100644
--- a/cumulus/client/relay-chain-rpc-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
@@ -32,12 +32,12 @@ jsonrpsee = { version = "0.16.2", features = ["ws-client"] }
tracing = "0.1.37"
async-trait = "0.1.73"
url = "2.4.0"
-serde_json = "1.0.105"
+serde_json = "1.0.107"
serde = "1.0.188"
schnellru = "0.2.1"
smoldot = { version = "0.11.0", default_features = false, features = ["std"]}
smoldot-light = { version = "0.9.0", default_features = false, features = ["std"] }
either = "1.8.1"
-thiserror = "1.0.38"
+thiserror = "1.0.48"
rand = "0.8.5"
pin-project = "1.1.3"
diff --git a/cumulus/client/service/src/lib.rs b/cumulus/client/service/src/lib.rs
index 211a5cc3b79bc7b8d59aed9300b0a442f5372de8..82890666ebae3f197e291019d215ea9d446ef71f 100644
--- a/cumulus/client/service/src/lib.rs
+++ b/cumulus/client/service/src/lib.rs
@@ -484,6 +484,7 @@ where
import_queue,
block_announce_validator_builder: Some(Box::new(move |_| block_announce_validator)),
warp_sync_params,
+ block_relay: None,
})
}
diff --git a/cumulus/docker/docker-compose.yml b/cumulus/docker/docker-compose.yml
deleted file mode 100644
index 8344ad43bb4cbac17b5b3f1d7cc5de9264f36050..0000000000000000000000000000000000000000
--- a/cumulus/docker/docker-compose.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-version: '3.7'
-services:
- node_alice:
- image: "polkadot:${BRANCH:-cumulus-branch}"
- ports:
- - "30333:30333"
- - "9933:9933"
- - "9944:9944"
- volumes:
- - "polkadot-data-alice:/data"
- - type: bind
- source: ./test/parachain/chain-specs/polkadot_chainspec.json
- target: /chainspec.json
- read_only: true
- command: >
- polkadot
- --chain=/chainspec.json
- --base-path=/data
- --port 30333
- --rpc-port 9933
- --ws-port 9944
- --rpc-external
- --rpc-cors all
- --ws-external
- --alice
- networks:
- testing_net:
- ipv4_address: 172.28.1.1
- aliases:
- - alice
-
- node_bob:
- image: "polkadot:${BRANCH:-cumulus-branch}"
- ports:
- - "30344:30333"
- - "9935:9933"
- - "9945:9944"
- volumes:
- - "polkadot-data-bob:/data"
- - type: bind
- source: ./test/parachain/chain-specs/polkadot_chainspec.json
- target: /chainspec.json
- read_only: true
- command: >
- polkadot
- --chain=/chainspec.json
- --base-path=/data
- --port 30333
- --rpc-port 9933
- --ws-port 9944
- --rpc-external
- --ws-external
- --rpc-cors all
- --bob
- networks:
- testing_net:
- ipv4_address: 172.28.1.2
- aliases:
- - bob
-
- genesis_state:
- build:
- context: .
- dockerfile: ./docker/test-parachain-collator.dockerfile
- image: "ctpc:latest"
- volumes:
- - "genesis-state:/data"
- command: >
- polkadot-parachain
- export-genesis-state
- /data/genesis-state
-
- collator:
- build:
- context: .
- dockerfile: ./docker/test-parachain-collator.dockerfile
- target: collator
- image: "ctpc:collator"
- volumes:
- - "collator-data:/data"
- depends_on:
- - node_alice
- - node_bob
- command: >
- inject_bootnodes.sh
- --base-path=/data
- networks:
- testing_net:
-
- runtime:
- build:
- context: .
- dockerfile: ./docker/test-parachain-collator.dockerfile
- target: runtime
- image: "ctpc:runtime"
- volumes:
- - "parachain-runtime:/runtime"
-
-
- registrar:
- build:
- context: .
- dockerfile: ./docker/parachain-registrar.dockerfile
- image: para-reg:latest
- volumes:
- - "genesis-state:/genesis"
- - "parachain-runtime:/runtime"
- depends_on:
- - node_alice
- - runtime
- - genesis_state
- networks:
- testing_net:
-
-
-volumes:
- polkadot-data-alice:
- polkadot-data-bob:
- collator-data:
- genesis-state:
- parachain-runtime:
-
-
-networks:
- testing_net:
- ipam:
- driver: default
- config:
- - subnet: 172.28.0.0/16
diff --git a/cumulus/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile b/cumulus/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile
deleted file mode 100644
index a2e32049f5bb4fccb3d7bf1ce3b04ffea69fd9e4..0000000000000000000000000000000000000000
--- a/cumulus/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile
+++ /dev/null
@@ -1,49 +0,0 @@
-FROM docker.io/library/ubuntu:20.04
-
-# metadata
-ARG VCS_REF
-ARG BUILD_DATE
-ARG IMAGE_NAME
-
-LABEL io.parity.image.authors="devops-team@parity.io" \
- io.parity.image.vendor="Parity Technologies" \
- io.parity.image.title="${IMAGE_NAME}" \
- io.parity.image.description="Cumulus, the Polkadot collator." \
- io.parity.image.source="https://github.com/paritytech/cumulus/blob/${VCS_REF}/scripts/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile" \
- io.parity.image.revision="${VCS_REF}" \
- io.parity.image.created="${BUILD_DATE}" \
- io.parity.image.documentation="https://github.com/paritytech/cumulus/"
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# install tools and dependencies
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get install -y \
- libssl1.1 \
- ca-certificates \
- curl && \
- # apt cleanup
- apt-get autoremove -y && \
- apt-get clean && \
- find /var/lib/apt/lists/ -type f -not -name lock -delete; \
- # add user and link ~/.local/share/polkadot-parachain to /data
- useradd -m -u 10000 -U -s /bin/sh -d /polkadot-parachain polkadot-parachain && \
- mkdir -p /data /polkadot-parachain/.local/share && \
- chown -R polkadot-parachain:polkadot-parachain /data && \
- ln -s /data /polkadot-parachain/.local/share/polkadot-parachain && \
- mkdir -p /specs
-
-# add polkadot-parachain binary to the docker image
-COPY ./artifacts/polkadot-parachain /usr/local/bin
-COPY ./parachains/chain-specs/*.json /specs/
-
-USER polkadot-parachain
-
-# check if executable works in this container
-RUN /usr/local/bin/polkadot-parachain --version
-
-EXPOSE 30333 9933 9944
-VOLUME ["/polkadot-parachain"]
-
-ENTRYPOINT ["/usr/local/bin/polkadot-parachain"]
diff --git a/cumulus/docker/polkadot-parachain_builder.Containerfile b/cumulus/docker/polkadot-parachain_builder.Containerfile
deleted file mode 100644
index 159bcb323693865d924b93d674af770f8a6bdf41..0000000000000000000000000000000000000000
--- a/cumulus/docker/polkadot-parachain_builder.Containerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
-# This is the build stage for polkadot-parachain. Here we create the binary in a temporary image.
-FROM docker.io/paritytech/ci-linux:production as builder
-
-WORKDIR /cumulus
-COPY . /cumulus
-
-RUN cargo build --release --locked -p polkadot-parachain
-
-# This is the 2nd stage: a very small image where we copy the Polkadot binary."
-FROM docker.io/library/ubuntu:20.04
-
-LABEL io.parity.image.type="builder" \
- io.parity.image.authors="devops-team@parity.io" \
- io.parity.image.vendor="Parity Technologies" \
- io.parity.image.description="Multistage Docker image for polkadot-parachain" \
- io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot/polkadot-parachain_builder.Dockerfile" \
- io.parity.image.documentation="https://github.com/paritytech/cumulus"
-
-COPY --from=builder /cumulus/target/release/polkadot-parachain /usr/local/bin
-
-RUN useradd -m -u 1000 -U -s /bin/sh -d /cumulus polkadot-parachain && \
- mkdir -p /data /cumulus/.local/share && \
- chown -R polkadot-parachain:polkadot-parachain /data && \
- ln -s /data /cumulus/.local/share/polkadot-parachain && \
-# unclutter and minimize the attack surface
- rm -rf /usr/bin /usr/sbin && \
-# check if executable works in this container
- /usr/local/bin/polkadot-parachain --version
-
-USER polkadot-parachain
-
-EXPOSE 30333 9933 9944 9615
-VOLUME ["/data"]
-
-ENTRYPOINT ["/usr/local/bin/polkadot-parachain"]
diff --git a/cumulus/docker/test-parachain_injected.Dockerfile b/cumulus/docker/test-parachain_injected.Dockerfile
deleted file mode 100644
index 6056c504604e3be218b123791065624c32f4e87a..0000000000000000000000000000000000000000
--- a/cumulus/docker/test-parachain_injected.Dockerfile
+++ /dev/null
@@ -1,49 +0,0 @@
-FROM docker.io/library/ubuntu:20.04
-
-# metadata
-ARG VCS_REF
-ARG BUILD_DATE
-ARG IMAGE_NAME
-
-LABEL io.parity.image.authors="devops-team@parity.io" \
- io.parity.image.vendor="Parity Technologies" \
- io.parity.image.title="${IMAGE_NAME}" \
- io.parity.image.description="Test parachain for Zombienet" \
- io.parity.image.source="https://github.com/paritytech/cumulus/blob/${VCS_REF}/docker/test-parachain_injected.Dockerfile" \
- io.parity.image.revision="${VCS_REF}" \
- io.parity.image.created="${BUILD_DATE}" \
- io.parity.image.documentation="https://github.com/paritytech/cumulus/"
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# install tools and dependencies
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get install -y \
- libssl1.1 \
- ca-certificates \
- curl && \
- # apt cleanup
- apt-get autoremove -y && \
- apt-get clean && \
- find /var/lib/apt/lists/ -type f -not -name lock -delete; \
- # add user and link ~/.local/share/test-parachain to /data
- useradd -m -u 10000 -U -s /bin/sh -d /test-parachain test-parachain && \
- mkdir -p /data /test-parachain/.local/share && \
- chown -R test-parachain:test-parachain /data && \
- ln -s /data /test-parachain/.local/share/test-parachain && \
- mkdir -p /specs
-
-# add test-parachain binary to the docker image
-COPY ./artifacts/test-parachain /usr/local/bin
-COPY ./parachains/chain-specs/*.json /specs/
-
-USER test-parachain
-
-# check if executable works in this container
-RUN /usr/local/bin/test-parachain --version
-
-EXPOSE 30333 9933 9944
-VOLUME ["/test-parachain"]
-
-ENTRYPOINT ["/usr/local/bin/test-parachain"]
diff --git a/cumulus/docs/release.md b/cumulus/docs/release.md
index b04c4e844c4eda09fa82a4febeda9a47d0f527c9..38d1915013b07d67ae074a0f7606c6fd58526e3b 100644
--- a/cumulus/docs/release.md
+++ b/cumulus/docs/release.md
@@ -37,8 +37,8 @@ performed during the release process.
### Burn In
-Ensure that Parity DevOps has run the new release on Westend and Kusama Asset Hub 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
@@ -75,56 +75,61 @@ function of the appropriate pallets.
### Extrinsic Ordering & Storage
-Offline signing libraries depend on a consistent ordering of call indices and
-functions. Compare the metadata of the current and new runtimes and ensure that
-the `module index, call index` tuples map to the same set of functions. It also checks if there have been any changes in `storage`. In case of a breaking change, increase `transaction_version`.
+Offline signing libraries depend on a consistent ordering of call indices and functions. Compare the metadata of the
+current and new runtimes and ensure that the `module index, call index` tuples map to the same set of functions. It also
+checks if there have been any changes in `storage`. In case of a breaking change, increase `transaction_version`.
-To verify the order has not changed, manually start the following [Github Action](https://github.com/paritytech/cumulus/actions/workflows/extrinsic-ordering-check-from-bin.yml). It takes around a minute to run and will produce the report as artifact you need to manually check.
+To verify the order has not changed, manually start the following [Github
+Action](https://github.com/paritytech/cumulus/actions/workflows/extrinsic-ordering-check-from-bin.yml). It takes around
+a minute to run and will produce the report as artifact you need to manually check.
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**:
- - Asset Hub Polkadot: `wss://statemint-rpc.polkadot.io`
+2. **The WebSocket url of the reference node**: - 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)
+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**:
- - Asset Hub Polkadot: `asset-hub-polkadot-local`
+4. **The name of the chain under test. Usually, you would pass a local chain**: - 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:
+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:
- `[Identity] idx 28 -> 25 (calls 15)` - indicates the index for Identity has changed
- `[+] Society, Recovery` - indicates the new version includes 2 additional modules/pallets.
- If no indices have changed, every modules line should look something like `[Identity] idx 25 (calls 15)`
-**Note**: Adding new functions to the runtime does not constitute a breaking change
-as long as the indexes did not change.
+**Note**: Adding new functions to the runtime does not constitute a breaking change as long as the indexes did not
+change.
-**Note**: Extrinsic function signatures changes (adding/removing & ordering arguments) are not caught by the job, so those changes should be reviewed "manually"
+**Note**: Extrinsic function signatures changes (adding/removing & ordering arguments) are not caught by the job, so
+those changes should be reviewed "manually"
### Benchmarks
-The Benchmarks can now be started from the CI. First find the CI pipeline from [here](https://gitlab.parity.io/parity/mirrors/cumulus/-/pipelines?page=1&scope=all&ref=release-parachains-v9220) and pick the latest.
-[Guide](https://github.com/paritytech/ci_cd/wiki/Benchmarks:-cumulus)
+The Benchmarks can now be started from the CI. First find the CI pipeline from
+[here](https://gitlab.parity.io/parity/mirrors/cumulus/-/pipelines?page=1&scope=all&ref=release-parachains-v9220) and
+pick the latest. [Guide](https://github.com/paritytech/ci_cd/wiki/Benchmarks:-cumulus)
### 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 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`
+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
3. `cargo build --release`
4. Copy `./target/polkadot-parachain` to `./bin`
-5. Clone `it/release--fast-sudo` from Polkadot
-In case the branch does not exists (it is a manual process): cherry pick paritytech/polkadot@791c8b8 and run
-`find . -type f -name "*.toml" -print0 | xargs -0 sed -i '' -e 's/polkadot-vX.X.X/polkadot-v/g'`
+5. Clone `it/release--fast-sudo` from Polkadot In case the branch does not exists (it is a manual process):
+ cherry pick `paritytech/polkadot@791c8b8` and run:
+ `find . -type f -name "*.toml" -print0 | xargs -0 sed -i '' -e 's/polkadot-vX.X.X/polkadot-v/g'`
6. `cargo build --release --features fast-runtime`
7. Copy `./target/polkadot` into `./bin` (in Cumulus)
8. Run the tests:
- - 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`
+ - 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/cumulus/pallets/collator-selection/README.md b/cumulus/pallets/collator-selection/README.md
index 9718db58b37e9ae1c81b5b627fe27e51129cf418..811207fd8c0f916f31d08d27fc53499572b6bef4 100644
--- a/cumulus/pallets/collator-selection/README.md
+++ b/cumulus/pallets/collator-selection/README.md
@@ -1 +1 @@
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/cumulus/pallets/parachain-system/Cargo.toml b/cumulus/pallets/parachain-system/Cargo.toml
index 3063083c0ee49d5f6e88db287de529a8eef0c80d..5470dce47480e3d5f3287ec078f886eb0302aaa9 100644
--- a/cumulus/pallets/parachain-system/Cargo.toml
+++ b/cumulus/pallets/parachain-system/Cargo.toml
@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
environmental = { version = "1.1.4", default-features = false }
impl-trait-for-tuples = "0.2.1"
log = { version = "0.4.20", default-features = false }
-trie-db = { version = "0.27.1", default-features = false }
+trie-db = { version = "0.28.0", default-features = false }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
# Substrate
diff --git a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
index e5e7da81d2aea4cc34833e09b517228bb7c5e0b1..a1510847fc2f58681b4fa9d4364648d7db24c299 100644
--- a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
+++ b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
@@ -9,7 +9,7 @@ description = "Proc macros provided by the parachain-system pallet"
proc-macro = true
[dependencies]
-syn = "2.0.31"
+syn = "2.0.37"
proc-macro2 = "1.0.64"
quote = "1.0.33"
proc-macro-crate = "1.3.1"
diff --git a/cumulus/pallets/parachain-system/src/lib.rs b/cumulus/pallets/parachain-system/src/lib.rs
index a8e9a0bf9ae4460b7cda5ef1f7b49bb5c0629eef..a7e59a61c9be2a74025eb3014a11f1632f73ff15 100644
--- a/cumulus/pallets/parachain-system/src/lib.rs
+++ b/cumulus/pallets/parachain-system/src/lib.rs
@@ -1400,12 +1400,12 @@ impl Pallet {
CustomValidationHeadData::::put(head_data);
}
- /// Open HRMP channel for using it in benchmarks.
+ /// Open HRMP channel for using it in benchmarks or tests.
///
/// The caller assumes that the pallet will accept regular outbound message to the sibling
/// `target_parachain` after this call. No other assumptions are made.
- #[cfg(feature = "runtime-benchmarks")]
- pub fn open_outbound_hrmp_channel_for_benchmarks(target_parachain: ParaId) {
+ #[cfg(any(feature = "runtime-benchmarks", feature = "std"))]
+ pub fn open_outbound_hrmp_channel_for_benchmarks_or_tests(target_parachain: ParaId) {
RelevantMessagingState::::put(MessagingStateSnapshot {
dmq_mqc_head: Default::default(),
relay_dispatch_queue_remaining_capacity: Default::default(),
diff --git a/cumulus/pallets/xcmp-queue/Cargo.toml b/cumulus/pallets/xcmp-queue/Cargo.toml
index de4ad61de9e090c3095009cde286d37137db34ce..5aab57da91b4f731567bd81d384cab646beb936d 100644
--- a/cumulus/pallets/xcmp-queue/Cargo.toml
+++ b/cumulus/pallets/xcmp-queue/Cargo.toml
@@ -38,7 +38,7 @@ pallet-balances = { path = "../../../substrate/frame/balances" }
xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder" }
# Cumulus
-cumulus-pallet-parachain-system = { path = "../parachain-system" }
+cumulus-pallet-parachain-system = { path = "../parachain-system", features = ["parameterized-consensus-hook"] }
[features]
default = [ "std" ]
diff --git a/cumulus/pallets/xcmp-queue/src/tests.rs b/cumulus/pallets/xcmp-queue/src/tests.rs
index 2929e8452bef6095aa1e2ba4f168d85482f0b3b2..ba005a5badfeb69472b09cddd1f93f6dc0ac42dd 100644
--- a/cumulus/pallets/xcmp-queue/src/tests.rs
+++ b/cumulus/pallets/xcmp-queue/src/tests.rs
@@ -14,9 +14,9 @@
// limitations under the License.
use super::*;
-use cumulus_primitives_core::XcmpMessageHandler;
+use cumulus_primitives_core::{ParaId, XcmpMessageHandler};
use frame_support::{assert_noop, assert_ok};
-use mock::{new_test_ext, RuntimeCall, RuntimeOrigin, Test, XcmpQueue};
+use mock::{new_test_ext, ParachainSystem, RuntimeCall, RuntimeOrigin, Test, XcmpQueue};
use sp_runtime::traits::BadOrigin;
#[test]
@@ -341,3 +341,32 @@ fn xcmp_queue_consumes_dest_and_msg_on_ok_validate() {
);
});
}
+
+#[test]
+fn xcmp_queue_send_xcm_works() {
+ new_test_ext().execute_with(|| {
+ let sibling_para_id = ParaId::from(12345);
+ let dest = (Parent, X1(Parachain(sibling_para_id.into()))).into();
+ let msg = Xcm(vec![ClearOrigin]);
+
+ // try to send without opened HRMP channel to the sibling_para_id
+ assert_eq!(
+ send_xcm::(dest, msg.clone()),
+ Err(SendError::Transport("NoChannel")),
+ );
+
+ // open HRMP channel to the sibling_para_id
+ ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(sibling_para_id);
+
+ // check empty outbound queue
+ assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
+
+ // now send works
+ assert_ok!(send_xcm::(dest, msg));
+
+ // check outbound queue contains message/page for sibling_para_id
+ assert!(XcmpQueue::take_outbound_messages(usize::MAX)
+ .iter()
+ .any(|(para_id, _)| para_id == &sibling_para_id));
+ })
+}
diff --git a/cumulus/parachain-template/README.md b/cumulus/parachain-template/README.md
index 6dcc70c538290e16587025b652131954c8264ea3..2d71bbd71f3615a071710d9402c83f43621893d1 100644
--- a/cumulus/parachain-template/README.md
+++ b/cumulus/parachain-template/README.md
@@ -19,4 +19,4 @@ parathreads [here](https://wiki.polkadot.network/docs/learn-parathreads).
🧙 Learn about how to use this template and run your own parachain testnet for it in the
-[Devhub Cumulus Tutorial](https://docs.substrate.io/tutorials/v3/cumulus/start-relay/).
\ No newline at end of file
+[Devhub Cumulus Tutorial](https://docs.substrate.io/tutorials/v3/cumulus/start-relay/).
diff --git a/cumulus/parachain-template/node/Cargo.toml b/cumulus/parachain-template/node/Cargo.toml
index b1f1946e3ed457f04a9b2623969df02d6016d842..223a78dacc49f5f479c7e351a7ee53768535b4ee 100644
--- a/cumulus/parachain-template/node/Cargo.toml
+++ b/cumulus/parachain-template/node/Cargo.toml
@@ -11,7 +11,7 @@ build = "build.rs"
publish = false
[dependencies]
-clap = { version = "4.4.2", features = ["derive"] }
+clap = { version = "4.4.4", features = ["derive"] }
log = "0.4.20"
codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0.188", features = ["derive"] }
diff --git a/cumulus/parachain-template/runtime/Cargo.toml b/cumulus/parachain-template/runtime/Cargo.toml
index f26b7be23533a284aaf2d1bdbb2232daaf7509e5..4e51f16dca168fbcc94309a055e27908e1420ef7 100644
--- a/cumulus/parachain-template/runtime/Cargo.toml
+++ b/cumulus/parachain-template/runtime/Cargo.toml
@@ -128,6 +128,7 @@ runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+ "cumulus-primitives-utility/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
diff --git a/cumulus/parachains/common/Cargo.toml b/cumulus/parachains/common/Cargo.toml
index 0c863b7295b4c216761b2d4127911849bd2b6e3c..963de03fa16aeec446d9afca50bb26bcaf37a1d7 100644
--- a/cumulus/parachains/common/Cargo.toml
+++ b/cumulus/parachains/common/Cargo.toml
@@ -13,6 +13,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive
log = { version = "0.4.19", default-features = false }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
num-traits = { version = "0.2", default-features = false}
+smallvec = "1.11.0"
# Substrate
frame-support = { path = "../../../substrate/frame/support", default-features = false }
@@ -28,6 +29,11 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
sp-std = { path = "../../../substrate/primitives/std", default-features = false }
# Polkadot
+kusama-runtime-constants = { path = "../../../polkadot/runtime/kusama/constants", default-features = false}
+polkadot-runtime-constants = { path = "../../../polkadot/runtime/polkadot/constants", default-features = false}
+rococo-runtime-constants = { path = "../../../polkadot/runtime/rococo/constants", default-features = false}
+westend-runtime-constants = { path = "../../../polkadot/runtime/westend/constants", default-features = false}
+polkadot-core-primitives = { path = "../../../polkadot/core-primitives", default-features = false}
polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false}
xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false}
@@ -52,19 +58,38 @@ std = [
"cumulus-primitives-utility/std",
"frame-support/std",
"frame-system/std",
+ "kusama-runtime-constants/std",
"log/std",
"pallet-asset-tx-payment/std",
"pallet-assets/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-collator-selection/std",
+ "polkadot-core-primitives/std",
"polkadot-primitives/std",
+ "polkadot-runtime-constants/std",
+ "rococo-runtime-constants/std",
"sp-consensus-aura/std",
"sp-core/std",
"sp-io/std",
"sp-runtime/std",
"sp-std/std",
+ "westend-runtime-constants/std",
"xcm-builder/std",
"xcm-executor/std",
"xcm/std",
]
+
+runtime-benchmarks = [
+ "cumulus-primitives-utility/runtime-benchmarks",
+ "frame-support/runtime-benchmarks",
+ "frame-system/runtime-benchmarks",
+ "pallet-asset-tx-payment/runtime-benchmarks",
+ "pallet-assets/runtime-benchmarks",
+ "pallet-balances/runtime-benchmarks",
+ "pallet-collator-selection/runtime-benchmarks",
+ "polkadot-primitives/runtime-benchmarks",
+ "sp-runtime/runtime-benchmarks",
+ "xcm-builder/runtime-benchmarks",
+ "xcm-executor/runtime-benchmarks",
+]
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/constants.rs b/cumulus/parachains/common/src/kusama.rs
similarity index 95%
rename from cumulus/parachains/runtimes/contracts/contracts-rococo/src/constants.rs
rename to cumulus/parachains/common/src/kusama.rs
index 9b0fe5182a25243f4e9cd9d6d3ff21676f88025b..308f7d081cedcc90aba2d6c12ed25e13e716bbb4 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/constants.rs
+++ b/cumulus/parachains/common/src/kusama.rs
@@ -13,6 +13,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+/// Consensus-related.
+pub mod consensus {
+ /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+ /// into the relay chain.
+ pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+ /// How many parachain blocks are processed by the relay chain per parent. Limits the
+ /// number of blocks authored per slot.
+ pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+ /// Relay chain slot duration, in milliseconds.
+ pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
+
+/// Constants relating to KSM.
pub mod currency {
use kusama_runtime_constants as constants;
use polkadot_core_primitives::Balance;
@@ -31,7 +44,7 @@ pub mod currency {
}
}
-/// Fee-related.
+/// Constants related to Kusama fee payment.
pub mod fee {
use frame_support::{
pallet_prelude::Weight,
@@ -75,8 +88,8 @@ pub mod fee {
impl WeightToFeePolynomial for RefTimeToFee {
type Balance = Balance;
fn polynomial() -> WeightToFeeCoefficients {
- // in Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
- // in Rococo Contracts, we map to 1/10 of that, or 1/100 CENT
+ // In Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+ // The standard system parachain configuration is 1/10 of that, as in 1/100 CENT.
let p = super::currency::CENTS;
let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
@@ -107,15 +120,3 @@ pub mod fee {
}
}
}
-
-/// Consensus-related.
-pub mod consensus {
- /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
- /// into the relay chain.
- pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
- /// How many parachain blocks are processed by the relay chain per parent. Limits the
- /// number of blocks authored per slot.
- pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
- /// Relay chain slot duration, in milliseconds.
- pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/common/src/lib.rs b/cumulus/parachains/common/src/lib.rs
index 797010d49a0715c2851f3f802b4317e8653a4916..cb2ac1a1e3e45d7af1cba07c8dddbba1837cf199 100644
--- a/cumulus/parachains/common/src/lib.rs
+++ b/cumulus/parachains/common/src/lib.rs
@@ -16,6 +16,10 @@
#![cfg_attr(not(feature = "std"), no_std)]
pub mod impls;
+pub mod kusama;
+pub mod polkadot;
+pub mod rococo;
+pub mod westend;
pub mod xcm_config;
pub use constants::*;
pub use opaque::*;
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/constants.rs b/cumulus/parachains/common/src/polkadot.rs
similarity index 90%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/constants.rs
rename to cumulus/parachains/common/src/polkadot.rs
index 46b562ea4de795650512366fb411a9129fc18b35..4f459b9bb5a3448affc564a0a5282e03bc07c7a3 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/constants.rs
+++ b/cumulus/parachains/common/src/polkadot.rs
@@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+/// Universally recognized accounts.
pub mod account {
use frame_support::PalletId;
@@ -26,8 +27,25 @@ pub mod account {
/// It is used as a temporarily place to deposit a slashed imbalance
/// before the teleport to the Treasury.
pub const REFERENDA_PALLET_ID: PalletId = PalletId(*b"py/refer");
+ /// Ambassador Referenda pallet ID.
+ /// It is used as a temporarily place to deposit a slashed imbalance
+ /// before the teleport to the Treasury.
+ pub const AMBASSADOR_REFERENDA_PALLET_ID: PalletId = PalletId(*b"py/amref");
+}
+
+/// Consensus-related.
+pub mod consensus {
+ /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+ /// into the relay chain.
+ pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+ /// How many parachain blocks are processed by the relay chain per parent. Limits the
+ /// number of blocks authored per slot.
+ pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+ /// Relay chain slot duration, in milliseconds.
+ pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
}
+/// Constants relating to DOT.
pub mod currency {
use polkadot_core_primitives::Balance;
use polkadot_runtime_constants as constants;
@@ -41,12 +59,12 @@ pub mod currency {
pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
pub const fn deposit(items: u32, bytes: u32) -> Balance {
- // 1/100 of Polkadot.
+ // 1/100 of Polkadot
constants::currency::deposit(items, bytes) / 100
}
}
-/// Fee-related.
+/// Constants related to Polkadot fee payment.
pub mod fee {
use frame_support::{
pallet_prelude::Weight,
@@ -90,8 +108,8 @@ pub mod fee {
impl WeightToFeePolynomial for RefTimeToFee {
type Balance = Balance;
fn polynomial() -> WeightToFeeCoefficients {
- // in Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
- // in a parachain, we map to 1/10 of that, or 1/100 CENT
+ // In Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+ // The standard system parachain configuration is 1/10 of that, as in 1/100 CENT.
let p = super::currency::CENTS;
let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
@@ -122,15 +140,3 @@ pub mod fee {
}
}
}
-
-/// Consensus-related.
-pub mod consensus {
- /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
- /// into the relay chain.
- pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
- /// How many parachain blocks are processed by the relay chain per parent. Limits the
- /// number of blocks authored per slot.
- pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
- /// Relay chain slot duration, in milliseconds.
- pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/constants.rs b/cumulus/parachains/common/src/rococo.rs
similarity index 96%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/constants.rs
rename to cumulus/parachains/common/src/rococo.rs
index 80620feaedc6986e07b05e43aa4a33ba1ce81baa..6e31def4b55b923f1596793e6cb114163551c017 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/constants.rs
+++ b/cumulus/parachains/common/src/rococo.rs
@@ -73,8 +73,8 @@ pub mod fee {
impl WeightToFeePolynomial for RefTimeToFee {
type Balance = Balance;
fn polynomial() -> WeightToFeeCoefficients {
- // in Rococo, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
- // in Bridge Hub, we map to 1/10 of that, or 1/100 CENT
+ // In Rococo, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+ // The standard system parachain configuration is 1/10 of that, as in 1/100 CENT.
let p = super::currency::CENTS;
let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/constants.rs b/cumulus/parachains/common/src/westend.rs
similarity index 96%
rename from cumulus/parachains/runtimes/assets/asset-hub-westend/src/constants.rs
rename to cumulus/parachains/common/src/westend.rs
index b2629ef10fcc4c139b9cbf69aacadb2a84820ab7..9d3e0bd1a0e2a51d2dde47b5be329be0bc8b5d38 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/constants.rs
+++ b/cumulus/parachains/common/src/westend.rs
@@ -75,8 +75,8 @@ pub mod fee {
impl WeightToFeePolynomial for RefTimeToFee {
type Balance = Balance;
fn polynomial() -> WeightToFeeCoefficients {
- // in Westend, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
- // in Asset Hub, we map to 1/10 of that, or 1/100 CENT
+ // In Westend, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+ // The standard system parachain configuration is 1/10 of that, as in 1/100 CENT.
let p = super::currency::CENTS;
let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/README.md b/cumulus/parachains/integration-tests/e2e/collectives/README.md
index 98ea77aac60642ac7001297bc5d3024124cd7822..9c4efe7c9504835814e1a693dd8d57710da1bc3b 100644
--- a/cumulus/parachains/integration-tests/e2e/collectives/README.md
+++ b/cumulus/parachains/integration-tests/e2e/collectives/README.md
@@ -1,19 +1,23 @@
-E2E tests concerning Polkadot Governance and the Collectives Parachain. The tests run by the Parachain Integration Tests [tool](https://github.com/paritytech/parachains-integration-tests/).
+E2E tests concerning Polkadot Governance and the Collectives Parachain. The tests run by the Parachain Integration Tests
+[tool](https://github.com/paritytech/parachains-integration-tests/).
-## Requirements
+# Requirements
The tests require some changes to the regular production runtime builds:
-RelayChain runtime:
+## RelayChain runtime
1. Alice has SUDO
-2. Public Referenda `StakingAdmin`, `FellowshipAdmin` tracks settings (see the corresponding keys of the `TRACKS_DATA` constant in the `governance::tracks` module of the Relay Chain runtime crate):
+2. Public Referenda `StakingAdmin`, `FellowshipAdmin` tracks settings (see the corresponding keys of the `TRACKS_DATA`
+ constant in the `governance::tracks` module of the Relay Chain runtime crate):
``` yaml
prepare_period: 5 Block,
decision_period: 1 Block,
confirm_period: 1 Block,
min_enactment_period: 1 Block,
```
-Collectives runtime:
-1. Fellowship Referenda `Fellows` track settings (see the corresponding key of the `TRACKS_DATA` constant in the `fellowship::tracks` module of the Collectives runtime crate):
+
+## Collectives runtime
+1. Fellowship Referenda `Fellows` track settings (see the corresponding key of the `TRACKS_DATA` constant in the
+ `fellowship::tracks` module of the Collectives runtime crate):
``` yaml
prepare_period: 5 Block,
decision_period: 1 Block,
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml
index d45a201a4d051e341f9a0c88ecfe073c90549598..788b2482be877e424052a563a86885b34fb1ead7 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml
@@ -3,6 +3,7 @@ name = "asset-hub-kusama-integration-tests"
version = "1.0.0"
authors.workspace = true
edition.workspace = true
+license = "Apache-2.0"
description = "Asset Hub Kusama runtime integration tests with xcm-emulator"
publish = false
@@ -44,6 +45,7 @@ runtime-benchmarks = [
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-parachains/runtime-benchmarks",
"polkadot-runtime/runtime-benchmarks",
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs
index 9325ca54b068f6b2d9e7cdaa9b3a833cb41ff4ea..ad74aa2301fc34d478b9f719f9ccfddb44b79fc8 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
pub use codec::Encode;
pub use frame_support::{
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs
index 8647c1aa0081044500a1f8efaf9b444b90d752bb..7bb64333db52fbee59ba5d83bbf9cfab841c1220 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
@@ -160,12 +159,6 @@ fn force_open_hrmp_channel_for_system_para_works() {
// Parachain A init values
let para_a_id = PenpalKusamaA::para_id();
- let fund_amount = KUSAMA_ED * 1000_000_000;
-
- // Fund Parachain's Sovereign accounts to be able to reserve the deposit
- let para_a_sovereign_account = Kusama::fund_para_sovereign(fund_amount, para_a_id);
- let system_para_sovereign_account = Kusama::fund_para_sovereign(fund_amount, system_para_id);
-
Kusama::execute_with(|| {
assert_ok!(::Hrmp::force_open_hrmp_channel(
relay_root_origin,
@@ -180,14 +173,6 @@ fn force_open_hrmp_channel_for_system_para_works() {
assert_expected_events!(
Kusama,
vec![
- // Sender deposit is reserved for System Parachain's Sovereign account
- RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
- who: *who == system_para_sovereign_account,
- },
- // Recipient deposit is reserved for Parachain's Sovereign account
- RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
- who: *who == para_a_sovereign_account,
- },
// HRMP channel forced opened
RuntimeEvent::Hrmp(
polkadot_runtime_parachains::hrmp::Event::HrmpChannelForceOpened(
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/mod.rs
index 41d8406581930a48630818f4ba9c63497863f3bf..b3089a3b38269bfbb6d6377099ea4acae4a034b1 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/mod.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/mod.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
mod hrmp_channels;
mod reserve_transfer;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs
index 26b3cdf68b1b817f30b20846db8bb7453b0751ee..645dca5035b1d8d385d9e01c31c2570dae14c2a4 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs
index 598256db83a0ee6cacc6e593c8b3e5ef0f3dfa9b..5891b694c8e436104b508cce7b67b8266460cc3e 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
@@ -174,8 +173,6 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
PenpalKusamaA::assert_xcm_pallet_sent();
});
- PenpalKusamaA::execute_with(|| {});
-
AssetHubKusama::execute_with(|| {
type RuntimeEvent = ::RuntimeEvent;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/set_xcm_versions.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/set_xcm_versions.rs
index 155ada2ec2f3384b00c43a954eca4cbd4570611d..a7af96096cdde4a9fc6bddb86874c02ca65a1c97 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/set_xcm_versions.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/set_xcm_versions.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/swap.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/swap.rs
index aad93db9922e4db838b8c2a56849028bc3a7f697..3a67b5435828184eb49c9ffbda814803d4115048 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/swap.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/swap.rs
@@ -1,22 +1,21 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
-use asset_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
use frame_support::{instances::Instance2, BoundedVec};
+use parachains_common::kusama::currency::EXISTENTIAL_DEPOSIT;
use sp_runtime::{DispatchError, ModuleError};
#[test]
@@ -183,11 +182,9 @@ fn swap_locally_on_chain_using_foreign_assets() {
.encode()
.into();
- let buy_execution_fee_amount =
- asset_hub_kusama_runtime::constants::fee::WeightToFee::weight_to_fee(&Weight::from_parts(
- 10_100_000_000_000,
- 300_000,
- ));
+ let buy_execution_fee_amount = parachains_common::kusama::fee::WeightToFee::weight_to_fee(
+ &Weight::from_parts(10_100_000_000_000, 300_000),
+ );
let buy_execution_fee = MultiAsset {
id: Concrete(MultiLocation { parents: 1, interior: Here }),
fun: Fungible(buy_execution_fee_amount),
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs
index b671fd5b44480fa509ce1c47525d3dbc91db3e50..f69878f35435ded3da456756328350a1c286a471 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
#![allow(dead_code)] //
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml
index 3d5d23e9963625fa664e0fb0f34ee0f4b31bb613..023e8b84f11b4a9e8330b12f6cec0c60967e9cae 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml
@@ -3,6 +3,7 @@ name = "asset-hub-polkadot-integration-tests"
version = "1.0.0"
authors.workspace = true
edition.workspace = true
+license = "Apache-2.0"
description = "Asset Hub Polkadot runtime integration tests with xcm-emulator"
publish = false
@@ -43,6 +44,7 @@ runtime-benchmarks = [
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-parachains/runtime-benchmarks",
"polkadot-runtime/runtime-benchmarks",
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs
index 6cbf6ab1ccb0eb516bb00cc810d51a19f99fee47..e8ba8e44f25c529f17cae594008d2f3e3fb2e80c 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
pub use codec::Encode;
pub use frame_support::{
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs
index 337e4ba6113a15d6ad9dee05c6d683b028f77208..a6286c619f64ced17ceddcab7d3dfc44b2e862d1 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
@@ -160,12 +159,6 @@ fn force_open_hrmp_channel_for_system_para_works() {
// Parachain A init values
let para_a_id = PenpalPolkadotA::para_id();
- let fund_amount = POLKADOT_ED * 1000_000_000;
-
- // Fund Parachain's Sovereign accounts to be able to reserve the deposit
- let system_para_sovereign_account = Polkadot::fund_para_sovereign(fund_amount, system_para_id);
- let para_a_sovereign_account = Polkadot::fund_para_sovereign(fund_amount, para_a_id);
-
Polkadot::execute_with(|| {
assert_ok!(::Hrmp::force_open_hrmp_channel(
relay_root_origin,
@@ -180,14 +173,6 @@ fn force_open_hrmp_channel_for_system_para_works() {
assert_expected_events!(
Polkadot,
vec![
- // Sender deposit is reserved for System Parachain's Sovereign account
- RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
- who: *who == system_para_sovereign_account,
- },
- // Recipient deposit is reserved for Parachain's Sovereign account
- RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
- who: *who == para_a_sovereign_account,
- },
// HRMP channel forced opened
RuntimeEvent::Hrmp(
polkadot_runtime_parachains::hrmp::Event::HrmpChannelForceOpened(
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/mod.rs
index 547b59deadcb80360bfee2673df0c3274a56de8e..c22de4f1c3ebd10a3fd1135718812bd09c53bbe0 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/mod.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/mod.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
mod hrmp_channels;
mod reserve_transfer;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs
index e6722d585bc0906360327240b96fac37575137f3..e53693d85d2bbc48ae9fc5ee473c55613cc76d63 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs
index 978377b0fda3b0934a7d4160730d97152b19dfb4..244b428a7523b36680e08696ca28f69cef8a2fc4 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
@@ -177,8 +176,6 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
PenpalPolkadotA::assert_xcm_pallet_sent();
});
- PenpalPolkadotA::execute_with(|| {});
-
AssetHubPolkadot::execute_with(|| {
type RuntimeEvent = ::RuntimeEvent;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/set_xcm_versions.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/set_xcm_versions.rs
index 287bfa35ae9c69c07d81bfa23fb84a2084239d00..e121c4167993fbfedfd6ba8f7cbe51417e212591 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/set_xcm_versions.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/set_xcm_versions.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs
index 166f73137e750fa0b62492c427f962c472d25ef8..644c51d75b6620429ebdbcab1a1bdc8b37cce410 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
#![allow(dead_code)] //
@@ -187,7 +186,6 @@ fn limited_teleport_native_assets_from_relay_to_system_para_works() {
/// Limited Teleport of native asset from System Parachain to Relay Chain
/// should work when there is enough balance in Relay Chain's `CheckAccount`
#[test]
-#[cfg(feature = "FIXME-IGNORED")] //
fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
// Dependency - Relay Chain's `CheckAccount` should have enough balance
limited_teleport_native_assets_from_relay_to_system_para_works();
@@ -226,7 +224,6 @@ fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
/// Limited Teleport of native asset from System Parachain to Relay Chain
/// should't work when there is not enough balance in Relay Chain's `CheckAccount`
#[test]
-#[cfg(feature = "FIXME-IGNORED")] //
fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
// Init values for Relay Chain
let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
index 34d34009ebd079f5a77aefd6c2812e5cdfa0f4db..80c41c24aa75ef4c166bd778935e2178b9529484 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
@@ -3,6 +3,7 @@ name = "asset-hub-westend-integration-tests"
version = "1.0.0"
authors.workspace = true
edition.workspace = true
+license = "Apache-2.0"
description = "Asset Hub Westend runtime integration tests with xcm-emulator"
publish = false
@@ -44,6 +45,7 @@ runtime-benchmarks = [
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-parachains/runtime-benchmarks",
"polkadot-runtime/runtime-benchmarks",
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs
index 2c89c0f9dd46982c2099f7f36e5a16f1724c6f82..6e0f3434aedf3dd7a5f630ad40729e6a61e9ba47 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
pub use codec::Encode;
pub use frame_support::{
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs
index e2a60e0b300443c49dec7e27551ac8641dc8ab29..b3841af0e6c38372b8fb621fac468b25bdec63a1 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
mod reserve_transfer;
mod send;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs
index 67fc53a826aa9185857ae6497a5c32670fb2a413..51fac43be1255948a9ae72044bececa3d907f2c5 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs
index f2040351e5dbf624750deb31204ff2fc3a2f3b26..424d222bef3811966f55d8fbac954f33f065ffc7 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
@@ -116,8 +115,6 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
PenpalWestendA::assert_xcm_pallet_sent();
});
- PenpalWestendA::execute_with(|| {});
-
AssetHubWestend::execute_with(|| {
type RuntimeEvent = ::RuntimeEvent;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/set_xcm_versions.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/set_xcm_versions.rs
index 57632527174566cbdc7996c8197389b8fd4a5232..2720095aac00d5d15c43e77224b30b7387079897 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/set_xcm_versions.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/set_xcm_versions.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs
index 1c4dd9d76837c7291c7e409bfe2776975b0762de..7d1615c9e29182c97146ca46c966f0ae85991b11 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use crate::*;
@@ -171,11 +170,9 @@ fn swap_locally_on_chain_using_foreign_assets() {
.encode()
.into();
- let buy_execution_fee_amount =
- asset_hub_westend_runtime::constants::fee::WeightToFee::weight_to_fee(&Weight::from_parts(
- 10_100_000_000_000,
- 300_000,
- ));
+ let buy_execution_fee_amount = parachains_common::westend::fee::WeightToFee::weight_to_fee(
+ &Weight::from_parts(10_100_000_000_000, 300_000),
+ );
let buy_execution_fee = MultiAsset {
id: Concrete(MultiLocation { parents: 1, interior: Here }),
fun: Fungible(buy_execution_fee_amount),
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs
index 233dc32b13b5ce70abc522c9bc03d6e9360dae1c..8de73a7420c6b69954b2fe295a3b5f6bf4e7219c 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
#![allow(dead_code)] //
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
index 12a2ed51591fc54a636781b00653a79f7a471498..c02c96255e1837bcdbd0755b669e5985721e0c16 100644
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
@@ -3,6 +3,7 @@ name = "bridge-hub-rococo-integration-tests"
version = "1.0.0"
authors.workspace = true
edition.workspace = true
+license = "Apache-2.0"
description = "Bridge Hub Rococo runtime integration tests with xcm-emulator"
publish = false
@@ -24,8 +25,8 @@ pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-featu
parachains-common = { path = "../../../../common" }
cumulus-pallet-xcmp-queue = { path = "../../../../../pallets/xcmp-queue", default-features = false}
cumulus-pallet-dmp-queue = { path = "../../../../../pallets/dmp-queue", default-features = false}
-pallet-bridge-messages = { path = "../../../../../bridges/modules/messages", default-features = false}
-bp-messages = { path = "../../../../../bridges/primitives/messages", default-features = false}
+pallet-bridge-messages = { path = "../../../../../../bridges/modules/messages", default-features = false}
+bp-messages = { path = "../../../../../../bridges/primitives/messages", default-features = false}
# Local
xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs
index 0a923ec04de76006224e66a70a72fe00b2d4ef99..122d65461159d90a84888b792f35e89decf7c5be 100644
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
pub use bp_messages::LaneId;
pub use frame_support::assert_ok;
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs
index 127292829fd5d1cd3b9f773868bf98f13e21fbd0..f24e13bb71b875d8d68be161e5dc833198f93c39 100644
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs
+++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs
@@ -1,98 +1,98 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+use crate::*;
#[test]
-#[ignore]
fn example() {
- // // Init tests variables
- // // XcmPallet send arguments
- // let sudo_origin = ::RuntimeOrigin::root();
- // let destination = Rococo::child_location_of(BridgeHubRococo::para_id()).into();
- // let weight_limit = WeightLimit::Unlimited;
- // let check_origin = None;
+ // Init tests variables
+ // XcmPallet send arguments
+ let sudo_origin = ::RuntimeOrigin::root();
+ let destination = Rococo::child_location_of(BridgeHubRococo::para_id()).into();
+ let weight_limit = WeightLimit::Unlimited;
+ let check_origin = None;
- // let remote_xcm = Xcm(vec![ClearOrigin]);
+ let remote_xcm = Xcm(vec![ClearOrigin]);
- // let xcm = VersionedXcm::from(Xcm(vec![
- // UnpaidExecution { weight_limit, check_origin },
- // ExportMessage {
- // network: WococoId,
- // destination: X1(Parachain(AssetHubWococo::para_id().into())),
- // xcm: remote_xcm,
- // },
- // ]));
+ let xcm = VersionedXcm::from(Xcm(vec![
+ UnpaidExecution { weight_limit, check_origin },
+ ExportMessage {
+ network: WococoId,
+ destination: X1(Parachain(AssetHubWococo::para_id().into())),
+ xcm: remote_xcm,
+ },
+ ]));
- // //Rococo Global Consensus
- // // Send XCM message from Relay Chain to Bridge Hub source Parachain
- // Rococo::execute_with(|| {
- // assert_ok!(::XcmPallet::send(
- // sudo_origin,
- // bx!(destination),
- // bx!(xcm),
- // ));
+ //Rococo Global Consensus
+ // Send XCM message from Relay Chain to Bridge Hub source Parachain
+ Rococo::execute_with(|| {
+ assert_ok!(::XcmPallet::send(
+ sudo_origin,
+ bx!(destination),
+ bx!(xcm),
+ ));
- // type RuntimeEvent = ::RuntimeEvent;
+ type RuntimeEvent = ::RuntimeEvent;
- // assert_expected_events!(
- // Rococo,
- // vec![
- // RuntimeEvent::XcmPallet(pallet_xcm::Event::Sent { .. }) => {},
- // ]
- // );
- // });
- // // Receive XCM message in Bridge Hub source Parachain
- // BridgeHubRococo::execute_with(|| {
- // type RuntimeEvent = ::RuntimeEvent;
+ assert_expected_events!(
+ Rococo,
+ vec![
+ RuntimeEvent::XcmPallet(pallet_xcm::Event::Sent { .. }) => {},
+ ]
+ );
+ });
+ // Receive XCM message in Bridge Hub source Parachain
+ BridgeHubRococo::execute_with(|| {
+ type RuntimeEvent = ::RuntimeEvent;
- // assert_expected_events!(
- // BridgeHubRococo,
- // vec![
- // RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
- // outcome: Outcome::Complete(_),
- // ..
- // }) => {},
- // RuntimeEvent::BridgeWococoMessages(pallet_bridge_messages::Event::MessageAccepted {
- // lane_id: LaneId([0, 0, 0, 1]),
- // nonce: 1,
- // }) => {},
- // ]
- // );
- // });
+ assert_expected_events!(
+ BridgeHubRococo,
+ vec![
+ RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
+ outcome: Outcome::Complete(_),
+ ..
+ }) => {},
+ RuntimeEvent::BridgeWococoMessages(pallet_bridge_messages::Event::MessageAccepted {
+ lane_id: LaneId([0, 0, 0, 1]),
+ nonce: 1,
+ }) => {},
+ ]
+ );
+ });
- // // Wococo GLobal Consensus
- // // Receive XCM message in Bridge Hub target Parachain
- // BridgeHubWococo::execute_with(|| {
- // type RuntimeEvent = ::RuntimeEvent;
+ // Wococo GLobal Consensus
+ // Receive XCM message in Bridge Hub target Parachain
+ BridgeHubWococo::execute_with(|| {
+ type RuntimeEvent = ::RuntimeEvent;
- // assert_expected_events!(
- // BridgeHubWococo,
- // vec![
- // RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
- // ]
- // );
- // });
- // // Receive embeded XCM message within `ExportMessage` in Parachain destination
- // AssetHubWococo::execute_with(|| {
- // type RuntimeEvent = ::RuntimeEvent;
+ assert_expected_events!(
+ BridgeHubWococo,
+ vec![
+ RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+ ]
+ );
+ });
+ // Receive embeded XCM message within `ExportMessage` in Parachain destination
+ AssetHubWococo::execute_with(|| {
+ type RuntimeEvent = ::RuntimeEvent;
- // assert_expected_events!(
- // AssetHubWococo,
- // vec![
- // RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail { .. }) => {},
- // ]
- // );
- // });
+ assert_expected_events!(
+ AssetHubWococo,
+ vec![
+ RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail { .. }) => {},
+ ]
+ );
+ });
}
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs
index 6e11743aecbf36cca86eda552528d8da00ee6b4b..48347557ae77df661d8c41726cb3fe7f24738678 100644
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs
+++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs
@@ -1,17 +1,16 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
mod example;
diff --git a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/Cargo.toml b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/Cargo.toml
index ee0e254befc5153aecfe909b25f89bae6481f615..99caccc81590ec39a83e6a6ef7a280b454165921 100644
--- a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/Cargo.toml
@@ -3,6 +3,7 @@ name = "collectives-polkadot-integration-tests"
version = "0.1.0"
authors.workspace = true
edition.workspace = true
+license = "Apache-2.0"
description = "Polkadot Collectives parachain runtime integration tests based on xcm-emulator"
publish = false
@@ -14,6 +15,7 @@ sp-runtime = { path = "../../../../../../substrate/primitives/runtime", default-
frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false}
pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
+pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
pallet-core-fellowship = { path = "../../../../../../substrate/frame/core-fellowship", default-features = false}
pallet-salary = { path = "../../../../../../substrate/frame/salary", default-features = false}
diff --git a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/lib.rs b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/lib.rs
index ad2b5a501117516b1064b36cb567b2e3983e41f2..aa716c7c94855acb016056733bcd6111fa8b5599 100644
--- a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/lib.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
pub use codec::Encode;
pub use frame_support::{assert_ok, sp_runtime::AccountId32};
diff --git a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/ambassador.rs b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/ambassador.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d9fd78fbcbffe0fd8a73c447c8c0cdf762448fae
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/ambassador.rs
@@ -0,0 +1,65 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Integration tests concerning the Ambassador Program.
+
+use crate::*;
+use collectives_polkadot_runtime::ambassador::AmbassadorSalaryPaymaster;
+use frame_support::traits::{fungible::Mutate, tokens::Pay};
+use sp_core::crypto::Ss58Codec;
+use xcm_emulator::TestExt;
+
+#[test]
+fn pay_salary() {
+ let pay_from: AccountId =
+ ::from_string("5DS1Gaf6R9eFAV8QyeZP9P89kTkJMurxv3y3J3TTMu8p8VCX")
+ .unwrap();
+ let pay_to = Polkadot::account_id_of(ALICE);
+ let pay_amount = 90000000000;
+
+ AssetHubPolkadot::execute_with(|| {
+ type AssetHubBalances = ::Balances;
+
+ assert_ok!(>::mint_into(&pay_from, pay_amount * 2));
+ });
+
+ Collectives::execute_with(|| {
+ type RuntimeEvent = ::RuntimeEvent;
+
+ assert_ok!(AmbassadorSalaryPaymaster::pay(&pay_to, (), pay_amount));
+ assert_expected_events!(
+ Collectives,
+ vec![
+ RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+ ]
+ );
+ });
+
+ AssetHubPolkadot::execute_with(|| {
+ type RuntimeEvent = ::RuntimeEvent;
+
+ assert_expected_events!(
+ AssetHubPolkadot,
+ vec![
+ RuntimeEvent::Balances(pallet_balances::Event::Transfer { from, to, amount }) => {
+ from: from == &pay_from,
+ to: to == &pay_to,
+ amount: amount == &pay_amount,
+ },
+ RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Success { .. }) => {},
+ ]
+ );
+ });
+}
diff --git a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/fellowship.rs b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/fellowship.rs
index 26fa55acb0d66142729d087b10592b5b05a1740b..c08a660205f6829ed50b5643ab191b4c3005ce73 100644
--- a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/fellowship.rs
+++ b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/fellowship.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
//! Integration tests concerning the Fellowship.
@@ -58,11 +57,8 @@ fn pay_salary() {
);
});
- Collectives::execute_with(|| {});
-
AssetHubPolkadot::execute_with(|| {
type RuntimeEvent = ::RuntimeEvent;
-
assert_expected_events!(
AssetHubPolkadot,
vec![
diff --git a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/mod.rs
index a9445ac8ec7eb191f067b6e95bf41730957a0b95..42d2432d2237b83b229cd8803b5d0262bbb4e23a 100644
--- a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/mod.rs
+++ b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/mod.rs
@@ -1,17 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+mod ambassador;
mod fellowship;
diff --git a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
index a8002158dbc139e53c9ce44b8e1b9a5054ef25b0..f1db26c2a540d4d7c2ca29e0c68860d12b2cf8b5 100644
--- a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
@@ -3,6 +3,7 @@ name = "integration-tests-common"
version = "1.0.0"
authors.workspace = true
edition.workspace = true
+license = "Apache-2.0"
description = "Common resources for integration testing with xcm-emulator"
publish = false
@@ -55,9 +56,9 @@ xcm-emulator = { path = "../../../../xcm/xcm-emulator", default-features = false
cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue" }
cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false}
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system" }
-bp-messages = { path = "../../../../bridges/primitives/messages" }
-pallet-bridge-messages = { path = "../../../../bridges/modules/messages" }
-bridge-runtime-common = { path = "../../../../bridges/bin/runtime-common" }
+bp-messages = { path = "../../../../../bridges/primitives/messages" }
+pallet-bridge-messages = { path = "../../../../../bridges/modules/messages" }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common" }
[features]
runtime-benchmarks = [
@@ -79,6 +80,7 @@ runtime-benchmarks = [
"pallet-message-queue/runtime-benchmarks",
"pallet-staking/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"penpal-runtime/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-primitives/runtime-benchmarks",
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/constants.rs b/cumulus/parachains/integration-tests/emulated/common/src/constants.rs
index fedc46fabfff1f6f55f274c4bbf848505afb367b..8725ebd140b97272630430de324177bf5cae1484 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/constants.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/constants.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
// Substrate
use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
@@ -632,7 +631,7 @@ pub mod rococo {
pub mod asset_hub_polkadot {
use super::*;
pub const PARA_ID: u32 = 1000;
- pub const ED: Balance = asset_hub_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+ pub const ED: Balance = parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;
pub fn genesis() -> Storage {
let genesis_config = asset_hub_polkadot_runtime::RuntimeGenesisConfig {
@@ -689,7 +688,7 @@ pub mod asset_hub_polkadot {
pub mod asset_hub_westend {
use super::*;
pub const PARA_ID: u32 = 1000;
- pub const ED: Balance = asset_hub_westend_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+ pub const ED: Balance = parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
pub fn genesis() -> Storage {
let genesis_config = asset_hub_westend_runtime::RuntimeGenesisConfig {
@@ -746,7 +745,7 @@ pub mod asset_hub_westend {
pub mod asset_hub_kusama {
use super::*;
pub const PARA_ID: u32 = 1000;
- pub const ED: Balance = asset_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+ pub const ED: Balance = parachains_common::kusama::currency::EXISTENTIAL_DEPOSIT;
pub fn genesis() -> Storage {
let genesis_config = asset_hub_kusama_runtime::RuntimeGenesisConfig {
@@ -864,7 +863,7 @@ pub mod penpal {
pub mod collectives {
use super::*;
pub const PARA_ID: u32 = 1001;
- pub const ED: Balance = collectives_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+ pub const ED: Balance = parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;
pub fn genesis() -> Storage {
let genesis_config = collectives_polkadot_runtime::RuntimeGenesisConfig {
@@ -921,7 +920,7 @@ pub mod collectives {
pub mod bridge_hub_kusama {
use super::*;
pub const PARA_ID: u32 = 1002;
- pub const ED: Balance = bridge_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+ pub const ED: Balance = parachains_common::kusama::currency::EXISTENTIAL_DEPOSIT;
pub fn genesis() -> Storage {
let genesis_config = bridge_hub_kusama_runtime::RuntimeGenesisConfig {
@@ -978,7 +977,7 @@ pub mod bridge_hub_kusama {
pub mod bridge_hub_polkadot {
use super::*;
pub const PARA_ID: u32 = 1002;
- pub const ED: Balance = bridge_hub_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+ pub const ED: Balance = parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;
pub fn genesis() -> Storage {
let genesis_config = bridge_hub_polkadot_runtime::RuntimeGenesisConfig {
@@ -1035,7 +1034,7 @@ pub mod bridge_hub_polkadot {
pub mod bridge_hub_rococo {
use super::*;
pub const PARA_ID: u32 = 1013;
- pub const ED: Balance = bridge_hub_rococo_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+ pub const ED: Balance = parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
pub fn genesis() -> Storage {
let genesis_config = bridge_hub_rococo_runtime::RuntimeGenesisConfig {
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/impls.rs b/cumulus/parachains/integration-tests/emulated/common/src/impls.rs
index f13da0016205cceaa2599f4e23b2e6b8963c84b1..eed61d94171107a278e13b8fca8ba9a94a547f21 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/impls.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/impls.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
pub use codec::{Decode, Encode};
pub use paste;
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
index 49751136f7ba0016c022359eaf789516c0ac0243..7461165f2a198e8f8b871850545bf50f6e37e885 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
@@ -1,18 +1,17 @@
// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
-// Cumulus is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Cumulus is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Cumulus. If not, see .
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
pub mod constants;
pub mod impls;
diff --git a/cumulus/parachains/pallets/collective-content/Cargo.toml b/cumulus/parachains/pallets/collective-content/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..1c831ac7268a54533acf38188b3dcf73edcec6c1
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+name = "pallet-collective-content"
+version = "0.1.0"
+authors = ["Parity Technologies "]
+edition = "2021"
+description = "Managed content"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
+scale-info = { version = "2.3.0", default-features = false, features = ["derive"] }
+
+frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", optional = true, default-features = false }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+
+[dev-dependencies]
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+
+[features]
+default = [ "std" ]
+runtime-benchmarks = [
+ "frame-benchmarking/runtime-benchmarks",
+ "frame-support/runtime-benchmarks",
+ "frame-system/runtime-benchmarks",
+ "sp-runtime/runtime-benchmarks",
+]
+
+try-runtime = [
+ "frame-support/try-runtime",
+ "frame-system/try-runtime",
+ "sp-runtime/try-runtime",
+]
+
+std = [
+ "codec/std",
+ "frame-benchmarking/std",
+ "frame-support/std",
+ "frame-system/std",
+ "scale-info/std",
+ "sp-core/std",
+ "sp-io/std",
+ "sp-runtime/std",
+ "sp-std/std",
+]
diff --git a/cumulus/parachains/pallets/collective-content/src/benchmarking.rs b/cumulus/parachains/pallets/collective-content/src/benchmarking.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1f145f725b139b4e93481a9c69b0715471f7ec0b
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/src/benchmarking.rs
@@ -0,0 +1,88 @@
+// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The pallet benchmarks.
+
+use super::{Pallet as CollectiveContent, *};
+use frame_benchmarking::{impl_benchmark_test_suite, v2::*};
+use frame_support::traits::EnsureOrigin;
+
+fn assert_last_event, I: 'static>(generic_event: >::RuntimeEvent) {
+ frame_system::Pallet::::assert_last_event(generic_event.into());
+}
+
+/// returns CID hash of 68 bytes of given `i`.
+fn create_cid(i: u8) -> OpaqueCid {
+ let cid: OpaqueCid = [i; 68].to_vec().try_into().unwrap();
+ cid
+}
+
+#[instance_benchmarks]
+mod benchmarks {
+ use super::*;
+
+ #[benchmark]
+ fn set_charter() -> Result<(), BenchmarkError> {
+ let cid: OpaqueCid = create_cid(1);
+ let origin =
+ T::CharterOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+
+ #[extrinsic_call]
+ _(origin as T::RuntimeOrigin, cid.clone());
+
+ assert_eq!(Charter::::get(), Some(cid.clone()));
+ assert_last_event::(Event::NewCharterSet { cid }.into());
+ Ok(())
+ }
+
+ #[benchmark]
+ fn announce() -> Result<(), BenchmarkError> {
+ let expire_at = DispatchTime::<_>::At(10u32.into());
+ let now = frame_system::Pallet::::block_number();
+ let cid: OpaqueCid = create_cid(1);
+ let origin = T::AnnouncementOrigin::try_successful_origin()
+ .map_err(|_| BenchmarkError::Weightless)?;
+
+ #[extrinsic_call]
+ _(origin as T::RuntimeOrigin, cid.clone(), Some(expire_at.clone()));
+
+ assert_eq!(>::count(), 1);
+ assert_last_event::(
+ Event::AnnouncementAnnounced { cid, expire_at: expire_at.evaluate(now) }.into(),
+ );
+
+ Ok(())
+ }
+
+ #[benchmark]
+ fn remove_announcement() -> Result<(), BenchmarkError> {
+ let cid: OpaqueCid = create_cid(1);
+ let origin = T::AnnouncementOrigin::try_successful_origin()
+ .map_err(|_| BenchmarkError::Weightless)?;
+ CollectiveContent::::announce(origin.clone(), cid.clone(), None)
+ .expect("could not publish an announcement");
+ assert_eq!(>::count(), 1);
+
+ #[extrinsic_call]
+ _(origin as T::RuntimeOrigin, cid.clone());
+
+ assert_eq!(>::count(), 0);
+ assert_last_event::(Event::AnnouncementRemoved { cid }.into());
+
+ Ok(())
+ }
+
+ impl_benchmark_test_suite!(CollectiveContent, super::mock::new_bench_ext(), super::mock::Test);
+}
diff --git a/cumulus/parachains/pallets/collective-content/src/lib.rs b/cumulus/parachains/pallets/collective-content/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7a685858accb67868837e734ba9808741a4f7ea1
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/src/lib.rs
@@ -0,0 +1,206 @@
+// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Managed Collective Content Pallet
+//!
+//! The pallet provides the functionality to store different types of content. This would typically
+//! be used by an on-chain collective, such as the Polkadot Alliance or Ambassador Program.
+//!
+//! The pallet stores content as an [OpaqueCid], which should correspond to some off-chain hosting
+//! service, such as IPFS, and contain any type of data. Each type of content has its own origin
+//! from which it can be managed. The origins are configurable in the runtime. Storing content does
+//! not require a deposit, as it is expected to be managed by a trusted collective.
+//!
+//! Content types:
+//!
+//! - Collective [charter](pallet::Charter): A single document (`OpaqueCid`) managed by
+//! [CharterOrigin](pallet::Config::CharterOrigin).
+//! - Collective [announcements](pallet::Announcements): A list of announcements managed by
+//! [AnnouncementOrigin](pallet::Config::AnnouncementOrigin).
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+
+#[cfg(feature = "runtime-benchmarks")]
+mod benchmarking;
+pub mod weights;
+
+pub use pallet::*;
+pub use weights::WeightInfo;
+
+use frame_support::{traits::schedule::DispatchTime, BoundedVec};
+use sp_core::ConstU32;
+use sp_std::prelude::*;
+
+/// IPFS compatible CID.
+// Worst case 2 bytes base and codec, 2 bytes hash type and size, 64 bytes hash digest.
+pub type OpaqueCid = BoundedVec>;
+
+#[frame_support::pallet]
+pub mod pallet {
+ use super::*;
+ use frame_support::{ensure, pallet_prelude::*};
+ use frame_system::pallet_prelude::*;
+ use sp_runtime::{traits::BadOrigin, Saturating};
+
+ /// The current storage version.
+ const STORAGE_VERSION: StorageVersion = StorageVersion::new(0);
+
+ #[pallet::pallet]
+ #[pallet::storage_version(STORAGE_VERSION)]
+ pub struct Pallet(PhantomData<(T, I)>);
+
+ /// The module configuration trait.
+ #[pallet::config]
+ pub trait Config: frame_system::Config {
+ /// The overarching event type.
+ type RuntimeEvent: From>
+ + IsType<::RuntimeEvent>;
+
+ /// Default lifetime for an announcement before it expires.
+ type AnnouncementLifetime: Get>;
+
+ /// The origin to control the collective announcements.
+ type AnnouncementOrigin: EnsureOrigin;
+
+ /// Maximum number of announcements in the storage.
+ #[pallet::constant]
+ type MaxAnnouncements: Get;
+
+ /// The origin to control the collective charter.
+ type CharterOrigin: EnsureOrigin;
+
+ /// Weight information needed for the pallet.
+ type WeightInfo: WeightInfo;
+ }
+
+ #[pallet::error]
+ pub enum Error {
+ /// The announcement is not found.
+ MissingAnnouncement,
+ /// Number of announcements exceeds `MaxAnnouncementsCount`.
+ TooManyAnnouncements,
+ /// Cannot expire in the past.
+ InvalidExpiration,
+ }
+
+ #[pallet::event]
+ #[pallet::generate_deposit(pub(super) fn deposit_event)]
+ pub enum Event, I: 'static = ()> {
+ /// A new charter has been set.
+ NewCharterSet { cid: OpaqueCid },
+ /// A new announcement has been made.
+ AnnouncementAnnounced { cid: OpaqueCid, expire_at: BlockNumberFor },
+ /// An on-chain announcement has been removed.
+ AnnouncementRemoved { cid: OpaqueCid },
+ }
+
+ /// The collective charter.
+ #[pallet::storage]
+ pub type Charter, I: 'static = ()> = StorageValue<_, OpaqueCid, OptionQuery>;
+
+ /// The collective announcements.
+ #[pallet::storage]
+ pub type Announcements, I: 'static = ()> =
+ CountedStorageMap<_, Blake2_128Concat, OpaqueCid, BlockNumberFor, OptionQuery>;
+
+ #[pallet::call]
+ impl, I: 'static> Pallet {
+ /// Set the collective charter.
+ ///
+ /// Parameters:
+ /// - `origin`: Must be the [Config::CharterOrigin].
+ /// - `cid`: [CID](super::OpaqueCid) of the IPFS document of the collective charter.
+ #[pallet::call_index(0)]
+ #[pallet::weight(T::WeightInfo::set_charter())]
+ pub fn set_charter(origin: OriginFor, cid: OpaqueCid) -> DispatchResult {
+ T::CharterOrigin::ensure_origin(origin)?;
+
+ Charter::::put(&cid);
+
+ Self::deposit_event(Event::::NewCharterSet { cid });
+ Ok(())
+ }
+
+ /// Publish an announcement.
+ ///
+ /// Parameters:
+ /// - `origin`: Must be the [Config::AnnouncementOrigin].
+ /// - `cid`: [CID](super::OpaqueCid) of the IPFS document to announce.
+ /// - `maybe_expire`: Expiration block of the announcement. If `None`
+ /// [`Config::AnnouncementLifetime`]
+ /// used as a default.
+ #[pallet::call_index(1)]
+ #[pallet::weight(T::WeightInfo::announce())]
+ pub fn announce(
+ origin: OriginFor,
+ cid: OpaqueCid,
+ maybe_expire: Option>>,
+ ) -> DispatchResult {
+ T::AnnouncementOrigin::ensure_origin(origin)?;
+
+ let now = frame_system::Pallet::::block_number();
+ let expire_at = maybe_expire
+ .map_or(now.saturating_add(T::AnnouncementLifetime::get()), |e| e.evaluate(now));
+ ensure!(expire_at > now, Error::::InvalidExpiration);
+ ensure!(
+ T::MaxAnnouncements::get() > >::count(),
+ Error::::TooManyAnnouncements
+ );
+
+ >::insert(cid.clone(), expire_at);
+
+ Self::deposit_event(Event::::AnnouncementAnnounced { cid, expire_at });
+ Ok(())
+ }
+
+ /// Remove an announcement.
+ ///
+ /// Transaction fee refunded for expired announcements.
+ ///
+ /// Parameters:
+ /// - `origin`: Must be the [Config::AnnouncementOrigin] or signed for expired
+ /// announcements.
+ /// - `cid`: [CID](super::OpaqueCid) of the IPFS document to remove.
+ #[pallet::call_index(2)]
+ #[pallet::weight(T::WeightInfo::remove_announcement())]
+ pub fn remove_announcement(
+ origin: OriginFor,
+ cid: OpaqueCid,
+ ) -> DispatchResultWithPostInfo {
+ let maybe_who = match T::AnnouncementOrigin::try_origin(origin) {
+ Ok(_) => None,
+ Err(origin) => Some(ensure_signed(origin)?),
+ };
+ let expire_at = >::get(cid.clone())
+ .ok_or(Error::::MissingAnnouncement)?;
+ let now = frame_system::Pallet::::block_number();
+ ensure!(maybe_who.is_none() || now >= expire_at, BadOrigin);
+
+ >::remove(cid.clone());
+
+ Self::deposit_event(Event::::AnnouncementRemoved { cid });
+
+ if now >= expire_at {
+ return Ok(Pays::No.into())
+ }
+ Ok(Pays::Yes.into())
+ }
+ }
+}
diff --git a/cumulus/parachains/pallets/collective-content/src/mock.rs b/cumulus/parachains/pallets/collective-content/src/mock.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2ae5943f332acf61b60792563b7d3f9b1e808c70
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/src/mock.rs
@@ -0,0 +1,107 @@
+// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Test utilities.
+
+pub use crate as pallet_collective_content;
+use crate::WeightInfo;
+use frame_support::{
+ ord_parameter_types, parameter_types,
+ traits::{ConstU32, ConstU64},
+ weights::Weight,
+};
+use frame_system::EnsureSignedBy;
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
+
+frame_support::construct_runtime!(
+ pub enum Test {
+ System: frame_system,
+ CollectiveContent: pallet_collective_content,
+ }
+);
+
+type AccountId = u64;
+type Block = frame_system::mocking::MockBlock;
+
+ord_parameter_types! {
+ pub const CharterManager: u64 = 1;
+ pub const AnnouncementManager: u64 = 2;
+ pub const SomeAccount: u64 = 3;
+}
+
+parameter_types! {
+ pub const AnnouncementLifetime: u64 = 100;
+ pub const MaxAnnouncements: u32 = 5;
+}
+
+impl pallet_collective_content::Config for Test {
+ type RuntimeEvent = RuntimeEvent;
+ type AnnouncementLifetime = AnnouncementLifetime;
+ type AnnouncementOrigin = EnsureSignedBy;
+ type MaxAnnouncements = MaxAnnouncements;
+ type CharterOrigin = EnsureSignedBy;
+ type WeightInfo = CCWeightInfo;
+}
+
+impl frame_system::Config for Test {
+ type BaseCallFilter = ();
+ type BlockWeights = ();
+ type BlockLength = ();
+ type DbWeight = ();
+ type RuntimeOrigin = RuntimeOrigin;
+ type RuntimeCall = RuntimeCall;
+ type Nonce = u64;
+ type Block = Block;
+ type Hash = sp_core::H256;
+ type Hashing = sp_runtime::traits::BlakeTwo256;
+ type AccountId = AccountId;
+ type Lookup = IdentityLookup;
+ type RuntimeEvent = RuntimeEvent;
+ type BlockHashCount = ConstU64<250>;
+ type Version = ();
+ type PalletInfo = PalletInfo;
+ type AccountData = ();
+ type OnNewAccount = ();
+ type OnKilledAccount = ();
+ type SystemWeightInfo = ();
+ type SS58Prefix = ();
+ type OnSetCode = ();
+ type MaxConsumers = ConstU32<16>;
+}
+pub struct CCWeightInfo;
+impl WeightInfo for CCWeightInfo {
+ fn set_charter() -> Weight {
+ Weight::zero()
+ }
+ fn announce() -> Weight {
+ Weight::zero()
+ }
+ fn remove_announcement() -> Weight {
+ Weight::zero()
+ }
+}
+
+// Build test environment.
+pub fn new_test_ext() -> sp_io::TestExternalities {
+ let t = RuntimeGenesisConfig::default().build_storage().unwrap().into();
+ let mut ext = sp_io::TestExternalities::new(t);
+ ext.execute_with(|| System::set_block_number(1));
+ ext
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+pub fn new_bench_ext() -> sp_io::TestExternalities {
+ RuntimeGenesisConfig::default().build_storage().unwrap().into()
+}
diff --git a/cumulus/parachains/pallets/collective-content/src/tests.rs b/cumulus/parachains/pallets/collective-content/src/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4910b30b89af84430a60e2eab011ed2c5c6a3d03
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/src/tests.rs
@@ -0,0 +1,204 @@
+// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests.
+
+use super::{mock::*, *};
+use frame_support::{assert_noop, assert_ok, error::BadOrigin, pallet_prelude::Pays};
+
+/// returns CID hash of 68 bytes of given `i`.
+fn create_cid(i: u8) -> OpaqueCid {
+ let cid: OpaqueCid = [i; 68].to_vec().try_into().unwrap();
+ cid
+}
+
+#[test]
+fn set_charter_works() {
+ new_test_ext().execute_with(|| {
+ // wrong origin.
+ let origin = RuntimeOrigin::signed(SomeAccount::get());
+ let cid = create_cid(1);
+ assert_noop!(CollectiveContent::set_charter(origin, cid), BadOrigin);
+
+ // success.
+ let origin = RuntimeOrigin::signed(CharterManager::get());
+ let cid = create_cid(2);
+
+ assert_ok!(CollectiveContent::set_charter(origin, cid.clone()));
+ assert_eq!(Charter::::get(), Some(cid.clone()));
+ System::assert_last_event(RuntimeEvent::CollectiveContent(Event::NewCharterSet { cid }));
+
+ // reset. success.
+ let origin = RuntimeOrigin::signed(CharterManager::get());
+ let cid = create_cid(3);
+
+ assert_ok!(CollectiveContent::set_charter(origin, cid.clone()));
+ assert_eq!(Charter::::get(), Some(cid.clone()));
+ System::assert_last_event(RuntimeEvent::CollectiveContent(Event::NewCharterSet { cid }));
+ });
+}
+
+#[test]
+fn announce_works() {
+ new_test_ext().execute_with(|| {
+ let now = frame_system::Pallet::::block_number();
+ // wrong origin.
+ let origin = RuntimeOrigin::signed(SomeAccount::get());
+ let cid = create_cid(1);
+
+ assert_noop!(CollectiveContent::announce(origin, cid, None), BadOrigin);
+
+ // success.
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ let cid = create_cid(2);
+ let maybe_expire_at = None;
+
+ assert_ok!(CollectiveContent::announce(origin, cid.clone(), maybe_expire_at));
+ System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementAnnounced {
+ cid,
+ expire_at: now.saturating_add(AnnouncementLifetime::get()),
+ }));
+
+ // one more. success.
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ let cid = create_cid(3);
+ let maybe_expire_at = None;
+
+ assert_ok!(CollectiveContent::announce(origin, cid.clone(), maybe_expire_at));
+ System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementAnnounced {
+ cid,
+ expire_at: now.saturating_add(AnnouncementLifetime::get()),
+ }));
+
+ // one more with expire. success.
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ let cid = create_cid(4);
+ let maybe_expire_at = DispatchTime::<_>::After(10);
+
+ assert_ok!(CollectiveContent::announce(origin, cid.clone(), Some(maybe_expire_at)));
+ System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementAnnounced {
+ cid,
+ expire_at: maybe_expire_at.evaluate(now),
+ }));
+
+ // one more with later expire. success.
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ let cid = create_cid(5);
+ let maybe_expire_at = DispatchTime::<_>::At(now + 20);
+
+ assert_ok!(CollectiveContent::announce(origin, cid.clone(), Some(maybe_expire_at)));
+ System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementAnnounced {
+ cid,
+ expire_at: maybe_expire_at.evaluate(now),
+ }));
+
+ // one more with earlier expire. success.
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ let cid = create_cid(6);
+ let maybe_expire_at = DispatchTime::<_>::At(now + 5);
+
+ assert_ok!(CollectiveContent::announce(origin, cid.clone(), Some(maybe_expire_at)));
+ System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementAnnounced {
+ cid,
+ expire_at: maybe_expire_at.evaluate(now),
+ }));
+
+ // one more with earlier expire. success.
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ let cid = create_cid(7);
+ let maybe_expire_at = DispatchTime::<_>::At(now + 5);
+
+ assert_eq!(>::count(), MaxAnnouncements::get());
+ assert_noop!(
+ CollectiveContent::announce(origin, cid.clone(), Some(maybe_expire_at)),
+ Error::::TooManyAnnouncements
+ );
+ });
+}
+
+#[test]
+fn remove_announcement_works() {
+ new_test_ext().execute_with(|| {
+ // wrong origin.
+ let origin = RuntimeOrigin::signed(CharterManager::get());
+ let cid = create_cid(8);
+
+ assert_noop!(
+ CollectiveContent::remove_announcement(origin, cid),
+ Error::::MissingAnnouncement
+ );
+
+ // missing announcement.
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ let cid = create_cid(9);
+
+ assert_noop!(
+ CollectiveContent::remove_announcement(origin, cid),
+ Error::::MissingAnnouncement
+ );
+
+ // wrong origin. announcement not yet expired.
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ let cid = create_cid(10);
+ assert_ok!(CollectiveContent::announce(origin.clone(), cid.clone(), None));
+ assert!(>::contains_key(cid.clone()));
+
+ let origin = RuntimeOrigin::signed(SomeAccount::get());
+ assert_noop!(CollectiveContent::remove_announcement(origin, cid.clone()), BadOrigin);
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ assert_ok!(CollectiveContent::remove_announcement(origin, cid));
+
+ // success.
+
+ // remove first announcement and assert.
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ let cid = create_cid(11);
+ assert_ok!(CollectiveContent::announce(origin.clone(), cid.clone(), None));
+ assert!(>::contains_key(cid.clone()));
+
+ let info = CollectiveContent::remove_announcement(origin.clone(), cid.clone()).unwrap();
+ assert_eq!(info.pays_fee, Pays::Yes);
+ System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementRemoved {
+ cid: cid.clone(),
+ }));
+ assert_noop!(
+ CollectiveContent::remove_announcement(origin, cid.clone()),
+ Error::::MissingAnnouncement
+ );
+ assert!(!>::contains_key(cid));
+
+ // remove expired announcement and assert.
+ let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+ let cid = create_cid(12);
+ assert_ok!(CollectiveContent::announce(
+ origin.clone(),
+ cid.clone(),
+ Some(DispatchTime::<_>::At(10))
+ ));
+ assert!(>::contains_key(cid.clone()));
+
+ System::set_block_number(11);
+ let origin = RuntimeOrigin::signed(SomeAccount::get());
+ let info = CollectiveContent::remove_announcement(origin.clone(), cid.clone()).unwrap();
+ assert_eq!(info.pays_fee, Pays::No);
+ System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementRemoved {
+ cid: cid.clone(),
+ }));
+ assert_noop!(
+ CollectiveContent::remove_announcement(origin, cid),
+ Error::::MissingAnnouncement
+ );
+ });
+}
diff --git a/cumulus/parachains/pallets/collective-content/src/weights.rs b/cumulus/parachains/pallets/collective-content/src/weights.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7ebbaabb5acc2451dc9323874c4f912f98ad8fef
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/src/weights.rs
@@ -0,0 +1,41 @@
+// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The pallet weight info trait and its unit implementation.
+
+use frame_support::weights::Weight;
+
+/// Weights information needed for the pallet.
+pub trait WeightInfo {
+ /// Returns the weight of the set_charter extrinsic.
+ fn set_charter() -> Weight;
+ /// Returns the weight of the announce extrinsic.
+ fn announce() -> Weight;
+ /// Returns the weight of the remove_announcement extrinsic.
+ fn remove_announcement() -> Weight;
+}
+
+/// Unit implementation of the [WeightInfo].
+impl WeightInfo for () {
+ fn set_charter() -> Weight {
+ Weight::zero()
+ }
+ fn announce() -> Weight {
+ Weight::zero()
+ }
+ fn remove_announcement() -> Weight {
+ Weight::zero()
+ }
+}
diff --git a/cumulus/parachains/pallets/parachain-info/Cargo.toml b/cumulus/parachains/pallets/parachain-info/Cargo.toml
index 4ed11e3943980c0de0af6deacdd73aa528dc0044..931df9d9273d8cf0d511ff321973593ecf563657 100644
--- a/cumulus/parachains/pallets/parachain-info/Cargo.toml
+++ b/cumulus/parachains/pallets/parachain-info/Cargo.toml
@@ -3,7 +3,6 @@ authors.workspace = true
edition.workspace = true
name = "parachain-info"
version = "0.1.0"
-publish = false
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
index 53555499842fde9684b3a5b33087ca8de80643ee..1d0c7bc98563417169a3a17586de695e1ba36a3a 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
@@ -100,6 +100,7 @@ runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+ "cumulus-primitives-utility/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
@@ -118,6 +119,7 @@ runtime-benchmarks = [
"pallet-utility/runtime-benchmarks",
"pallet-xcm-benchmarks/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/constants.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/constants.rs
deleted file mode 100644
index 8daf8fda4b4a2e645ee24af8525cf15ef2b95e89..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/constants.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod currency {
- use kusama_runtime_constants as constants;
- use polkadot_core_primitives::Balance;
-
- /// The existential deposit. Set to 1/10 of its parent Relay Chain.
- pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
-
- pub const UNITS: Balance = constants::currency::UNITS;
- pub const CENTS: Balance = constants::currency::CENTS;
- pub const GRAND: Balance = constants::currency::GRAND;
- pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
-
- pub const fn deposit(items: u32, bytes: u32) -> Balance {
- // map to 1/100 of what the kusama relay chain charges (v9020)
- constants::currency::deposit(items, bytes) / 100
- }
-}
-
-/// Fee-related.
-pub mod fee {
- use frame_support::weights::{
- constants::ExtrinsicBaseWeight, FeePolynomial, Weight, WeightToFeeCoefficient,
- WeightToFeeCoefficients, WeightToFeePolynomial,
- };
- use polkadot_core_primitives::Balance;
- use smallvec::smallvec;
- pub use sp_runtime::Perbill;
-
- /// The block saturation level. Fees will be updates based on this value.
- pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
-
- /// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
- /// node's balance type.
- ///
- /// This should typically create a mapping between the following ranges:
- /// - [0, MAXIMUM_BLOCK_WEIGHT]
- /// - [Balance::min, Balance::max]
- ///
- /// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
- /// - Setting it to `0` will essentially disable the weight fee.
- /// - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
- pub struct WeightToFee;
- impl frame_support::weights::WeightToFee for WeightToFee {
- type Balance = Balance;
-
- fn weight_to_fee(weight: &Weight) -> Self::Balance {
- let time_poly: FeePolynomial = RefTimeToFee::polynomial().into();
- let proof_poly: FeePolynomial = ProofSizeToFee::polynomial().into();
-
- // Take the maximum instead of the sum to charge by the more scarce resource.
- time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
- }
- }
-
- /// Maps the reference time component of `Weight` to a fee.
- pub struct RefTimeToFee;
- impl WeightToFeePolynomial for RefTimeToFee {
- type Balance = Balance;
- fn polynomial() -> WeightToFeeCoefficients {
- // in Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 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());
-
- smallvec![WeightToFeeCoefficient {
- degree: 1,
- negative: false,
- coeff_frac: Perbill::from_rational(p % q, q),
- coeff_integer: p / q,
- }]
- }
- }
-
- /// Maps the proof size component of `Weight` to a fee.
- pub struct ProofSizeToFee;
- impl WeightToFeePolynomial for ProofSizeToFee {
- type Balance = Balance;
- fn polynomial() -> WeightToFeeCoefficients {
- // Map 10kb proof to 1 CENT.
- let p = super::currency::CENTS;
- let q = 10_000;
-
- smallvec![WeightToFeeCoefficient {
- degree: 1,
- negative: false,
- coeff_frac: Perbill::from_rational(p % q, q),
- coeff_integer: p / q,
- }]
- }
- }
-}
-
-/// Consensus-related.
-pub mod consensus {
- /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
- /// into the relay chain.
- pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
- /// How many parachain blocks are processed by the relay chain per parent. Limits the
- /// number of blocks authored per slot.
- pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
- /// Relay chain slot duration, in milliseconds.
- pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs
index afccc5c068b5e7b6629d1a8e03d29497d93d28ca..828d1b4750a3e0436bc18f7926489a04a4b2bb9e 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs
@@ -24,7 +24,6 @@
#[cfg(feature = "std")]
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-pub mod constants;
mod weights;
pub mod xcm_config;
@@ -50,7 +49,6 @@ use sp_version::NativeVersion;
use sp_version::RuntimeVersion;
use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{consensus::*, currency::*, fee::WeightToFee};
use frame_support::{
construct_runtime,
dispatch::DispatchClass,
@@ -70,8 +68,10 @@ use pallet_asset_conversion_tx_payment::AssetConversionAdapter;
use pallet_nfts::PalletFeatures;
pub use parachains_common as common;
use parachains_common::{
- impls::DealWithFees, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber,
- Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
+ impls::DealWithFees,
+ kusama::{consensus::*, currency::*, fee::WeightToFee},
+ AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header, Nonce,
+ Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
NORMAL_DISPATCH_RATIO, SLOT_DURATION,
};
use sp_runtime::RuntimeDebug;
@@ -1395,8 +1395,9 @@ fn ensure_key_ss58() {
#[cfg(test)]
mod tests {
- use super::{constants::fee, *};
+ use super::*;
use crate::{CENTS, MILLICENTS};
+ use parachains_common::kusama::fee;
use sp_runtime::traits::Zero;
use sp_weights::WeightToFee;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs
index 6d9eccdf3744778af680575cbac79490732ad1ea..7d49b56e461a0a3919e2130dbb6d84f6888349ad 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs
@@ -21,7 +21,6 @@ use asset_hub_kusama_runtime::xcm_config::{
AssetFeeAsExistentialDepositMultiplierFeeCharger, KsmLocation, TrustBackedAssetsPalletLocation,
};
pub use asset_hub_kusama_runtime::{
- constants::fee::WeightToFee,
xcm_config::{CheckingAccount, ForeignCreatorsSovereignAccountOf, XcmConfig},
AllPalletsWithoutSystem, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime,
@@ -35,7 +34,9 @@ use frame_support::{
traits::fungibles::InspectEnumerable,
weights::{Weight, WeightToFee as WeightToFeeT},
};
-use parachains_common::{AccountId, AssetIdForTrustBackedAssets, AuraId, Balance};
+use parachains_common::{
+ kusama::fee::WeightToFee, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance,
+};
use sp_runtime::traits::MaybeEquivalence;
use xcm::latest::prelude::*;
use xcm_executor::traits::{Identity, JustTry, WeightTrader};
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
index dfc3d5416cc3c7c2ebc51dee2aa68a495a6a5079..4a6ce4cbf593108fdc06c81853cd1dafaa7d3fde 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
@@ -88,6 +88,7 @@ runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+ "cumulus-primitives-utility/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
@@ -105,6 +106,7 @@ runtime-benchmarks = [
"pallet-utility/runtime-benchmarks",
"pallet-xcm-benchmarks/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/constants.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/constants.rs
deleted file mode 100644
index d430e38f1af15b423b2173778a1cb6376fa17835..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/constants.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod currency {
- use polkadot_core_primitives::Balance;
- use polkadot_runtime_constants as constants;
-
- /// The existential deposit. Set to 1/10 of its parent Relay Chain.
- pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
-
- pub const UNITS: Balance = constants::currency::UNITS;
- pub const DOLLARS: Balance = constants::currency::DOLLARS;
- pub const CENTS: Balance = constants::currency::CENTS;
- pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
-
- pub const fn deposit(items: u32, bytes: u32) -> Balance {
- // 1/100 of Polkadot
- constants::currency::deposit(items, bytes) / 100
- }
-}
-
-/// Fee-related.
-pub mod fee {
- use frame_support::weights::{
- constants::ExtrinsicBaseWeight, FeePolynomial, WeightToFeeCoefficient,
- WeightToFeeCoefficients, WeightToFeePolynomial,
- };
- use polkadot_core_primitives::Balance;
- use smallvec::smallvec;
- pub use sp_runtime::Perbill;
- use sp_weights::Weight;
-
- /// The block saturation level. Fees will be updates based on this value.
- pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
-
- /// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
- /// node's balance type.
- ///
- /// This should typically create a mapping between the following ranges:
- /// - [0, MAXIMUM_BLOCK_WEIGHT]
- /// - [Balance::min, Balance::max]
- ///
- /// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
- /// - Setting it to `0` will essentially disable the weight fee.
- /// - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
- pub struct WeightToFee;
- impl frame_support::weights::WeightToFee for WeightToFee {
- type Balance = Balance;
-
- fn weight_to_fee(weight: &Weight) -> Self::Balance {
- let time_poly: FeePolynomial = RefTimeToFee::polynomial().into();
- let proof_poly: FeePolynomial = ProofSizeToFee::polynomial().into();
-
- // Take the maximum instead of the sum to charge by the more scarce resource.
- time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
- }
- }
-
- /// Maps the reference time component of `Weight` to a fee.
- pub struct RefTimeToFee;
- impl WeightToFeePolynomial for RefTimeToFee {
- type Balance = Balance;
- fn polynomial() -> WeightToFeeCoefficients {
- // in Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 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());
-
- smallvec![WeightToFeeCoefficient {
- degree: 1,
- negative: false,
- coeff_frac: Perbill::from_rational(p % q, q),
- coeff_integer: p / q,
- }]
- }
- }
-
- /// Maps the proof size component of `Weight` to a fee.
- pub struct ProofSizeToFee;
- impl WeightToFeePolynomial for ProofSizeToFee {
- type Balance = Balance;
- fn polynomial() -> WeightToFeeCoefficients {
- // Map 10kb proof to 1 CENT.
- let p = super::currency::CENTS;
- let q = 10_000;
-
- smallvec![WeightToFeeCoefficient {
- degree: 1,
- negative: false,
- coeff_frac: Perbill::from_rational(p % q, q),
- coeff_integer: p / q,
- }]
- }
- }
-}
-
-/// Consensus-related.
-pub mod consensus {
- /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
- /// into the relay chain.
- pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
- /// How many parachain blocks are processed by the relay chain per parent. Limits the
- /// number of blocks authored per slot.
- pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
- /// Relay chain slot duration, in milliseconds.
- pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs
index 7275209802f15d9110db2e0faace126362a8a52a..0051af21f9a32b67ff87b0ca3b82373ff4778715 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs
@@ -59,7 +59,6 @@
#[cfg(feature = "std")]
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-pub mod constants;
mod weights;
pub mod xcm_config;
@@ -82,7 +81,6 @@ use sp_version::NativeVersion;
use sp_version::RuntimeVersion;
use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{consensus::*, currency::*, fee::WeightToFee};
use frame_support::{
construct_runtime,
dispatch::DispatchClass,
@@ -102,6 +100,7 @@ use pallet_nfts::PalletFeatures;
pub use parachains_common as common;
use parachains_common::{
impls::{AssetsToBlockAuthor, DealWithFees},
+ polkadot::{consensus::*, currency::*, fee::WeightToFee},
AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance, BlockNumber,
Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
NORMAL_DISPATCH_RATIO, SLOT_DURATION,
@@ -1228,8 +1227,9 @@ cumulus_pallet_parachain_system::register_validate_block! {
#[cfg(test)]
mod tests {
- use super::{constants::fee, *};
+ use super::*;
use crate::{CENTS, MILLICENTS};
+ use parachains_common::polkadot::fee;
use sp_runtime::traits::Zero;
use sp_weights::WeightToFee;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
index d59507e4bd07d4f5a8953c1ad62814a2ebbc2a37..65cf62a610f472105450db14429c5ae29b9b6843 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
@@ -186,6 +186,9 @@ match_types! {
pub type FellowshipSalaryPallet: impl Contains = {
MultiLocation { parents: 1, interior: X2(Parachain(1001), PalletInstance(64)) }
};
+ pub type AmbassadorSalaryPallet: impl Contains = {
+ MultiLocation { parents: 1, interior: X2(Parachain(1001), PalletInstance(74)) }
+ };
}
/// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
@@ -372,6 +375,7 @@ pub type Barrier = TrailingSetTopicAsId<
ParentOrParentsPlurality,
FellowsPlurality,
FellowshipSalaryPallet,
+ AmbassadorSalaryPallet,
)>,
// Subscriptions for version tracking are OK.
AllowSubscriptionsFrom,
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs
index 3eab6723ec20cd23a70f78d6e8afe93abe93199b..7200ebc16a2875336fc50e711386cab41df6c9b4 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs
@@ -22,10 +22,9 @@ use asset_hub_polkadot_runtime::xcm_config::{
ForeignCreatorsSovereignAccountOf, TrustBackedAssetsPalletLocation, XcmConfig,
};
pub use asset_hub_polkadot_runtime::{
- constants::fee::WeightToFee, AllPalletsWithoutSystem, AssetDeposit, Assets, Balances,
- ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, MetadataDepositBase,
- MetadataDepositPerByte, ParachainSystem, Runtime, RuntimeCall, RuntimeEvent, SessionKeys,
- System, TrustBackedAssetsInstance,
+ AllPalletsWithoutSystem, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
+ ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime,
+ RuntimeCall, RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance,
};
use asset_test_utils::{CollatorSessionKeys, ExtBuilder};
use codec::{Decode, Encode};
@@ -36,7 +35,8 @@ use frame_support::{
weights::{Weight, WeightToFee as WeightToFeeT},
};
use parachains_common::{
- AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance,
+ polkadot::fee::WeightToFee, AccountId, AssetHubPolkadotAuraId as AuraId,
+ AssetIdForTrustBackedAssets, Balance,
};
use sp_runtime::traits::MaybeEquivalence;
use xcm::latest::prelude::*;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
index 8c25842cbf3817c31c8e87b32025c1a5fa28c5de..f436ae9537f46b5266111f39bb039f841c3d4388 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
@@ -92,6 +92,7 @@ runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+ "cumulus-primitives-utility/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
@@ -110,6 +111,7 @@ runtime-benchmarks = [
"pallet-utility/runtime-benchmarks",
"pallet-xcm-benchmarks/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index b5f33e4e01458c5310207d59d2065b3886e4d677..4887fce1b0a4a5d633907cae17697b7793e781c8 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -24,7 +24,6 @@
#[cfg(feature = "std")]
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-pub mod constants;
mod weights;
pub mod xcm_config;
@@ -36,7 +35,6 @@ use assets_common::{
AssetIdForTrustBackedAssetsConvert,
};
use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{consensus::*, currency::*, fee::WeightToFee};
use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
use frame_support::{
construct_runtime,
@@ -57,8 +55,10 @@ use pallet_asset_conversion_tx_payment::AssetConversionAdapter;
use pallet_nfts::PalletFeatures;
pub use parachains_common as common;
use parachains_common::{
- impls::DealWithFees, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber,
- Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
+ impls::DealWithFees,
+ westend::{consensus::*, currency::*, fee::WeightToFee},
+ AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header, Nonce,
+ Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
NORMAL_DISPATCH_RATIO, SLOT_DURATION,
};
use sp_api::impl_runtime_apis;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
index b2bb511182eb2091dc1fd5c4d9a95baa0e51e970..599ff90e254aa5f4fb745e153b8a3e9b9addb0e8 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
@@ -17,13 +17,6 @@
//! Tests for the Westmint (Westend Assets Hub) chain.
-pub use asset_hub_westend_runtime::{
- constants::fee::WeightToFee,
- xcm_config::{CheckingAccount, TrustBackedAssetsPalletLocation, XcmConfig},
- AllowMultiAssetPools, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
- ForeignAssetsInstance, ParachainSystem, Runtime, SessionKeys, System,
- TrustBackedAssetsInstance,
-};
use asset_hub_westend_runtime::{
xcm_config::{
AssetFeeAsExistentialDepositMultiplierFeeCharger, ForeignCreatorsSovereignAccountOf,
@@ -32,6 +25,12 @@ use asset_hub_westend_runtime::{
AllPalletsWithoutSystem, MetadataDepositBase, MetadataDepositPerByte, RuntimeCall,
RuntimeEvent,
};
+pub use asset_hub_westend_runtime::{
+ xcm_config::{CheckingAccount, TrustBackedAssetsPalletLocation, XcmConfig},
+ AllowMultiAssetPools, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
+ ForeignAssetsInstance, ParachainSystem, Runtime, SessionKeys, System,
+ TrustBackedAssetsInstance,
+};
use asset_test_utils::{CollatorSessionKeys, ExtBuilder, XcmReceivedFrom};
use codec::{Decode, DecodeLimit, Encode};
use cumulus_primitives_utility::ChargeWeightInFungibles;
@@ -40,7 +39,9 @@ use frame_support::{
traits::fungibles::InspectEnumerable,
weights::{Weight, WeightToFee as WeightToFeeT},
};
-use parachains_common::{AccountId, AssetIdForTrustBackedAssets, AuraId, Balance};
+use parachains_common::{
+ westend::fee::WeightToFee, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance,
+};
use sp_io;
use sp_runtime::traits::MaybeEquivalence;
use std::convert::Into;
diff --git a/cumulus/parachains/runtimes/assets/common/Cargo.toml b/cumulus/parachains/runtimes/assets/common/Cargo.toml
index a8b5f3f8c6b9db84e8c18b654cc0379a641ced1c..0cd5de2ddcd47df05cf3f9dc76c39ada47ac0cb1 100644
--- a/cumulus/parachains/runtimes/assets/common/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/common/Cargo.toml
@@ -56,6 +56,7 @@ runtime-benchmarks = [
"pallet-asset-conversion/runtime-benchmarks",
"pallet-asset-tx-payment/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
diff --git a/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml b/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
index 7fee710f000c0d2bd44f6ddfba81e0b5c7eb1d3f..0a27535ed22bd447774fbf13636f1a2c09a5699c 100644
--- a/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
@@ -4,7 +4,6 @@ version = "1.0.0"
authors.workspace = true
edition.workspace = true
description = "Test utils for Asset Hub runtimes."
-publish = false
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/README.md b/cumulus/parachains/runtimes/bridge-hubs/README.md
index 1520065b7e3a47656c7215bdf2c3883c03c0c379..487c601ef84023310fe7e15c5642ca060c9e550b 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/README.md
+++ b/cumulus/parachains/runtimes/bridge-hubs/README.md
@@ -1,26 +1,26 @@
- [Bridge-hub Parachains](#bridge-hub-parachains)
- * [Requirements for local run/testing](#requirements-for-local-runtesting)
- * [How to test local Rococo <-> Wococo bridge](#how-to-test-local-rococo---wococo-bridge)
- + [Run chains (Rococo + BridgeHub, Wococo + BridgeHub) with zombienet](#run-chains-rococo--bridgehub-wococo--bridgehub-with-zombienet)
- + [Run relayer (BridgeHubRococo, BridgeHubWococo)](#run-relayer-bridgehubrococo-bridgehubwococo)
+ - [Requirements for local run/testing](#requirements-for-local-runtesting)
+ - [How to test local Rococo <-> Wococo bridge](#how-to-test-local-rococo---wococo-bridge)
+ - [Run chains (Rococo + BridgeHub, Wococo + BridgeHub) with
+ zombienet](#run-chains-rococo--bridgehub-wococo--bridgehub-with-zombienet)
+ - [Run relayer (BridgeHubRococo, BridgeHubWococo)](#run-relayer-bridgehubrococo-bridgehubwococo)
- [Run with script (alternative 1)](#run-with-script-alternative-1)
- [Run with binary (alternative 2)](#run-with-binary-alternative-2)
- + [Send messages - transfer asset over bridge](#send-messages---transfer-asset-over-bridge)
- * [How to test live BridgeHubRococo/BridgeHubWococo](#how-to-test-live-bridgehubrococobridgehubwococo)
- * [How to test local BridgeHubKusama/BridgeHubPolkadot](#how-to-test-local-bridgehubkusamabridgehubpolkadot)
+ - [Send messages - transfer asset over bridge](#send-messages---transfer-asset-over-bridge)
+ - [How to test live BridgeHubRococo/BridgeHubWococo](#how-to-test-live-bridgehubrococobridgehubwococo)
+ - [How to test local BridgeHubKusama/BridgeHubPolkadot](#how-to-test-local-bridgehubkusamabridgehubpolkadot)
# Bridge-hub Parachains
-_BridgeHub(s)_ are **_system parachains_** that will house trustless bridges from the local
-ecosystem to others.
-The current trustless bridges planned for the BridgeHub(s) are:
+_BridgeHub(s)_ are **_system parachains_** that will house trustless bridges from the local ecosystem to others. The
+current trustless bridges planned for the BridgeHub(s) are:
- `BridgeHubPolkadot` system parachain:
1. Polkadot <-> Kusama bridge
2. Polkadot <-> Ethereum bridge (Snowbridge)
- `BridgeHubKusama` system parachain:
1. Kusama <-> Polkadot bridge
- 2. Kusama <-> Ethereum bridge
- The high-level responsibilities of each bridge living on BridgeHub:
+ 2. Kusama <-> Ethereum bridge The high-level
+ responsibilities of each bridge living on BridgeHub:
- sync finality proofs between relay chains (or equivalent)
- sync finality proofs between BridgeHub parachains
- pass (XCM) messages between different BridgeHub parachains
@@ -192,43 +192,40 @@ RUST_LOG=runtime=trace,rpc=trace,bridge=trace \
```
**Check relay-chain headers relaying:**
-- Rococo parachain:
- - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8943#/chainstate
- - Pallet: **bridgeWococoGrandpa**
- - Keys: **bestFinalized()**
-- Wococo parachain:
- - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate
- - Pallet: **bridgeRococoGrandpa**
- - Keys: **bestFinalized()**
+- Rococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8943#/chainstate - Pallet:
+ **bridgeWococoGrandpa** - Keys: **bestFinalized()**
+- Wococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate - Pallet:
+ **bridgeRococoGrandpa** - Keys: **bestFinalized()**
**Check parachain headers relaying:**
-- Rococo parachain:
- - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8943#/chainstate
- - Pallet: **bridgeWococoParachain**
- - Keys: **bestParaHeads()**
-- Wococo parachain:
- - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate
- - Pallet: **bridgeRococoParachain**
- - Keys: **bestParaHeads()**
+- Rococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8943#/chainstate - Pallet:
+ **bridgeWococoParachain** - Keys: **bestParaHeads()**
+- Wococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate - Pallet:
+ **bridgeRococoParachain** - Keys: **bestParaHeads()**
### Send messages - transfer asset over bridge
TODO: see `# !!! READ HERE` above
## How to test live BridgeHubRococo/BridgeHubWococo
-(here is still deployed older PoC from branch `origin/bko-transfer-asset-via-bridge`, which uses custom extrinsic, which is going to be replaced by `pallet_xcm` usage)
+(here is still deployed older PoC from branch `origin/bko-transfer-asset-via-bridge`, which uses custom extrinsic, which
+is going to be replaced by `pallet_xcm` usage)
- uses account seed on Live Rococo:Rockmine2
```
cd
./scripts/bridges_rococo_wococo.sh transfer-asset-from-asset-hub-rococo
```
-- open explorers:
- - Rockmine2 (see events `xcmpQueue.XcmpMessageSent`, `bridgeTransfer.ReserveAssetsDeposited`, `bridgeTransfer.TransferInitiated`) https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fws-rococo-rockmine2-collator-node-0.parity-testnet.parity.io#/explorer
- - BridgeHubRococo (see `bridgeWococoMessages.MessageAccepted`) https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-bridge-hub-rpc.polkadot.io#/explorer
- - BridgeHubWococo (see `bridgeRococoMessages.MessagesReceived`) https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwococo-bridge-hub-rpc.polkadot.io#/explorer
- - Wockmint (see `xcmpQueue.Success` for `transfer-asset` and `xcmpQueue.Fail` for `ping-via-bridge`) https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwococo-wockmint-rpc.polkadot.io#/explorer
- - BridgeHubRococo (see `bridgeWococoMessages.MessagesDelivered`)
+- open explorers: - Rockmine2 (see events `xcmpQueue.XcmpMessageSent`, `bridgeTransfer.ReserveAssetsDeposited`,
+ `bridgeTransfer.TransferInitiated`)
+ https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fws-rococo-rockmine2-collator-node-0.parity-testnet.parity.io#/explorer
+ - BridgeHubRococo (see `bridgeWococoMessages.MessageAccepted`)
+ https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-bridge-hub-rpc.polkadot.io#/explorer - BridgeHubWococo (see
+ `bridgeRococoMessages.MessagesReceived`)
+ https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwococo-bridge-hub-rpc.polkadot.io#/explorer - Wockmint (see
+ `xcmpQueue.Success` for `transfer-asset` and `xcmpQueue.Fail` for `ping-via-bridge`)
+ https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwococo-wockmint-rpc.polkadot.io#/explorer - BridgeHubRococo (see
+ `bridgeWococoMessages.MessagesDelivered`)
## How to test local BridgeHubKusama/BridgeHubPolkadot
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
index 91eb7adc61feeafb4d060e59039a40df999eaa3d..67c3fa37df0480793df8c7a8a0730f34a4533a71 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
@@ -137,6 +137,7 @@ runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+ "cumulus-primitives-utility/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
@@ -148,6 +149,7 @@ runtime-benchmarks = [
"pallet-utility/runtime-benchmarks",
"pallet-xcm-benchmarks/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/constants.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/constants.rs
deleted file mode 100644
index 760bf7fb6d1f9d31d00a5510834e40174c96ddd9..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/constants.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod currency {
- use kusama_runtime_constants as constants;
- use polkadot_core_primitives::Balance;
-
- /// The existential deposit. Set to 1/10 of its parent Relay Chain.
- pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
-
- pub const UNITS: Balance = constants::currency::UNITS;
- pub const CENTS: Balance = constants::currency::CENTS;
- pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
-
- pub const fn deposit(items: u32, bytes: u32) -> Balance {
- // map to 1/100 of what the kusama relay chain charges (v9020)
- constants::currency::deposit(items, bytes) / 100
- }
-}
-
-/// Fee-related.
-pub mod fee {
- use frame_support::{
- pallet_prelude::Weight,
- weights::{
- constants::ExtrinsicBaseWeight, FeePolynomial, WeightToFeeCoefficient,
- WeightToFeeCoefficients, WeightToFeePolynomial,
- },
- };
- use polkadot_core_primitives::Balance;
- use smallvec::smallvec;
- pub use sp_runtime::Perbill;
-
- /// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
- /// node's balance type.
- ///
- /// This should typically create a mapping between the following ranges:
- /// - [0, MAXIMUM_BLOCK_WEIGHT]
- /// - [Balance::min, Balance::max]
- ///
- /// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
- /// - Setting it to `0` will essentially disable the weight fee.
- /// - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
- pub struct WeightToFee;
- impl frame_support::weights::WeightToFee for WeightToFee {
- type Balance = Balance;
-
- fn weight_to_fee(weight: &Weight) -> Self::Balance {
- let time_poly: FeePolynomial = RefTimeToFee::polynomial().into();
- let proof_poly: FeePolynomial = ProofSizeToFee::polynomial().into();
-
- // Take the maximum instead of the sum to charge by the more scarce resource.
- time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
- }
- }
-
- /// Maps the reference time component of `Weight` to a fee.
- pub struct RefTimeToFee;
- impl WeightToFeePolynomial for RefTimeToFee {
- type Balance = Balance;
- fn polynomial() -> WeightToFeeCoefficients {
- // in Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
- // in Bridge 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());
-
- smallvec![WeightToFeeCoefficient {
- degree: 1,
- negative: false,
- coeff_frac: Perbill::from_rational(p % q, q),
- coeff_integer: p / q,
- }]
- }
- }
-
- /// Maps the proof size component of `Weight` to a fee.
- pub struct ProofSizeToFee;
- impl WeightToFeePolynomial for ProofSizeToFee {
- type Balance = Balance;
- fn polynomial() -> WeightToFeeCoefficients {
- // Map 10kb proof to 1 CENT.
- let p = super::currency::CENTS;
- let q = 10_000;
-
- smallvec![WeightToFeeCoefficient {
- degree: 1,
- negative: false,
- coeff_frac: Perbill::from_rational(p % q, q),
- coeff_integer: p / q,
- }]
- }
- }
-}
-
-/// Consensus-related.
-pub mod consensus {
- /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
- /// into the relay chain.
- pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
- /// How many parachain blocks are processed by the relay chain per parent. Limits the
- /// number of blocks authored per slot.
- pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
- /// Relay chain slot duration, in milliseconds.
- pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs
index 044ff845fe66d438c7c177aa90303b1847c5aae2..54b15e6b327b51eefefcb22e9987aac287401192 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs
@@ -22,7 +22,6 @@
#[cfg(feature = "std")]
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-pub mod constants;
mod weights;
pub mod xcm_config;
@@ -41,7 +40,6 @@ use sp_std::prelude::*;
use sp_version::NativeVersion;
use sp_version::RuntimeVersion;
-use constants::{consensus::*, currency::*, fee::WeightToFee};
use frame_support::{
construct_runtime,
dispatch::DispatchClass,
@@ -69,8 +67,10 @@ use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
use parachains_common::{
- impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature,
- AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
+ impls::DealWithFees,
+ kusama::{consensus::*, currency::*, fee::WeightToFee},
+ AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
+ HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
};
// XCM Imports
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs
index 5418e36bd120fbef6bbe520e520686613bf65974..893524e12f66230f5de2a48966344b8b93f08489 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs
@@ -15,12 +15,12 @@
// along with Cumulus. If not, see .
pub use bridge_hub_kusama_runtime::{
- constants::fee::WeightToFee, xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances,
- ExistentialDeposit, ParachainSystem, PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
+ xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances, ExistentialDeposit, ParachainSystem,
+ PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
};
use codec::Decode;
use frame_support::parameter_types;
-use parachains_common::{AccountId, AuraId};
+use parachains_common::{kusama::fee::WeightToFee, AccountId, AuraId};
const ALICE: [u8; 32] = [1u8; 32];
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
index 52a866b7097149da2be98bf32403bbb4877f0292..77923ee74f89ed495af94ac560668186f55ee414 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
@@ -137,6 +137,7 @@ runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+ "cumulus-primitives-utility/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
@@ -148,6 +149,7 @@ runtime-benchmarks = [
"pallet-utility/runtime-benchmarks",
"pallet-xcm-benchmarks/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/constants.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/constants.rs
deleted file mode 100644
index 3bab7bd1eb338e94e62517cc84d8488ae4bc50c9..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/constants.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod currency {
- use polkadot_core_primitives::Balance;
- use polkadot_runtime_constants as constants;
-
- /// The existential deposit. Set to 1/10 of its parent Relay Chain.
- pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
-
- pub const UNITS: Balance = constants::currency::UNITS;
- pub const CENTS: Balance = constants::currency::CENTS;
- pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
-
- pub const fn deposit(items: u32, bytes: u32) -> Balance {
- // 1/100 of Polkadot
- constants::currency::deposit(items, bytes) / 100
- }
-}
-
-/// Fee-related.
-pub mod fee {
- use frame_support::{
- pallet_prelude::Weight,
- weights::{
- constants::ExtrinsicBaseWeight, FeePolynomial, WeightToFeeCoefficient,
- WeightToFeeCoefficients, WeightToFeePolynomial,
- },
- };
- use polkadot_core_primitives::Balance;
- use smallvec::smallvec;
- pub use sp_runtime::Perbill;
-
- /// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
- /// node's balance type.
- ///
- /// This should typically create a mapping between the following ranges:
- /// - [0, MAXIMUM_BLOCK_WEIGHT]
- /// - [Balance::min, Balance::max]
- ///
- /// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
- /// - Setting it to `0` will essentially disable the weight fee.
- /// - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
- pub struct WeightToFee;
- impl frame_support::weights::WeightToFee for WeightToFee {
- type Balance = Balance;
-
- fn weight_to_fee(weight: &Weight) -> Self::Balance {
- let time_poly: FeePolynomial = RefTimeToFee::polynomial().into();
- let proof_poly: FeePolynomial = ProofSizeToFee::polynomial().into();
-
- // Take the maximum instead of the sum to charge by the more scarce resource.
- time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
- }
- }
-
- /// Maps the reference time component of `Weight` to a fee.
- pub struct RefTimeToFee;
- impl WeightToFeePolynomial for RefTimeToFee {
- type Balance = Balance;
- fn polynomial() -> WeightToFeeCoefficients {
- // in Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
- // in Bridge 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());
-
- smallvec![WeightToFeeCoefficient {
- degree: 1,
- negative: false,
- coeff_frac: Perbill::from_rational(p % q, q),
- coeff_integer: p / q,
- }]
- }
- }
-
- /// Maps the proof size component of `Weight` to a fee.
- pub struct ProofSizeToFee;
- impl WeightToFeePolynomial for ProofSizeToFee {
- type Balance = Balance;
- fn polynomial() -> WeightToFeeCoefficients {
- // Map 10kb proof to 1 CENT.
- let p = super::currency::CENTS;
- let q = 10_000;
-
- smallvec![WeightToFeeCoefficient {
- degree: 1,
- negative: false,
- coeff_frac: Perbill::from_rational(p % q, q),
- coeff_integer: p / q,
- }]
- }
- }
-}
-
-/// Consensus-related.
-pub mod consensus {
- /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
- /// into the relay chain.
- pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
- /// How many parachain blocks are processed by the relay chain per parent. Limits the
- /// number of blocks authored per slot.
- pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
- /// Relay chain slot duration, in milliseconds.
- pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs
index f735858a93400bdb33ea59bcb8ccadd8bff2f658..dbfdc249a3cd7aad3cb5482f4f4a5e3a5493e0a0 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs
@@ -22,7 +22,6 @@
#[cfg(feature = "std")]
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-pub mod constants;
mod weights;
pub mod xcm_config;
@@ -41,7 +40,6 @@ use sp_std::prelude::*;
use sp_version::NativeVersion;
use sp_version::RuntimeVersion;
-use constants::{consensus::*, currency::*, fee::WeightToFee};
use frame_support::{
construct_runtime,
dispatch::DispatchClass,
@@ -70,8 +68,10 @@ use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
use parachains_common::{
- impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature,
- AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
+ impls::DealWithFees,
+ polkadot::{consensus::*, currency::*, fee::WeightToFee},
+ AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
+ HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
};
// XCM Imports
use xcm::latest::prelude::BodyId;
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs
index 03b23cdd7ac221d8af10459e73c64d0a5f477215..0be87bd46facfc079cda4a1ea4cf6b7a34114d75 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs
@@ -15,12 +15,12 @@
// along with Cumulus. If not, see .
pub use bridge_hub_polkadot_runtime::{
- constants::fee::WeightToFee, xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances,
- ExistentialDeposit, ParachainSystem, PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
+ xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances, ExistentialDeposit, ParachainSystem,
+ PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
};
use codec::Decode;
use frame_support::parameter_types;
-use parachains_common::{AccountId, AuraId};
+use parachains_common::{polkadot::fee::WeightToFee, AccountId, AuraId};
const ALICE: [u8; 32] = [1u8; 32];
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
index d65fb9b72cd1cdcb263eb006ff82326cb71a28c2..70c62d1a34fd9fb6f375f456ad5729b52af8e19d 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
@@ -72,26 +72,26 @@ parachain-info = { path = "../../../pallets/parachain-info", default-features =
parachains-common = { path = "../../../common", default-features = false }
# Bridges
-bp-bridge-hub-rococo = { path = "../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
-bp-bridge-hub-wococo = { path = "../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
-bp-header-chain = { path = "../../../../bridges/primitives/header-chain", default-features = false }
-bp-messages = { path = "../../../../bridges/primitives/messages", default-features = false }
-bp-parachains = { path = "../../../../bridges/primitives/parachains", default-features = false }
-bp-polkadot-core = { path = "../../../../bridges/primitives/polkadot-core", default-features = false }
-bp-relayers = { path = "../../../../bridges/primitives/relayers", default-features = false }
-bp-runtime = { path = "../../../../bridges/primitives/runtime", default-features = false }
-bp-rococo = { path = "../../../../bridges/primitives/chain-rococo", default-features = false }
-bp-wococo = { path = "../../../../bridges/primitives/chain-wococo", default-features = false }
-pallet-bridge-grandpa = { path = "../../../../bridges/modules/grandpa", default-features = false }
-pallet-bridge-messages = { path = "../../../../bridges/modules/messages", default-features = false }
-pallet-bridge-parachains = { path = "../../../../bridges/modules/parachains", default-features = false }
-pallet-bridge-relayers = { path = "../../../../bridges/modules/relayers", default-features = false }
-bridge-runtime-common = { path = "../../../../bridges/bin/runtime-common", default-features = false }
+bp-bridge-hub-rococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
+bp-bridge-hub-wococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
+bp-header-chain = { path = "../../../../../bridges/primitives/header-chain", default-features = false }
+bp-messages = { path = "../../../../../bridges/primitives/messages", default-features = false }
+bp-parachains = { path = "../../../../../bridges/primitives/parachains", default-features = false }
+bp-polkadot-core = { path = "../../../../../bridges/primitives/polkadot-core", default-features = false }
+bp-relayers = { path = "../../../../../bridges/primitives/relayers", default-features = false }
+bp-runtime = { path = "../../../../../bridges/primitives/runtime", default-features = false }
+bp-rococo = { path = "../../../../../bridges/primitives/chain-rococo", default-features = false }
+bp-wococo = { path = "../../../../../bridges/primitives/chain-wococo", default-features = false }
+pallet-bridge-grandpa = { path = "../../../../../bridges/modules/grandpa", default-features = false }
+pallet-bridge-messages = { path = "../../../../../bridges/modules/messages", default-features = false }
+pallet-bridge-parachains = { path = "../../../../../bridges/modules/parachains", default-features = false }
+pallet-bridge-relayers = { path = "../../../../../bridges/modules/relayers", default-features = false }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", default-features = false }
[dev-dependencies]
static_assertions = "1.1"
bridge-hub-test-utils = { path = "../test-utils" }
-bridge-runtime-common = { path = "../../../../bridges/bin/runtime-common", features = ["integrity-test"] }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", features = ["integrity-test"] }
sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
[features]
@@ -173,6 +173,7 @@ runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+ "cumulus-primitives-utility/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
@@ -188,6 +189,7 @@ runtime-benchmarks = [
"pallet-utility/runtime-benchmarks",
"pallet-xcm-benchmarks/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
index a872e2327303c14f1361a949c1fb4036828c2ced..dbdc2133ec8881deca3600ef29fc551e83f0a45b 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -24,11 +24,9 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
pub mod bridge_hub_rococo_config;
pub mod bridge_hub_wococo_config;
-pub mod constants;
mod weights;
pub mod xcm_config;
-use constants::{consensus::*, currency::*};
use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
use sp_api::impl_runtime_apis;
use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
@@ -79,7 +77,6 @@ use crate::{
BridgeRefundBridgeHubRococoMessages, OnBridgeHubWococoBlobDispatcher,
WithBridgeHubRococoMessageBridge,
},
- constants::fee::WeightToFee,
xcm_config::XcmRouter,
};
use bridge_runtime_common::{
@@ -87,8 +84,10 @@ use bridge_runtime_common::{
messages_xcm_extension::{XcmAsPlainPayload, XcmBlobMessageDispatch},
};
use parachains_common::{
- impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature,
- AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
+ impls::DealWithFees,
+ rococo::{consensus::*, currency::*, fee::WeightToFee},
+ AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
+ HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
};
use xcm_executor::XcmExecutor;
@@ -1071,7 +1070,7 @@ impl_runtime_apis! {
) -> (bridge_hub_rococo_config::FromWococoBridgeHubMessagesProof, Weight) {
use cumulus_primitives_core::XcmpMessageSource;
assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
- ParachainSystem::open_outbound_hrmp_channel_for_benchmarks(42.into());
+ ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(42.into());
prepare_message_proof_from_parachain::<
Runtime,
BridgeGrandpaWococoInstance,
@@ -1114,7 +1113,7 @@ impl_runtime_apis! {
) -> (bridge_hub_wococo_config::FromRococoBridgeHubMessagesProof, Weight) {
use cumulus_primitives_core::XcmpMessageSource;
assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
- ParachainSystem::open_outbound_hrmp_channel_for_benchmarks(42.into());
+ ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(42.into());
prepare_message_proof_from_parachain::<
Runtime,
BridgeGrandpaRococoInstance,
@@ -1244,55 +1243,67 @@ cumulus_pallet_parachain_system::register_validate_block! {
#[cfg(test)]
mod tests {
use super::*;
- use bp_runtime::TransactionEra;
- use bridge_hub_test_utils::test_header;
use codec::Encode;
-
- pub type TestBlockHeader =
- sp_runtime::generic::Header;
+ use sp_runtime::{
+ generic::Era,
+ traits::{SignedExtension, Zero},
+ };
#[test]
fn ensure_signed_extension_definition_is_compatible_with_relay() {
- let payload: SignedExtra = (
- frame_system::CheckNonZeroSender::new(),
- frame_system::CheckSpecVersion::new(),
- frame_system::CheckTxVersion::new(),
- frame_system::CheckGenesis::new(),
- frame_system::CheckEra::from(sp_runtime::generic::Era::Immortal),
- frame_system::CheckNonce::from(10),
- frame_system::CheckWeight::new(),
- pallet_transaction_payment::ChargeTransactionPayment::from(10),
- BridgeRejectObsoleteHeadersAndMessages {},
- (
- BridgeRefundBridgeHubRococoMessages::default(),
- BridgeRefundBridgeHubWococoMessages::default(),
- ),
- );
-
- {
- use bp_bridge_hub_rococo::BridgeHubSignedExtension;
- let bhr_indirect_payload = bp_bridge_hub_rococo::SignedExtension::from_params(
- 10,
- 10,
- TransactionEra::Immortal,
- test_header::(1).hash(),
- 10,
- 10,
+ use bp_polkadot_core::SuffixedCommonSignedExtensionExt;
+
+ sp_io::TestExternalities::default().execute_with(|| {
+ frame_system::BlockHash::::insert(BlockNumber::zero(), Hash::default());
+ let payload: SignedExtra = (
+ frame_system::CheckNonZeroSender::new(),
+ frame_system::CheckSpecVersion::new(),
+ frame_system::CheckTxVersion::new(),
+ frame_system::CheckGenesis::new(),
+ frame_system::CheckEra::from(Era::Immortal),
+ frame_system::CheckNonce::from(10),
+ frame_system::CheckWeight::new(),
+ pallet_transaction_payment::ChargeTransactionPayment::from(10),
+ BridgeRejectObsoleteHeadersAndMessages,
+ (
+ BridgeRefundBridgeHubRococoMessages::default(),
+ BridgeRefundBridgeHubWococoMessages::default(),
+ ),
);
- assert_eq!(payload.encode(), bhr_indirect_payload.encode());
- }
- {
- use bp_bridge_hub_wococo::BridgeHubSignedExtension;
- let bhw_indirect_payload = bp_bridge_hub_wococo::SignedExtension::from_params(
- 10,
- 10,
- TransactionEra::Immortal,
- test_header::(1).hash(),
- 10,
- 10,
- );
- assert_eq!(payload.encode(), bhw_indirect_payload.encode());
- }
+ {
+ let bhr_indirect_payload = bp_bridge_hub_rococo::SignedExtension::from_params(
+ VERSION.spec_version,
+ VERSION.transaction_version,
+ bp_runtime::TransactionEra::Immortal,
+ System::block_hash(BlockNumber::zero()),
+ 10,
+ 10,
+ (((), ()), ((), ())),
+ );
+ assert_eq!(payload.encode(), bhr_indirect_payload.encode());
+ assert_eq!(
+ payload.additional_signed().unwrap().encode(),
+ bhr_indirect_payload.additional_signed().unwrap().encode()
+ )
+ }
+
+ {
+ let bhw_indirect_payload = bp_bridge_hub_rococo::SignedExtension::from_params(
+ VERSION.spec_version,
+ VERSION.transaction_version,
+ bp_runtime::TransactionEra::Immortal,
+ System::block_hash(BlockNumber::zero()),
+ 10,
+ 10,
+ (((), ()), ((), ())),
+ );
+ assert_eq!(payload.encode(), bhw_indirect_payload.encode());
+ assert_eq!(
+ payload.additional_signed().unwrap().encode(),
+ bhw_indirect_payload.additional_signed().unwrap().encode()
+ )
+ }
+ });
}
}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs
index 77e7e0382d313ac1715c866b493e2f3804fa022e..e5fe67f2a8e5b29a46adcf2a133ce9e956df9d5b 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs
@@ -19,7 +19,6 @@
use bp_polkadot_core::Signature;
use bridge_hub_rococo_runtime::{
bridge_hub_rococo_config, bridge_hub_wococo_config,
- constants::fee::WeightToFee,
xcm_config::{RelayNetwork, XcmConfig},
AllPalletsWithoutSystem, BridgeRejectObsoleteHeadersAndMessages, DeliveryRewardInBalance,
Executive, ExistentialDeposit, ParachainSystem, PolkadotXcm, RequiredStakeForStakeAndSlash,
@@ -28,7 +27,7 @@ use bridge_hub_rococo_runtime::{
use codec::{Decode, Encode};
use frame_support::parameter_types;
use frame_system::pallet_prelude::HeaderFor;
-use parachains_common::{AccountId, AuraId, Balance};
+use parachains_common::{rococo::fee::WeightToFee, AccountId, AuraId, Balance};
use sp_keyring::AccountKeyring::Alice;
use sp_runtime::{
generic::{Era, SignedPayload},
diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
index 73678e8f91a363a3c6f5ccbcfb86d77b50543428..d56c32d8afabb3c40eb861f028c5f954889cf60d 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
@@ -4,7 +4,6 @@ version = "0.1.0"
authors.workspace = true
edition.workspace = true
description = "Utils for BridgeHub testing"
-publish = false
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
@@ -42,20 +41,20 @@ xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
# Bridges
-bp-bridge-hub-rococo = { path = "../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
-bp-bridge-hub-wococo = { path = "../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
-bp-header-chain = { path = "../../../../bridges/primitives/header-chain", default-features = false }
-bp-messages = { path = "../../../../bridges/primitives/messages", default-features = false }
-bp-parachains = { path = "../../../../bridges/primitives/parachains", default-features = false }
-bp-polkadot-core = { path = "../../../../bridges/primitives/polkadot-core", default-features = false }
-bp-relayers = { path = "../../../../bridges/primitives/relayers", default-features = false }
-bp-runtime = { path = "../../../../bridges/primitives/runtime", default-features = false }
-bp-test-utils = { path = "../../../../bridges/primitives/test-utils", default-features = false }
-pallet-bridge-grandpa = { path = "../../../../bridges/modules/grandpa", default-features = false }
-pallet-bridge-parachains = { path = "../../../../bridges/modules/parachains", default-features = false }
-pallet-bridge-messages = { path = "../../../../bridges/modules/messages", default-features = false }
-pallet-bridge-relayers = { path = "../../../../bridges/modules/relayers", default-features = false }
-bridge-runtime-common = { path = "../../../../bridges/bin/runtime-common", default-features = false }
+bp-bridge-hub-rococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
+bp-bridge-hub-wococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
+bp-header-chain = { path = "../../../../../bridges/primitives/header-chain", default-features = false }
+bp-messages = { path = "../../../../../bridges/primitives/messages", default-features = false }
+bp-parachains = { path = "../../../../../bridges/primitives/parachains", default-features = false }
+bp-polkadot-core = { path = "../../../../../bridges/primitives/polkadot-core", default-features = false }
+bp-relayers = { path = "../../../../../bridges/primitives/relayers", default-features = false }
+bp-runtime = { path = "../../../../../bridges/primitives/runtime", default-features = false }
+bp-test-utils = { path = "../../../../../bridges/primitives/test-utils", default-features = false }
+pallet-bridge-grandpa = { path = "../../../../../bridges/modules/grandpa", default-features = false }
+pallet-bridge-parachains = { path = "../../../../../bridges/modules/parachains", default-features = false }
+pallet-bridge-messages = { path = "../../../../../bridges/modules/messages", default-features = false }
+pallet-bridge-relayers = { path = "../../../../../bridges/modules/relayers", default-features = false }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", default-features = false }
[features]
default = [ "std" ]
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml b/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
index 1f17a0ef0e69ee4837ccf48b2d53aad54808c2d3..6a5806d3b90199726e0ee3e1d6d34dfa2d6578fb 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
@@ -72,6 +72,7 @@ cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-f
cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
+pallet-collective-content = { path = "../../../pallets/collective-content", default-features = false }
parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
parachains-common = { path = "../../../common", default-features = false }
@@ -87,6 +88,7 @@ runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+ "cumulus-primitives-utility/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
@@ -94,6 +96,7 @@ runtime-benchmarks = [
"pallet-alliance/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-collator-selection/runtime-benchmarks",
+ "pallet-collective-content/runtime-benchmarks",
"pallet-collective/runtime-benchmarks",
"pallet-core-fellowship/runtime-benchmarks",
"pallet-multisig/runtime-benchmarks",
@@ -106,6 +109,7 @@ runtime-benchmarks = [
"pallet-timestamp/runtime-benchmarks",
"pallet-utility/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
+ "parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
@@ -127,6 +131,7 @@ try-runtime = [
"pallet-authorship/try-runtime",
"pallet-balances/try-runtime",
"pallet-collator-selection/try-runtime",
+ "pallet-collective-content/try-runtime",
"pallet-collective/try-runtime",
"pallet-core-fellowship/try-runtime",
"pallet-multisig/try-runtime",
@@ -168,6 +173,7 @@ std = [
"pallet-authorship/std",
"pallet-balances/std",
"pallet-collator-selection/std",
+ "pallet-collective-content/std",
"pallet-collective/std",
"pallet-core-fellowship/std",
"pallet-multisig/std",
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/mod.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b055ffc8abf1337e1260156cd149fe21b0573ba0
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/mod.rs
@@ -0,0 +1,255 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The Ambassador Program.
+//!
+//! The module defines the following on-chain functionality of the Ambassador Program:
+//!
+//! - Managed set of program members, where every member has a [rank](ranks)
+//! (via [AmbassadorCollective](pallet_ranked_collective)).
+//! - Referendum functionality for the program members to propose, vote on, and execute
+//! proposals on behalf of the members of a certain [rank](Origin)
+//! (via [AmbassadorReferenda](pallet_referenda)).
+//! - Managed content (charter, announcements) (via [pallet_collective_content]).
+//! - Promotion and demotion periods, register of members' activity, and rank based salaries
+//! (via [AmbassadorCore](pallet_core_fellowship)).
+//! - Members' salaries (via [AmbassadorSalary](pallet_salary), requiring a member to be
+//! imported or inducted into [AmbassadorCore](pallet_core_fellowship)).
+
+pub mod origins;
+mod tracks;
+
+use super::*;
+use crate::xcm_config::{DotAssetHub, FellowshipAdminBodyId};
+use frame_support::traits::{EitherOf, MapSuccess, TryMapSuccess};
+pub use origins::pallet_origins as pallet_ambassador_origins;
+use origins::pallet_origins::{
+ EnsureAmbassadorsVoice, EnsureAmbassadorsVoiceFrom, EnsureHeadAmbassadorsVoice, Origin,
+};
+use parachains_common::polkadot::account;
+use sp_core::ConstU128;
+use sp_runtime::traits::{CheckedReduceBy, ConstU16, ConvertToValue, Replace};
+use xcm::prelude::*;
+use xcm_builder::{AliasesIntoAccountId32, PayOverXcm};
+
+/// The Ambassador Program's member ranks.
+pub mod ranks {
+ use pallet_ranked_collective::Rank;
+
+ #[allow(dead_code)]
+ pub const CANDIDATE: Rank = 0;
+ pub const AMBASSADOR_TIER_1: Rank = 1;
+ pub const AMBASSADOR_TIER_2: Rank = 2;
+ pub const SENIOR_AMBASSADOR_TIER_3: Rank = 3;
+ pub const SENIOR_AMBASSADOR_TIER_4: Rank = 4;
+ pub const HEAD_AMBASSADOR_TIER_5: Rank = 5;
+ pub const HEAD_AMBASSADOR_TIER_6: Rank = 6;
+ pub const HEAD_AMBASSADOR_TIER_7: Rank = 7;
+ pub const MASTER_AMBASSADOR_TIER_8: Rank = 8;
+ pub const MASTER_AMBASSADOR_TIER_9: Rank = 9;
+}
+
+impl pallet_ambassador_origins::Config for Runtime {}
+
+pub type AmbassadorCollectiveInstance = pallet_ranked_collective::Instance2;
+
+/// Demotion is by any of:
+/// - Root can promote arbitrarily.
+/// - the FellowshipAdmin origin (i.e. token holder referendum);
+/// - a senior members vote by the rank two above the current rank.
+pub type DemoteOrigin = EitherOf<
+ frame_system::EnsureRootWithSuccess>,
+ EitherOf<
+ MapSuccess<
+ EnsureXcm>,
+ Replace>,
+ >,
+ TryMapSuccess<
+ EnsureAmbassadorsVoiceFrom>,
+ CheckedReduceBy>,
+ >,
+ >,
+>;
+
+/// Promotion and approval (rank-retention) is by any of:
+/// - Root can promote arbitrarily.
+/// - the FellowshipAdmin origin (i.e. token holder referendum);
+/// - a senior members vote by the rank two above the new/current rank.
+/// - a member of rank `5` or above can add a candidate (rank `0`).
+pub type PromoteOrigin = EitherOf<
+ DemoteOrigin,
+ TryMapSuccess<
+ pallet_ranked_collective::EnsureMember<
+ Runtime,
+ AmbassadorCollectiveInstance,
+ { ranks::HEAD_AMBASSADOR_TIER_5 },
+ >,
+ Replace>,
+ >,
+>;
+
+impl pallet_ranked_collective::Config for Runtime {
+ type WeightInfo = weights::pallet_ranked_collective_ambassador_collective::WeightInfo;
+ type RuntimeEvent = RuntimeEvent;
+ type PromoteOrigin = PromoteOrigin;
+ type DemoteOrigin = DemoteOrigin;
+ type Polls = AmbassadorReferenda;
+ type MinRankOfClass = sp_runtime::traits::Identity;
+ type VoteWeight = pallet_ranked_collective::Linear;
+}
+
+parameter_types! {
+ pub const AlarmInterval: BlockNumber = 1;
+ pub const SubmissionDeposit: Balance = 0;
+ pub const UndecidingTimeout: BlockNumber = 7 * DAYS;
+ // The Ambassador Referenda pallet account, used as a temporarily place to deposit a slashed imbalance before teleport to the treasury.
+ pub AmbassadorPalletAccount: AccountId = account::AMBASSADOR_REFERENDA_PALLET_ID.into_account_truncating();
+}
+
+pub type AmbassadorReferendaInstance = pallet_referenda::Instance2;
+
+impl pallet_referenda::Config for Runtime {
+ type WeightInfo = weights::pallet_referenda_ambassador_referenda::WeightInfo;
+ type RuntimeCall = RuntimeCall;
+ type RuntimeEvent = RuntimeEvent;
+ type Scheduler = Scheduler;
+ type Currency = Balances;
+ // A proposal can be submitted by a member of the Ambassador Program of
+ // [ranks::SENIOR_AMBASSADOR_TIER_3] rank or higher.
+ type SubmitOrigin = pallet_ranked_collective::EnsureMember<
+ Runtime,
+ AmbassadorCollectiveInstance,
+ { ranks::SENIOR_AMBASSADOR_TIER_3 },
+ >;
+ type CancelOrigin = EitherOf, EnsureHeadAmbassadorsVoice>;
+ type KillOrigin = EitherOf, EnsureHeadAmbassadorsVoice>;
+ type Slash = ToParentTreasury;
+ type Votes = pallet_ranked_collective::Votes;
+ type Tally = pallet_ranked_collective::TallyOf;
+ type SubmissionDeposit = SubmissionDeposit;
+ type MaxQueued = ConstU32<20>;
+ type UndecidingTimeout = UndecidingTimeout;
+ type AlarmInterval = AlarmInterval;
+ type Tracks = tracks::TracksInfo;
+ type Preimages = Preimage;
+}
+
+parameter_types! {
+ pub const AnnouncementLifetime: BlockNumber = 180 * DAYS;
+ pub const MaxAnnouncements: u32 = 50;
+}
+
+pub type AmbassadorContentInstance = pallet_collective_content::Instance1;
+
+impl pallet_collective_content::Config for Runtime {
+ type RuntimeEvent = RuntimeEvent;
+ type CharterOrigin = EitherOf, EnsureHeadAmbassadorsVoice>;
+ type AnnouncementLifetime = AnnouncementLifetime;
+ // An announcement can be submitted by a Senior Ambassador member or an ambassador plurality
+ // voice taken via referendum.
+ type AnnouncementOrigin = EitherOfDiverse<
+ pallet_ranked_collective::EnsureMember<
+ Runtime,
+ AmbassadorCollectiveInstance,
+ { ranks::SENIOR_AMBASSADOR_TIER_3 },
+ >,
+ EnsureAmbassadorsVoice,
+ >;
+ type MaxAnnouncements = MaxAnnouncements;
+ type WeightInfo = weights::pallet_collective_content::WeightInfo;
+}
+
+pub type AmbassadorCoreInstance = pallet_core_fellowship::Instance2;
+
+impl pallet_core_fellowship::Config for Runtime {
+ type WeightInfo = weights::pallet_core_fellowship_ambassador_core::WeightInfo;
+ type RuntimeEvent = RuntimeEvent;
+ type Members = pallet_ranked_collective::Pallet;
+ type Balance = Balance;
+ // Parameters are set by any of:
+ // - Root;
+ // - the FellowshipAdmin origin (i.e. token holder referendum);
+ // - a vote among all Head Ambassadors.
+ type ParamsOrigin = EitherOfDiverse<
+ EnsureXcm>,
+ EnsureHeadAmbassadorsVoice,
+ >;
+ // Induction (creating a candidate) is by any of:
+ // - Root;
+ // - the FellowshipAdmin origin (i.e. token holder referendum);
+ // - a single Head Ambassador;
+ // - a vote among all senior members.
+ type InductOrigin = EitherOfDiverse<
+ EnsureXcm>,
+ EitherOfDiverse<
+ pallet_ranked_collective::EnsureMember<
+ Runtime,
+ AmbassadorCollectiveInstance,
+ { ranks::HEAD_AMBASSADOR_TIER_5 },
+ >,
+ EnsureAmbassadorsVoiceFrom>,
+ >,
+ >;
+ type ApproveOrigin = PromoteOrigin;
+ type PromoteOrigin = PromoteOrigin;
+ type EvidenceSize = ConstU32<65536>;
+}
+
+pub type AmbassadorSalaryInstance = pallet_salary::Instance2;
+
+parameter_types! {
+ // The interior location on AssetHub for the paying account. This is the Ambassador Salary
+ // pallet instance (which sits at index 74). This sovereign account will need funding.
+ pub AmbassadorSalaryLocation: InteriorMultiLocation = PalletInstance(74).into();
+}
+
+/// [`PayOverXcm`] setup to pay the Ambassador salary on the AssetHub in DOT.
+pub type AmbassadorSalaryPaymaster = PayOverXcm<
+ AmbassadorSalaryLocation,
+ crate::xcm_config::XcmRouter,
+ crate::PolkadotXcm,
+ ConstU32<{ 6 * HOURS }>,
+ AccountId,
+ (),
+ ConvertToValue,
+ AliasesIntoAccountId32<(), AccountId>,
+>;
+
+impl pallet_salary::Config for Runtime {
+ type WeightInfo = weights::pallet_salary_ambassador_salary::WeightInfo;
+ type RuntimeEvent = RuntimeEvent;
+
+ #[cfg(not(feature = "runtime-benchmarks"))]
+ type Paymaster = AmbassadorSalaryPaymaster;
+ #[cfg(feature = "runtime-benchmarks")]
+ type Paymaster = crate::impls::benchmarks::PayWithEnsure<
+ AmbassadorSalaryPaymaster,
+ crate::impls::benchmarks::OpenHrmpChannel>,
+ >;
+ type Members = pallet_ranked_collective::Pallet;
+
+ #[cfg(not(feature = "runtime-benchmarks"))]
+ type Salary = pallet_core_fellowship::Pallet;
+ #[cfg(feature = "runtime-benchmarks")]
+ type Salary = frame_support::traits::tokens::ConvertRank<
+ crate::impls::benchmarks::RankToSalary,
+ >;
+ // 15 days to register for a salary payment.
+ type RegistrationPeriod = ConstU32<{ 15 * DAYS }>;
+ // 15 days to claim the salary payment.
+ type PayoutPeriod = ConstU32<{ 15 * DAYS }>;
+ // Total monthly salary budget.
+ type Budget = ConstU128<{ 10_000 * DOLLARS }>;
+}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/origins.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/origins.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3ce8a6b9e5d1bf7f70dda395f1998fd66d20cbeb
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/origins.rs
@@ -0,0 +1,135 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The Ambassador Program's origins.
+
+#[frame_support::pallet]
+pub mod pallet_origins {
+ use crate::ambassador::ranks;
+ use frame_support::pallet_prelude::*;
+ use pallet_ranked_collective::Rank;
+
+ #[pallet::pallet]
+ pub struct Pallet(PhantomData);
+
+ /// The pallet configuration trait.
+ #[pallet::config]
+ pub trait Config: frame_system::Config {}
+
+ #[derive(PartialEq, Eq, Clone, MaxEncodedLen, Encode, Decode, TypeInfo, RuntimeDebug)]
+ #[pallet::origin]
+ pub enum Origin {
+ /// Plurality voice of the [ranks::AMBASSADOR_TIER_1] members or above given via
+ /// referendum.
+ Ambassadors,
+ /// Plurality voice of the [ranks::AMBASSADOR_TIER_2] members or above given via
+ /// referendum.
+ AmbassadorsTier2,
+ /// Plurality voice of the [ranks::SENIOR_AMBASSADOR_TIER_3] members or above given via
+ /// referendum.
+ SeniorAmbassadors,
+ /// Plurality voice of the [ranks::SENIOR_AMBASSADOR_TIER_4] members or above given via
+ /// referendum.
+ SeniorAmbassadorsTier4,
+ /// Plurality voice of the [ranks::HEAD_AMBASSADOR_TIER_5] members or above given via
+ /// referendum.
+ HeadAmbassadors,
+ /// Plurality voice of the [ranks::HEAD_AMBASSADOR_TIER_6] members or above given via
+ /// referendum.
+ HeadAmbassadorsTier6,
+ /// Plurality voice of the [ranks::HEAD_AMBASSADOR_TIER_7] members or above given via
+ /// referendum.
+ HeadAmbassadorsTier7,
+ /// Plurality voice of the [ranks::MASTER_AMBASSADOR_TIER_8] members or above given via
+ /// referendum.
+ MasterAmbassadors,
+ /// Plurality voice of the [ranks::MASTER_AMBASSADOR_TIER_9] members or above given via
+ /// referendum.
+ MasterAmbassadorsTier9,
+ }
+
+ impl Origin {
+ /// Returns the rank that the origin `self` speaks for, or `None` if it doesn't speak for
+ /// any.
+ pub fn as_voice(&self) -> Option {
+ Some(match &self {
+ Origin::Ambassadors => ranks::AMBASSADOR_TIER_1,
+ Origin::AmbassadorsTier2 => ranks::AMBASSADOR_TIER_2,
+ Origin::SeniorAmbassadors => ranks::SENIOR_AMBASSADOR_TIER_3,
+ Origin::SeniorAmbassadorsTier4 => ranks::SENIOR_AMBASSADOR_TIER_4,
+ Origin::HeadAmbassadors => ranks::HEAD_AMBASSADOR_TIER_5,
+ Origin::HeadAmbassadorsTier6 => ranks::HEAD_AMBASSADOR_TIER_6,
+ Origin::HeadAmbassadorsTier7 => ranks::HEAD_AMBASSADOR_TIER_7,
+ Origin::MasterAmbassadors => ranks::MASTER_AMBASSADOR_TIER_8,
+ Origin::MasterAmbassadorsTier9 => ranks::MASTER_AMBASSADOR_TIER_9,
+ })
+ }
+ }
+
+ /// Implementation of the [EnsureOrigin] trait for the [Origin::HeadAmbassadors] origin.
+ pub struct EnsureHeadAmbassadorsVoice;
+ impl> + From> EnsureOrigin for EnsureHeadAmbassadorsVoice {
+ type Success = ();
+ fn try_origin(o: O) -> Result {
+ o.into().and_then(|o| match o {
+ Origin::HeadAmbassadors => Ok(()),
+ r => Err(O::from(r)),
+ })
+ }
+
+ #[cfg(feature = "runtime-benchmarks")]
+ fn try_successful_origin() -> Result {
+ Ok(O::from(Origin::HeadAmbassadors))
+ }
+ }
+
+ /// Implementation of the [EnsureOrigin] trait for the plurality voice [Origin]s
+ /// from a given rank `R` with the success result of the corresponding [Rank].
+ pub struct EnsureAmbassadorsVoiceFrom(PhantomData);
+ impl, O: Into> + From> EnsureOrigin
+ for EnsureAmbassadorsVoiceFrom
+ {
+ type Success = Rank;
+ fn try_origin(o: O) -> Result {
+ o.into().and_then(|o| match Origin::as_voice(&o) {
+ Some(r) if r >= R::get() => Ok(r),
+ _ => Err(O::from(o)),
+ })
+ }
+
+ #[cfg(feature = "runtime-benchmarks")]
+ fn try_successful_origin() -> Result {
+ ranks::MASTER_AMBASSADOR_TIER_9
+ .ge(&R::get())
+ .then(|| O::from(Origin::MasterAmbassadorsTier9))
+ .ok_or(())
+ }
+ }
+
+ /// Implementation of the [EnsureOrigin] trait for the plurality voice [Origin]s with the
+ /// success result of the corresponding [Rank].
+ pub struct EnsureAmbassadorsVoice;
+ impl> + From> EnsureOrigin for EnsureAmbassadorsVoice {
+ type Success = Rank;
+ fn try_origin(o: O) -> Result {
+ o.into().and_then(|o| Origin::as_voice(&o).ok_or(O::from(o)))
+ }
+
+ #[cfg(feature = "runtime-benchmarks")]
+ fn try_successful_origin() -> Result