--- a/.docker/Dockerfile-parachain-node-only +++ b/.docker/Dockerfile-parachain-node-only @@ -61,6 +61,7 @@ ARG NETWORK ARG POLKADOT_LAUNCH_BRANCH +ARG WASM_NAME RUN apt-get -y update && \ apt-get -y install curl git && \ @@ -82,7 +83,7 @@ COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/ COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/ -COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm +COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/ COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm --- a/.docker/Dockerfile-parachain-upgrade +++ b/.docker/Dockerfile-parachain-upgrade @@ -59,6 +59,7 @@ ARG NETWORK ARG POLKADOT_LAUNCH_BRANCH +ARG WASM_NAME RUN apt-get -y update && \ apt-get -y install curl git && \ @@ -80,7 +81,7 @@ COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/ COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/ -COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm +COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/ COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm --- a/.docker/Dockerfile-parachain-upgrade-data +++ b/.docker/Dockerfile-parachain-upgrade-data @@ -63,6 +63,7 @@ ARG REPLICA_FROM ENV REPLICA_FROM=${REPLICA_FROM} ARG POLKADOT_LAUNCH_BRANCH +ARG WASM_NAME RUN apt-get -y update && \ apt-get -y install curl git && \ @@ -85,7 +86,7 @@ COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/ COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/ -COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm +COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/ --- a/.docker/Dockerfile-try-runtime +++ b/.docker/Dockerfile-try-runtime @@ -35,8 +35,10 @@ ARG PROFILE=release ARG NETWORK ARG REPLICA_FROM +ARG WASM_NAME ENV NETWORK $NETWORK ENV REPLICA_FROM $REPLICA_FROM +ENV WASM_NAME $WASM_NAME COPY . /unique_parachain WORKDIR /unique_parachain @@ -46,4 +48,4 @@ echo "Fork from: $REPLICA_FROM\n" && \ cargo build --features=try-runtime,${NETWORK}-runtime --release -CMD cargo run --release --features ${NETWORK}-runtime,try-runtime -- try-runtime --runtime target/release/wbuild/${NETWORK}-runtime/${NETWORK}_runtime.compact.compressed.wasm -lruntime=debug -ltry-runtime::cli=debug on-runtime-upgrade --checks live --uri $REPLICA_FROM +CMD cargo run --release --features ${NETWORK}-runtime,try-runtime -- try-runtime --runtime target/release/wbuild/${WASM_NAME}-runtime/${WASM_NAME}_runtime.compact.compressed.wasm -lruntime=debug -ltry-runtime::cli=debug on-runtime-upgrade --checks live --uri $REPLICA_FROM --- a/.docker/docker-compose.tmp-forkless-data.j2 +++ b/.docker/docker-compose.tmp-forkless-data.j2 @@ -13,6 +13,7 @@ - "MAINNET_TAG={{ MAINNET_TAG }}" - "MAINNET_BRANCH={{ MAINNET_BRANCH }}" - "REPLICA_FROM={{ REPLICA_FROM }}" + - "WASM_NAME={{ WASM_NAME }}" context: ../ dockerfile: .docker/Dockerfile-parachain-upgrade-data image: node-parachain --- a/.docker/docker-compose.tmp-forkless-nodata.j2 +++ b/.docker/docker-compose.tmp-forkless-nodata.j2 @@ -12,6 +12,7 @@ - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}" - "MAINNET_TAG={{ MAINNET_TAG }}" - "MAINNET_BRANCH={{ MAINNET_BRANCH }}" + - "WASM_NAME={{ WASM_NAME }}" context: ../ dockerfile: .docker/Dockerfile-parachain-upgrade image: node-parachain --- a/.docker/docker-compose.tmp-node.j2 +++ b/.docker/docker-compose.tmp-node.j2 @@ -12,6 +12,7 @@ - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}" - "MAINNET_TAG={{ MAINNET_TAG }}" - "MAINNET_BRANCH={{ MAINNET_BRANCH }}" + - "WASM_NAME={{ WASM_NAME }}" context: ../ dockerfile: .docker/Dockerfile-parachain-node-only image: node-parachain --- a/.docker/docker-compose.tmp-try-runtime.j2 +++ b/.docker/docker-compose.tmp-try-runtime.j2 @@ -8,7 +8,8 @@ args: - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}" - "NETWORK={{ NETWORK }}" - - "REPLICA_FROM={{ REPLICA_FROM }}" + - "REPLICA_FROM={{ REPLICA_FROM }}" + - "WASM_NAME={{ WASM_NAME }}" image: try-runtime container_name: try-runtime expose: --- a/.docker/forkless-config/launch-config-forkless-data.j2 +++ b/.docker/forkless-config/launch-config-forkless-data.j2 @@ -88,7 +88,7 @@ { "bin": "/unique-chain/current/release/unique-collator", "upgradeBin": "/unique-chain/target/release/unique-collator", - "upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm", + "upgradeWasm": "/unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm", "id": "1000", "balance": "1000000000000000000000000", "chainRawInitializer": [ --- a/.docker/forkless-config/launch-config-forkless-nodata.j2 +++ b/.docker/forkless-config/launch-config-forkless-nodata.j2 @@ -88,7 +88,7 @@ { "bin": "/unique-chain/current/release/unique-collator", "upgradeBin": "/unique-chain/target/release/unique-collator", - "upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm", + "upgradeWasm": "/unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm", "id": "1000", "balance": "1000000000000000000000000", "nodes": [ --- a/.docker/forkless-config/launch-config-node-update-only-v3.j2 +++ b/.docker/forkless-config/launch-config-node-update-only-v3.j2 @@ -88,7 +88,7 @@ { "bin": "/unique-chain/current/release/unique-collator", "upgradeBin": "/unique-chain/target/release/unique-collator", - "upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm", + "upgradeWasm": "/unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm", "id": "1000", "balance": "1000000000000000000000000", "nodes": [ --- a/.github/workflows/forkless-update-data.yml +++ b/.github/workflows/forkless-update-data.yml @@ -35,10 +35,10 @@ id: create_matrix with: matrix: | - network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}} - network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}} - network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}} - network {sapphire}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, replica_from_address {${{ env.SAPPHIRE_REPLICA_FROM }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}} + network {quartz}, wasm_name {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}} + network {unique}, wasm_name {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}} + network {opal}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}} + network {sapphire}, wasm_name {opal}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, replica_from_address {${{ env.SAPPHIRE_REPLICA_FROM }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}} forkless-update-data: needs: execution-marix @@ -81,6 +81,7 @@ NETWORK=${{ matrix.network }} # BRANCH=${{ github.head_ref }} REPLICA_FROM=${{ matrix.replica_from_address }} + WASM_NAME=${{ matrix.wasm_name }} - name: Show build configuration run: cat .docker/docker-compose-forkless-data.${{ matrix.network }}.yml @@ -93,6 +94,7 @@ variables: | NETWORK=${{ matrix.network }} REPLICA_FROM=${{ matrix.replica_from_address }} + WASM_NAME=${{ matrix.wasm_name}} - name: Show launch-config-forkless configuration run: cat .docker/launch-config-forkless-data.json --- a/.github/workflows/forkless-update-nodata.yml +++ b/.github/workflows/forkless-update-nodata.yml @@ -34,10 +34,10 @@ id: create_matrix with: matrix: | - network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}} - network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}} - network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}} - network {sapphire}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}} + network {quartz}, wasm_name {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}} + network {unique}, wasm_name {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}} + network {opal}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}} + network {sapphire}, wasm_name {opal}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}} forkless-update-nodata: @@ -82,6 +82,7 @@ MAINNET_BRANCH=${{ matrix.mainnet_branch }} NETWORK=${{ matrix.network }} # BRANCH=${{ github.head_ref }} + WASM_NAME=${{ matrix.wasm_name }} - name: Show build configuration run: cat .docker/docker-compose.${{ matrix.network }}.yml @@ -93,6 +94,7 @@ output_file: .docker/launch-config-forkless-nodata.json variables: | NETWORK=${{ matrix.network }} + WASM_NAME=${{ matrix.wasm_name }} - name: Show launch-config-forkless configuration run: cat .docker/launch-config-forkless-nodata.json --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -35,9 +35,10 @@ id: create_matrix with: matrix: | - network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}} - network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}} - network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}} + network {opal}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}} + network {sapphire}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}} + network {quartz}, wasm_name {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}} + network {unique}, wasm_name {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}} parallel-test: needs: nodes-execution-matrix @@ -82,6 +83,7 @@ MAINNET_BRANCH=${{ matrix.mainnet_branch }} NETWORK=${{ matrix.network }} BRANCH=${{ github.head_ref }} + WASM_NAME=${{ matrix.wasm_name }} - name: Show build configuration run: cat .docker/docker-compose.node.${{ matrix.network }}.yml @@ -230,6 +232,7 @@ MAINNET_BRANCH=${{ matrix.mainnet_branch }} NETWORK=${{ matrix.network }} BRANCH=${{ github.head_ref }} + WASM_NAME=${{ matrix.wasm_name }} - name: Show build configuration run: cat .docker/docker-compose.node.${{ matrix.network }}.yml --- a/.github/workflows/node-only-update.yml +++ b/.github/workflows/node-only-update.yml @@ -37,10 +37,10 @@ id: create_matrix with: matrix: | - network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}} - network {sapphire}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}} - network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}} - network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}} + network {opal}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}} + network {sapphire}, wasm_name {opal}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}} + network {quartz}, wasm_name {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}} + network {unique}, wasm_name {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}} nodes-only-update: @@ -85,6 +85,7 @@ # MAINNET_TAG=${{ matrix.mainnet_tag }} MAINNET_BRANCH=${{ matrix.mainnet_branch }} NETWORK=${{ matrix.network }} + WASM_NAME=${{ matrix.wasm_name }} # BRANCH=${{ github.head_ref }} - name: Show build configuration @@ -97,6 +98,7 @@ output_file: .docker/launch-config-forkless-nodata.json variables: | NETWORK=${{ matrix.network }} + WASM_NAME=${{ matrix.wasm_name }} - name: Show launch-config-forkless configuration run: cat .docker/launch-config-forkless-nodata.json --- a/.github/workflows/try-runtime.yml +++ b/.github/workflows/try-runtime.yml @@ -33,9 +33,10 @@ id: create_matrix with: matrix: | - network {opal}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}} - network {quartz}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}} - network {unique}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}} + network {opal}, wasm_name {opal}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}} + network {sapphire}, wasm_name {opal}, replica_from_address {${{ env.SAPPHIRE_REPLICA_FROM }}} + network {quartz}, wasm_name {quartz}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}} + network {unique}, wasm_name {unique}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}} try-runtime: needs: prepare-execution-marix @@ -70,6 +71,7 @@ variables: | RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} NETWORK=${{ matrix.network }} + WASM_NAME=${{ matrix.wasm_name }} REPLICA_FROM=${{ matrix.replica_from_address }} - name: Show build configuration --- a/.github/workflows/yarn-dev.yml +++ b/.github/workflows/yarn-dev.yml @@ -24,6 +24,7 @@ matrix: include: - network: "opal" + - network: "sapphire" - network: "quartz" - network: "unique"