diff --git a/.dockerignore b/.dockerignore index 913065a3fa..d01eb7ec3a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,7 +3,7 @@ **/*.txt **/*.md /docker/ -!/target/release/polkadot-collator +!/target/release/polkadot-parachain # dotfiles in the repo root /.* diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index 1cc8fb2de2..342213360d 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -39,7 +39,7 @@ candidate branch or started an additional release candidate branch (rc-2, rc-3, ### All Releases -- [ ] Check that the new polkadot-collator versions have [run on the network](#burn-in) +- [ ] Check that the new polkadot-parachain versions have [run on the network](#burn-in) without issue. - [ ] Check that a draft release has been created at https://github.com/paritytech/cumulus/releases with relevant [release diff --git a/.github/workflows/extrinsic-ordering-check-from-bin.yml b/.github/workflows/extrinsic-ordering-check-from-bin.yml index b730e2de20..76652e1bcb 100644 --- a/.github/workflows/extrinsic-ordering-check-from-bin.yml +++ b/.github/workflows/extrinsic-ordering-check-from-bin.yml @@ -10,7 +10,7 @@ on: required: true binary_url: description: A url to a Linux binary for the node containing the runtime to test - default: https://github.com/paritytech/cumulus/releases/download/statemine_v3/polkadot-collator + default: https://releases.parity.io/cumulus/polkadot-v0.9.21/polkadot-parachain required: true chain: description: The name of the chain under test. Usually, you would pass a local chain @@ -33,17 +33,17 @@ jobs: run: | echo Fetching $BIN_URL wget $BIN_URL - chmod a+x polkadot-collator - ./polkadot-collator --version + chmod a+x polkadot-parachain + ./polkadot-parachain --version - name: Start local node run: | echo Running on $CHAIN - ./polkadot-collator --chain=$CHAIN -- --chain polkadot-local & + ./polkadot-parachain --chain=$CHAIN -- --chain polkadot-local & - name: Prepare output run: | - VERSION=$(./polkadot-collator --version) + VERSION=$(./polkadot-parachain --version) echo "Metadata comparison:" >> output.txt echo "Date: $(date)" >> output.txt echo "Reference: $REF_URL" >> output.txt @@ -71,7 +71,7 @@ jobs: - name: Stop our local node run: | - pkill polkadot-collator + pkill polkadot-parachain continue-on-error: true - name: Save output as artifact diff --git a/.github/workflows/release-10_docker-manual.yml b/.github/workflows/release-10_docker-manual.yml index b394d686c6..3cab851812 100644 --- a/.github/workflows/release-10_docker-manual.yml +++ b/.github/workflows/release-10_docker-manual.yml @@ -19,7 +19,7 @@ on: jobs: docker_build_publish: env: - BINARY: polkadot-collator + BINARY: polkadot-parachain runs-on: ubuntu-latest steps: - name: Checkout sources diff --git a/.github/workflows/release-10_docker.yml b/.github/workflows/release-10_docker.yml index c65fc8e1cc..9ddcd70b9a 100644 --- a/.github/workflows/release-10_docker.yml +++ b/.github/workflows/release-10_docker.yml @@ -14,7 +14,7 @@ on: jobs: docker_build_publish: env: - BINARY: polkadot-collator + BINARY: polkadot-parachain runs-on: ubuntu-latest steps: - name: Checkout sources diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a5cd24729..e3510e9232 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,10 +116,10 @@ test-linux-stable: # it goes with the debug assertions. - if [ "${ARE_WE_RELEASING_YET}" ]; then echo "___Building a binary___"; - time cargo build --release --locked --bin polkadot-collator; + time cargo build --release --locked --bin polkadot-parachain; echo "___Packing the artifacts___"; mkdir -p ./artifacts; - mv ${CARGO_TARGET_DIR}/release/polkadot-collator ./artifacts/.; + mv ${CARGO_TARGET_DIR}/release/polkadot-parachain ./artifacts/.; echo "___The VERSION is either a tag name or the curent branch if triggered not by a tag___"; echo ${CI_COMMIT_REF_NAME} | tee ./artifacts/VERSION; else @@ -179,7 +179,7 @@ publish-s3: # Job will fail if no artifacts were provided by test-linux-stable job. It's only possible for # this test to fail if the pipeline was triggered by web or schedule trigger without supplying # a nono-empty ARE_WE_RELEASING_YET variable. - - test -e ./artifacts/polkadot-collator || + - test -e ./artifacts/polkadot-parachain || ( echo "___No artifacts were provided by the previous job, please check the build there___"; exit 1 ) script: - echo "___Publishing a binary with debug assertions!___" @@ -202,7 +202,7 @@ benchmarks-build: script: - time cargo build --profile production --locked --features runtime-benchmarks - mkdir artifacts - - cp target/production/polkadot-collator ./artifacts/ + - cp target/production/polkadot-parachain ./artifacts/ benchmarks: stage: benchmarks-run diff --git a/Cargo.lock b/Cargo.lock index 7b658a47a5..697acffc2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -978,7 +978,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-runtime-common", "scale-info", "serde", @@ -1709,7 +1709,7 @@ dependencies = [ "parking_lot 0.12.0", "polkadot-client", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "polkadot-service", "polkadot-test-client", @@ -1843,7 +1843,7 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "sc-client-api", "scale-info", "serde", @@ -1962,7 +1962,7 @@ dependencies = [ "frame-support", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "sp-api", "sp-runtime", @@ -2017,7 +2017,7 @@ dependencies = [ "frame-support", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "sp-runtime", "sp-std", @@ -2118,7 +2118,7 @@ dependencies = [ "pallet-balances", "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "sc-block-builder", "sc-consensus", @@ -6510,7 +6510,7 @@ dependencies = [ "parachain-template-runtime", "parity-scale-codec", "polkadot-cli", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "polkadot-service", "sc-basic-authorship", @@ -6585,7 +6585,7 @@ dependencies = [ "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-runtime-common", "scale-info", "serde", @@ -7106,83 +7106,6 @@ dependencies = [ "sp-transaction-pool", ] -[[package]] -name = "polkadot-collator" -version = "5.4.0" -dependencies = [ - "assert_cmd", - "async-trait", - "canvas-kusama-runtime", - "clap 3.1.18", - "cumulus-client-cli", - "cumulus-client-consensus-aura", - "cumulus-client-consensus-common", - "cumulus-client-consensus-relay-chain", - "cumulus-client-network", - "cumulus-client-service", - "cumulus-primitives-core", - "cumulus-primitives-parachain-inherent", - "cumulus-relay-chain-inprocess-interface", - "cumulus-relay-chain-interface", - "cumulus-relay-chain-rpc-interface", - "frame-benchmarking", - "frame-benchmarking-cli", - "futures 0.3.21", - "hex-literal", - "jsonrpsee", - "log", - "nix 0.24.1", - "pallet-contracts-rpc", - "pallet-transaction-payment-rpc", - "parachains-common", - "parity-scale-codec", - "polkadot-cli", - "polkadot-parachain", - "polkadot-primitives", - "polkadot-service", - "rococo-parachain-runtime", - "sc-basic-authorship", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-consensus", - "sc-executor", - "sc-network", - "sc-rpc", - "sc-service", - "sc-sysinfo", - "sc-telemetry", - "sc-tracing", - "sc-transaction-pool", - "sc-transaction-pool-api", - "seedling-runtime", - "serde", - "shell-runtime", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-timestamp", - "sp-transaction-pool", - "statemine-runtime", - "statemint-runtime", - "substrate-build-script-utils", - "substrate-frame-rpc-system", - "substrate-prometheus-endpoint", - "tempfile", - "try-runtime-cli", - "westmint-runtime", - "xcm", -] - [[package]] name = "polkadot-collator-protocol" version = "0.9.19" @@ -7408,7 +7331,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "sp-maybe-compressed-blob", "tracing-gum", @@ -7515,7 +7438,7 @@ dependencies = [ "pin-project 1.0.10", "polkadot-core-primitives", "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "rand 0.8.5", "sc-executor", "sc-executor-common", @@ -7629,7 +7552,7 @@ dependencies = [ "bounded-vec", "futures 0.3.21", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "schnorrkel", "serde", @@ -7790,6 +7713,83 @@ dependencies = [ "sp-std", ] +[[package]] +name = "polkadot-parachain" +version = "0.9.190" +dependencies = [ + "assert_cmd", + "async-trait", + "canvas-kusama-runtime", + "clap 3.1.18", + "cumulus-client-cli", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", + "cumulus-client-consensus-relay-chain", + "cumulus-client-network", + "cumulus-client-service", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-rpc-interface", + "frame-benchmarking", + "frame-benchmarking-cli", + "futures 0.3.21", + "hex-literal", + "jsonrpsee", + "log", + "nix 0.24.1", + "pallet-contracts-rpc", + "pallet-transaction-payment-rpc", + "parachains-common", + "parity-scale-codec", + "polkadot-cli", + "polkadot-parachain 0.9.19", + "polkadot-primitives", + "polkadot-service", + "rococo-parachain-runtime", + "sc-basic-authorship", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-network", + "sc-rpc", + "sc-service", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "seedling-runtime", + "serde", + "shell-runtime", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-timestamp", + "sp-transaction-pool", + "statemine-runtime", + "statemint-runtime", + "substrate-build-script-utils", + "substrate-frame-rpc-system", + "substrate-prometheus-endpoint", + "tempfile", + "try-runtime-cli", + "westmint-runtime", + "xcm", +] + [[package]] name = "polkadot-performance-test" version = "0.9.19" @@ -7816,7 +7816,7 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "scale-info", "serde", "sp-api", @@ -8114,7 +8114,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", @@ -8256,7 +8256,7 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -8303,7 +8303,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime-common", @@ -8982,7 +8982,7 @@ dependencies = [ "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "scale-info", "serde", "sp-api", @@ -9050,7 +9050,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -11575,7 +11575,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-runtime-common", "scale-info", "serde", @@ -11641,7 +11641,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-runtime-common", "polkadot-runtime-constants", "scale-info", @@ -13070,7 +13070,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -13156,7 +13156,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "polkadot-runtime-common", "scale-info", "serde", @@ -13366,7 +13366,7 @@ dependencies = [ "log", "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.19", "scale-info", "sp-arithmetic", "sp-io", diff --git a/README.md b/README.md index 0a46395d26..da1021e810 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ and treat as best. ### Collator A Polkadot [collator](https://wiki.polkadot.network/docs/en/learn-collator) for the parachain is -implemented by the `polkadot-collator` binary. +implemented by the `polkadot-parachain` binary (previously called `polkadot-collator`). ## Statemint 🪙 @@ -44,17 +44,17 @@ Statemint is a common good parachain providing an asset store for the Polkadot e ### Build & Launch a Node To run a Statemine or Westmint node (Statemint is not deployed, yet) you will need to compile the -`polkadot-collator` binary: +`polkadot-parachain` binary: ```bash -cargo build --release --locked -p polkadot-collator +cargo build --release --locked -p polkadot-parachain ``` Once the executable is built, launch the parachain node via: ```bash CHAIN=westmint # or statemine -./target/release/polkadot-collator --chain $CHAIN +./target/release/polkadot-parachain --chain $CHAIN ``` Refer to the [setup instructions below](#local-setup) to run a local network for development. @@ -105,16 +105,16 @@ If you are looking for a quickstart, we can recommend ### Build & Launch a Node To run a Canvas node that connects to Rococo (Kusama and Polkadot parachains are not deployed, yet) -you will need to compile the `polkadot-collator` binary: +you will need to compile the `polkadot-parachain` binary: ```bash -cargo build --release --locked -p polkadot-collator +cargo build --release --locked -p polkadot-parachain ``` Once the executable is built, launch the parachain node via: ```bash -./target/release/polkadot-collator --chain rocanvas +./target/release/polkadot-parachain --chain rocanvas ``` Refer to the [setup instructions below](#local-setup) to run a local network for development. @@ -164,7 +164,7 @@ eventually be included by the relay chain for a parachain. To run a Rococo collator you will need to compile the following binary: ```bash -cargo build --release --locked -p polkadot-collator +cargo build --release --locked -p polkadot-parachain ``` Otherwise you can compile it with @@ -173,7 +173,7 @@ Otherwise you can compile it with ```bash docker run --rm -it -w /shellhere/cumulus \ -v $(pwd):/shellhere/cumulus \ - paritytech/ci-linux:production cargo build --release --locked -p polkadot-collator + paritytech/ci-linux:production cargo build --release --locked -p polkadot-parachain sudo chown -R $(id -u):$(id -g) target/ ``` @@ -184,7 +184,7 @@ Once the executable is built, launch collators for each parachain (repeat once e `tick`, `trick`, `track`): ```bash -./target/release/polkadot-collator --chain $CHAIN --validator +./target/release/polkadot-parachain --chain $CHAIN --validator ``` ### Parachains @@ -232,19 +232,19 @@ cd cumulus cargo build --release # Export genesis state -./target/release/polkadot-collator export-genesis-state > genesis-state +./target/release/polkadot-parachain export-genesis-state > genesis-state # Export genesis wasm -./target/release/polkadot-collator export-genesis-wasm > genesis-wasm +./target/release/polkadot-parachain export-genesis-wasm > genesis-wasm # Collator1 -./target/release/polkadot-collator --collator --alice --force-authoring --tmp --port 40335 --ws-port 9946 -- --execution wasm --chain ../polkadot/rococo-local-cfde.json --port 30335 +./target/release/polkadot-parachain --collator --alice --force-authoring --tmp --port 40335 --ws-port 9946 -- --execution wasm --chain ../polkadot/rococo-local-cfde.json --port 30335 # Collator2 -./target/release/polkadot-collator --collator --bob --force-authoring --tmp --port 40336 --ws-port 9947 -- --execution wasm --chain ../polkadot/rococo-local-cfde.json --port 30336 +./target/release/polkadot-parachain --collator --bob --force-authoring --tmp --port 40336 --ws-port 9947 -- --execution wasm --chain ../polkadot/rococo-local-cfde.json --port 30336 # Parachain Full Node 1 -./target/release/polkadot-collator --tmp --port 40337 --ws-port 9948 -- --execution wasm --chain ../polkadot/rococo-local-cfde.json --port 30337 +./target/release/polkadot-parachain --tmp --port 40337 --ws-port 9948 -- --execution wasm --chain ../polkadot/rococo-local-cfde.json --port 30337 ``` #### Register the parachain @@ -253,7 +253,7 @@ cargo build --release ### Containerize -After building `polkadot-collator` with cargo or with Parity CI image as documented in [this chapter](#build--launch-rococo-collators), +After building `polkadot-parachain` with cargo or with Parity CI image as documented in [this chapter](#build--launch-rococo-collators), the following will allow producing a new docker image where the compiled binary is injected: ```bash @@ -263,7 +263,7 @@ the following will allow producing a new docker image where the compiled binary Alternatively, you can build an image with a builder pattern: ```bash -docker build --tag $OWNER/$IMAGE_NAME --file ./docker/polkadot-collator_builder.Containerfile . +docker build --tag $OWNER/$IMAGE_NAME --file ./docker/polkadot-parachain_builder.Containerfile . You may then run your new container: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 052879039a..0a0821984f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -66,7 +66,7 @@ services: volumes: - "genesis-state:/data" command: > - polkadot-collator + polkadot-parachain export-genesis-state /data/genesis-state diff --git a/docker/injected.Dockerfile b/docker/injected.Dockerfile index f2d3ab6c45..a251758344 100644 --- a/docker/injected.Dockerfile +++ b/docker/injected.Dockerfile @@ -34,18 +34,18 @@ RUN apt-get update && \ ln -s /data /polkadot/.local/share/polkadot && \ mkdir -p /specs -# add polkadot-collator binary to the docker image -COPY ./target/release/polkadot-collator /usr/local/bin -COPY ./target/release/polkadot-collator.asc /usr/local/bin -COPY ./target/release/polkadot-collator.sha256 /usr/local/bin +# add polkadot-parachain binary to the docker image +COPY ./target/release/polkadot-parachain /usr/local/bin +COPY ./target/release/polkadot-parachain.asc /usr/local/bin +COPY ./target/release/polkadot-parachain.sha256 /usr/local/bin COPY ./polkadot-parachains/res/*.json /specs/ USER polkadot # check if executable works in this container -RUN /usr/local/bin/polkadot-collator --version +RUN /usr/local/bin/polkadot-parachain --version EXPOSE 30333 9933 9944 VOLUME ["/polkadot"] -ENTRYPOINT ["/usr/local/bin/polkadot-collator"] +ENTRYPOINT ["/usr/local/bin/polkadot-parachain"] diff --git a/docker/polkadot-collator_builder.Containerfile b/docker/polkadot-parachain_builder.Containerfile similarity index 53% rename from docker/polkadot-collator_builder.Containerfile rename to docker/polkadot-parachain_builder.Containerfile index 8698bf874d..159bcb3236 100644 --- a/docker/polkadot-collator_builder.Containerfile +++ b/docker/polkadot-parachain_builder.Containerfile @@ -1,11 +1,11 @@ # 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-collator. Here we create the binary in a temporary image. +# 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-collator +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 @@ -13,24 +13,24 @@ 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-collator" \ - io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot/polkadot-collator_builder.Dockerfile" \ + 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-collator /usr/local/bin +COPY --from=builder /cumulus/target/release/polkadot-parachain /usr/local/bin -RUN useradd -m -u 1000 -U -s /bin/sh -d /cumulus polkadot-collator && \ +RUN useradd -m -u 1000 -U -s /bin/sh -d /cumulus polkadot-parachain && \ mkdir -p /data /cumulus/.local/share && \ - chown -R polkadot-collator:polkadot-collator /data && \ - ln -s /data /cumulus/.local/share/polkadot-collator && \ + 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-collator --version + /usr/local/bin/polkadot-parachain --version -USER polkadot-collator +USER polkadot-parachain EXPOSE 30333 9933 9944 9615 VOLUME ["/data"] -ENTRYPOINT ["/usr/local/bin/polkadot-collator"] +ENTRYPOINT ["/usr/local/bin/polkadot-parachain"] diff --git a/docker/scripts/build-injected-image.sh b/docker/scripts/build-injected-image.sh index 6ba392d121..4a53aabf3e 100755 --- a/docker/scripts/build-injected-image.sh +++ b/docker/scripts/build-injected-image.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash OWNER=${OWNER:-parity} -IMAGE_NAME=${IMAGE_NAME:-polkadot-collator} +IMAGE_NAME=${IMAGE_NAME:-polkadot-parachain} docker build --no-cache --build-arg IMAGE_NAME=$IMAGE_NAME -t $OWNER/$IMAGE_NAME -f ./docker/injected.Dockerfile . docker images | grep $IMAGE_NAME diff --git a/docker/scripts/inject_bootnodes.sh b/docker/scripts/inject_bootnodes.sh index 99740a3fab..5b2dbae454 100755 --- a/docker/scripts/inject_bootnodes.sh +++ b/docker/scripts/inject_bootnodes.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# this script runs the polkadot-collator after fetching +# this script runs the polkadot-parachain after fetching # appropriate bootnode IDs # # this is _not_ a general-purpose script; it is closely tied to the @@ -8,7 +8,7 @@ set -e -o pipefail -ctpc="/usr/bin/polkadot-collator" +ctpc="/usr/bin/polkadot-parachain" if [ ! -x "$ctpc" ]; then echo "FATAL: $ctpc does not exist or is not executable" diff --git a/docker/test-parachain-collator.dockerfile b/docker/test-parachain-collator.dockerfile index 42fe4c17da..9c2d8fbe58 100644 --- a/docker/test-parachain-collator.dockerfile +++ b/docker/test-parachain-collator.dockerfile @@ -4,7 +4,7 @@ FROM docker.io/paritytech/ci-linux:production as builder WORKDIR /cumulus COPY . /cumulus -RUN cargo build --release --locked -p polkadot-collator +RUN cargo build --release --locked -p polkadot-parachain # the collator stage is normally built once, cached, and then ignored, but can # be specified with the --target build flag. This adds some extra tooling to the @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install jq curl bash -y && \ npm install --global yarn && \ yarn global add @polkadot/api-cli@0.10.0-beta.14 COPY --from=builder \ - /paritytech/cumulus/target/release/polkadot-collator /usr/bin + /paritytech/cumulus/target/release/polkadot-parachain /usr/bin COPY ./docker/scripts/inject_bootnodes.sh /usr/bin CMD ["/usr/bin/inject_bootnodes.sh"] COPY ./docker/scripts/healthcheck.sh /usr/bin/ @@ -41,6 +41,6 @@ CMD ["cp", "-v", "/var/opt/cumulus_test_parachain_runtime.compact.wasm", "/runti FROM debian:buster-slim COPY --from=builder \ - /paritytech/cumulus/target/release/polkadot-collator /usr/bin + /paritytech/cumulus/target/release/polkadot-parachain /usr/bin -CMD ["/usr/bin/polkadot-collator"] +CMD ["/usr/bin/polkadot-parachain"] diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml index 4c0cc465cc..619d524bc5 100644 --- a/polkadot-parachains/Cargo.toml +++ b/polkadot-parachains/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "polkadot-collator" -version = "5.4.0" +name = "polkadot-parachain" +version = "0.9.190" authors = ["Parity Technologies "] build = "build.rs" edition = "2021" +description = "Runs a polkadot parachain node which could be a collator." [[bin]] -name = "polkadot-collator" +name = "polkadot-parachain" path = "src/main.rs" [dependencies] diff --git a/polkadot-parachains/src/command.rs b/polkadot-parachains/src/command.rs index 77293e49b4..62530a76a2 100644 --- a/polkadot-parachains/src/command.rs +++ b/polkadot-parachains/src/command.rs @@ -167,7 +167,7 @@ fn load_spec(id: &str) -> std::result::Result, St impl SubstrateCli for Cli { fn impl_name() -> String { - "Polkadot collator".into() + "Polkadot parachain".into() } fn impl_version() -> String { @@ -176,7 +176,7 @@ impl SubstrateCli for Cli { fn description() -> String { format!( - "Polkadot collator\n\nThe command-line arguments provided first will be \ + "Polkadot parachain\n\nThe command-line arguments provided first will be \ passed to the parachain node, while the arguments provided after -- will be passed \ to the relaychain node.\n\n\ {} [parachain-args] -- [relaychain-args]", @@ -221,7 +221,7 @@ impl SubstrateCli for Cli { impl SubstrateCli for RelayChainCli { fn impl_name() -> String { - "Polkadot collator".into() + "Polkadot parachain".into() } fn impl_version() -> String { @@ -230,7 +230,7 @@ impl SubstrateCli for RelayChainCli { fn description() -> String { format!( - "Polkadot collator\n\nThe command-line arguments provided first will be \ + "Polkadot parachain\n\nThe command-line arguments provided first will be \ passed to the parachain node, while the arguments provided after -- will be passed \ to the relay chain node.\n\n\ {} [parachain-args] -- [relay_chain-args]", diff --git a/polkadot-parachains/tests/benchmark_storage_works.rs b/polkadot-parachains/tests/benchmark_storage_works.rs index f2cf691953..df3c7fe919 100644 --- a/polkadot-parachains/tests/benchmark_storage_works.rs +++ b/polkadot-parachains/tests/benchmark_storage_works.rs @@ -28,7 +28,7 @@ fn benchmark_storage_works() { /// Invoke the `benchmark storage` sub-command for the given database and runtime. fn benchmark_storage(db: &str, runtime: &str, base_path: &Path) -> ExitStatus { - Command::new(cargo_bin("polkadot-collator")) + Command::new(cargo_bin("polkadot-parachain")) .args(&["benchmark", "storage", "--chain", runtime]) .arg("--db") .arg(db) diff --git a/polkadot-parachains/tests/polkadot_argument_parsing.rs b/polkadot-parachains/tests/polkadot_argument_parsing.rs index 53a7bf2ee2..4b4078fcfc 100644 --- a/polkadot-parachains/tests/polkadot_argument_parsing.rs +++ b/polkadot-parachains/tests/polkadot_argument_parsing.rs @@ -33,7 +33,7 @@ fn polkadot_argument_parsing() { fn run_command_and_kill(signal: Signal) { let _ = fs::remove_dir_all("polkadot_argument_parsing"); - let mut cmd = Command::new(cargo_bin("polkadot-collator")) + let mut cmd = Command::new(cargo_bin("polkadot-parachain")) .args(&[ "-d", "polkadot_argument_parsing", diff --git a/polkadot-parachains/tests/polkadot_mdns_issue.rs b/polkadot-parachains/tests/polkadot_mdns_issue.rs index af1c5a55d4..1f04e2a72f 100644 --- a/polkadot-parachains/tests/polkadot_mdns_issue.rs +++ b/polkadot-parachains/tests/polkadot_mdns_issue.rs @@ -33,7 +33,7 @@ fn interrupt_polkadot_mdns_issue_test() { fn run_command_and_kill(signal: Signal) { let _ = fs::remove_dir_all("interrupt_polkadot_mdns_issue_test"); - let mut cmd = Command::new(cargo_bin("polkadot-collator")) + let mut cmd = Command::new(cargo_bin("polkadot-parachain")) .args(&["-d", "interrupt_polkadot_mdns_issue_test", "--", "--dev"]) .spawn() .unwrap(); diff --git a/polkadot-parachains/tests/purge_chain_works.rs b/polkadot-parachains/tests/purge_chain_works.rs index d7e218d33f..ea93c4275f 100644 --- a/polkadot-parachains/tests/purge_chain_works.rs +++ b/polkadot-parachains/tests/purge_chain_works.rs @@ -31,7 +31,7 @@ fn purge_chain_works() { let base_path = tempfile::tempdir().unwrap(); - let mut cmd = Command::new(cargo_bin("polkadot-collator")) + let mut cmd = Command::new(cargo_bin("polkadot-parachain")) .args(&["-d"]) .arg(base_path.path()) .args(&["--", "--dev"]) @@ -56,7 +56,7 @@ fn purge_chain_works() { assert!(base_path.path().join("chains/local_testnet/db/full").exists()); assert!(base_path.path().join("polkadot/chains/dev/db/full").exists()); - let status = Command::new(cargo_bin("polkadot-collator")) + let status = Command::new(cargo_bin("polkadot-parachain")) .args(&["purge-chain", "-d"]) .arg(base_path.path()) .arg("-y") diff --git a/polkadot-parachains/tests/running_the_node_and_interrupt.rs b/polkadot-parachains/tests/running_the_node_and_interrupt.rs index 25be2e394d..f28e8f19b2 100644 --- a/polkadot-parachains/tests/running_the_node_and_interrupt.rs +++ b/polkadot-parachains/tests/running_the_node_and_interrupt.rs @@ -33,7 +33,7 @@ fn running_the_node_works_and_can_be_interrupted() { fn run_command_and_kill(signal: Signal) { let _ = fs::remove_dir_all("interrupt_test"); - let mut cmd = Command::new(cargo_bin("polkadot-collator")) + let mut cmd = Command::new(cargo_bin("polkadot-parachain")) .args(&["-d", "interrupt_test", "--", "--dev"]) .spawn() .unwrap(); diff --git a/scripts/benchmarks-ci.sh b/scripts/benchmarks-ci.sh index 4fda1dde36..90f28e7759 100755 --- a/scripts/benchmarks-ci.sh +++ b/scripts/benchmarks-ci.sh @@ -23,7 +23,7 @@ pallets=( for p in ${pallets[@]} do - ./artifacts/polkadot-collator benchmark pallet \ + ./artifacts/polkadot-parachain benchmark pallet \ --chain=$benhcmarkChainName \ --execution=wasm \ --wasm-execution=compiled \ diff --git a/scripts/benchmarks.sh b/scripts/benchmarks.sh index ba998a79a5..371c57ccac 100755 --- a/scripts/benchmarks.sh +++ b/scripts/benchmarks.sh @@ -27,7 +27,7 @@ pallets=( for p in ${pallets[@]} do - ./target/production/polkadot-collator benchmark pallet \ + ./target/production/polkadot-parachain benchmark pallet \ --chain=$statemineChain \ --execution=wasm \ --wasm-execution=compiled \ @@ -39,7 +39,7 @@ do --header=./file_header.txt \ --output=$statemineOutput - ./target/production/polkadot-collator benchmark pallet \ + ./target/production/polkadot-parachain benchmark pallet \ --chain=$statemintChain \ --execution=wasm \ --wasm-execution=compiled \ @@ -51,7 +51,7 @@ do --header=./file_header.txt \ --output=$statemintOutput - ./target/production/polkadot-collator benchmark pallet \ + ./target/production/polkadot-parachain benchmark pallet \ --chain=$westmintChain \ --execution=wasm \ --wasm-execution=compiled \ diff --git a/scripts/ci/changelog/templates/docker_image.md.tera b/scripts/ci/changelog/templates/docker_image.md.tera index 59f631106b..0506e43b90 100644 --- a/scripts/ci/changelog/templates/docker_image.md.tera +++ b/scripts/ci/changelog/templates/docker_image.md.tera @@ -1,11 +1,11 @@ diff --git a/scripts/create_seedling_spec.sh b/scripts/create_seedling_spec.sh index 4e6a8d8641..a4ac0b2ab5 100755 --- a/scripts/create_seedling_spec.sh +++ b/scripts/create_seedling_spec.sh @@ -26,7 +26,7 @@ sudo=$8 [ -z "$para_$id" ] && usage [ -z "$sudo" ] && usage -binary="./target/release/polkadot-collator" +binary="./target/release/polkadot-parachain" # build the chain spec we'll manipulate $binary build-spec --disable-default-bootnode --chain seedling > seedling-spec-plain.json diff --git a/scripts/create_shell_spec.sh b/scripts/create_shell_spec.sh index de9348ef17..6d6675044d 100755 --- a/scripts/create_shell_spec.sh +++ b/scripts/create_shell_spec.sh @@ -10,7 +10,7 @@ set -e rt_path=$1 -binary="./target/release/polkadot-collator" +binary="./target/release/polkadot-parachain" # build the chain spec we'll manipulate $binary build-spec --chain shell > shell-spec-plain.json diff --git a/scripts/generate_genesis_value.sh b/scripts/generate_genesis_value.sh index 55e853ea16..370c4f8c69 100755 --- a/scripts/generate_genesis_value.sh +++ b/scripts/generate_genesis_value.sh @@ -27,7 +27,7 @@ chain_spec_summary() { } check_collator() { - BIN=target/release/polkadot-collator + BIN=target/release/polkadot-parachain if [ -f $BIN ]; then echo "✅ Collator binary found:" $BIN --version @@ -58,7 +58,7 @@ if [[ "$rpc_endpoint" =~ "localhost" ]]; then check_collator echo -e "Make sure you have a collator running with the correct version at $rpc_endpoint." echo -e "If you don't, NOW is the time to start it with:" - echo -e "target/release/polkadot-collator --chain polkadot-parachains/res/shell-statemint.json --tmp\n" + echo -e "target/release/polkadot-parachain --chain polkadot-parachains/res/shell-statemint.json --tmp\n" read -p "You can abort with CTRL+C if this is not correct, otherwise press ENTER " fi