--- a/.docker/Dockerfile-parachain-upgrade-data +++ b/.docker/Dockerfile-parachain-upgrade-data @@ -108,9 +108,9 @@ COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/ COPY --from=builder-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 -ARG FORK_FROM= -ENV FORK_FROM=$FORK_FROM -CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" FORK_FROM && \ +ARG REPLICA_FROM= +ENV REPLICA_FROM=$REPLICA_FROM +CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ cd /polkadot-launch && \ yarn start launch-config.json --test-upgrade-parachains --- a/.docker/Dockerfile-try-runtime +++ b/.docker/Dockerfile-try-runtime @@ -34,17 +34,17 @@ ARG PROFILE=release ARG FEATURE= -ARG FORK_FROM= +ARG REPLICA_FROM= ENV FEATURE $FEATURE -ENV FORK_FROM $FORK_FROM +ENV REPLICA_FROM $REPLICA_FROM COPY . /unique_parachain WORKDIR /unique_parachain RUN echo "Requested features: $FEATURE\n" && \ - echo "Fork from: $FORK_FROM\n" && \ + echo "Fork from: $REPLICA_FROM\n" && \ cargo build --features=$FEATURE --release -CMD cargo run --features=$FEATURE --release -- try-runtime on-runtime-upgrade live --uri $FORK_FROM +CMD cargo run --features=$FEATURE --release -- try-runtime on-runtime-upgrade live --uri $REPLICA_FROM --- a/.docker/docker-compose.tmp-forkless-data.j2 +++ b/.docker/docker-compose.tmp-forkless-data.j2 @@ -12,7 +12,7 @@ - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}" - "MAINNET_TAG={{ MAINNET_TAG }}" - "MAINNET_BRANCH={{ MAINNET_BRANCH }}" - - "FORK_FROM={{ FORK_FROM }}" + - "REPLICA_FROM={{ REPLICA_FROM }}" context: ../ dockerfile: .docker/Dockerfile-parachain-upgrade-data image: node-parachain --- a/.docker/docker-compose.try-runtime.j2 +++ b/.docker/docker-compose.try-runtime.j2 @@ -6,5 +6,5 @@ args: - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}" - "FEATURE={{ FEATURE }}" - - "FORK_FROM={{ FORK_FROM }}" + - "REPLICA_FROM={{ REPLICA_FROM }}" --- a/.docker/forkless-config/launch-config-forkless-data.j2 +++ b/.docker/forkless-config/launch-config-forkless-data.j2 @@ -93,9 +93,9 @@ "balance": "1000000000000000000000000", "chainRawInitializer": [ "chainql", - "--ext-str=FORK_FROM", + "--ext-str=REPLICA_FROM", "--tla-code=rawSpec=import '${rawSpec}'", - "--tla-code=forkFrom=std.extVar('FORK_FROM')", + "--tla-code=forkFrom=std.extVar('REPLICA_FROM')", "fork.jsonnet" ], "nodes": [ --- a/.env +++ b/.env @@ -7,6 +7,6 @@ KUSAMA_MAINNET_BRANCH=release-v0.9.26 QUARTZ_MAINNET_TAG=quartz-v924012-2 -OPAL_FORK_FROM=wss://eu-ws-opal.unique.network:443 -QUARTZ_FORK_FROM=wss://eu-ws-quartz.unique.network:443 -UNIQUE_FORK_FROM=wss://eu-ws.unique.network:443 +OPAL_REPLICA_FROM=wss://eu-ws-opal.unique.network:443 +QUARTZ_REPLICA_FROM=wss://eu-ws-quartz.unique.network:443 +UNIQUE_REPLICA_FROM=wss://eu-ws.unique.network:443 --- a/.github/workflows/codestyle.yml +++ b/.github/workflows/codestyle.yml @@ -37,16 +37,20 @@ if: github.event.pull_request.draft == true run: exit 1 - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Install latest nightly uses: actions-rs/toolchain@v1 with: toolchain: nightly default: true target: wasm32-unknown-unknown - components: rustfmt, clippy + components: rustfmt, clippy - name: Run cargo fmt - run: cargo fmt -- --check + run: cargo fmt -- --check # In that mode it returns only exit code. + - name: Cargo fmt state + if: success() + run: echo "Nothing to do. Cargo fmt returned exit code 0." + clippy: if: ${{ false }} --- a/.github/workflows/forkless-update-data.yml +++ b/.github/workflows/forkless-update-data.yml @@ -52,9 +52,9 @@ id: create_matrix with: matrix: | - network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {${{ env.OPAL_FORK_FROM }}} - network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {${{ env.QUARTZ_FORK_FROM }}} - network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, fork_from_address {${{ env.UNIQUE_FORK_FROM }}} + network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}} + network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}} + network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}} @@ -120,7 +120,7 @@ FEATURE=${{ matrix.features }} RUNTIME=${{ matrix.runtime }} BRANCH=${{ github.head_ref }} - FORK_FROM=${{ matrix.fork_from_address }} + REPLICA_FROM=${{ matrix.replica_from_address }} - name: Show build configuration run: cat .docker/docker-compose.${{ matrix.network }}.yml --- a/.github/workflows/try-runtime.yml +++ b/.github/workflows/try-runtime.yml @@ -38,13 +38,13 @@ include: - network: opal features: try-runtime,opal-runtime - fork_from_address: wss://eu-ws-opal.unique.network:443 + replica_from_address: wss://eu-ws-opal.unique.network:443 - network: quartz features: try-runtime,quartz-runtime - fork_from_address: wss://eu-ws-quartz.unique.network:443 + replica_from_address: wss://eu-ws-quartz.unique.network:443 - network: unique features: try-runtime,unique-runtime - fork_from_address: wss://eu-ws.unique.network:443 + replica_from_address: wss://eu-ws.unique.network:443 steps: - name: Skip if pull request is in Draft @@ -85,7 +85,7 @@ variables: | RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} FEATURE=${{ matrix.features }} - FORK_FROM=${{ matrix.fork_from_address }} + REPLICA_FROM=${{ matrix.replica_from_address }} - name: Show build configuration run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml