From edec42acc11c077d9f62a312a11606c8c7ece2d3 Mon Sep 17 00:00:00 2001 From: Konstantin Astakhov Date: Mon, 15 Aug 2022 06:43:44 +0000 Subject: [PATCH] changes for fork --- --- a/.docker/forking/Dockerfile-parachain-live-fork +++ b/.docker/forking/Dockerfile-parachain-live-fork @@ -4,10 +4,7 @@ ARG RUST_TOOLCHAIN= -ARG UNIQUE_BRANCH=develop - ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN -ENV UNIQUE_BRANCH $UNIQUE_BRANCH ENV CARGO_HOME="/cargo-home" ENV PATH="/cargo-home/bin:$PATH" @@ -27,22 +24,7 @@ rustup target list --installed && \ rustup show RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN - -# ===== BUILD current version ====== -FROM rust-builder as builder-unique-current - -ARG PROFILE=release -ARG FEATURE= -ARG MAINNET_BRANCH= -ARG REPO_URL= - -RUN mkdir /unique_parachain -WORKDIR /unique_parachain - -RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \ - cargo build --features=$FEATURE --$PROFILE - # ===== BUILD target version ====== FROM rust-builder as builder-unique-target @@ -100,27 +82,21 @@ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ cd /polkadot-launch && \ npm install --global yarn && \ - yarn + yarn install RUN echo "$RUNTIME" -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/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm 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 COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/ -ARG FORK_FROM=wss://eu-ws-quartz.unique.network:443 +ARG FORK_FROM= ENV FORK_FROM=$FORK_FROM CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" FORK_FROM && \ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ cd /polkadot-launch && \ - yarn start launch-config.json --test-upgrade-parachains - - - + yarn start launch-config.json --- a/.docker/forking/docker-compose.tmp-fork.j2 +++ b/.docker/forking/docker-compose.tmp-fork.j2 @@ -12,3 +12,4 @@ - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}" - "MAINNET_TAG={{ MAINNET_TAG }}" - "MAINNET_BRANCH={{ MAINNET_BRANCH }}" + - "FORK_FROM={{ FORK_FROM }}" --- a/.docker/forking/launch-config-fork.j2 +++ b/.docker/forking/launch-config-fork.j2 @@ -1,8 +1,6 @@ { "relaychain": { "bin": "/polkadot/target/release/polkadot", - "upgradeBin": "/polkadot/target/release/polkadot", - "upgradeWasm": "/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm", "chain": "westend-local", "nodes": [ { @@ -87,8 +85,6 @@ "parachains": [ { "bin": "/unique-chain/current/release/unique-collator", - "upgradeBin": "/unique-chain/target/release/unique-collator", - "upgradeWasm": "/unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm", "id": "1000", "balance": "1000000000000000000000000", "chainRawInitializer": [ --- a/.github/workflows/fork-update-withdata.yml +++ b/.github/workflows/fork-update-withdata.yml @@ -46,9 +46,9 @@ id: create_matrix with: matrix: | - network {Opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}} - network {Quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}} - network {Unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}} + network {Opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443} + network {Quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443} + network {Unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443} @@ -64,27 +64,9 @@ strategy: matrix: include: ${{fromJson(needs.prepare-execution-marix-fork.outputs.matrix)}} -# include: -# - network: "Opal" -# features: "opal-runtime" -# runtime: "opal" -# mainnet_branch: v924010 -# mainnet_tag: v924010 -# - network: "Quartz" # KUSAMA_MAINNET_BRANCH для quartz-runtime -# features: "quartz-runtime" -# runtime: "quartz" -# mainnet_branch: quartz-v924012-2 -# mainnet_tag: v924012 -# - network: "Unique" # POLKADOT_MAINNET_BRANCH для unique-runtime -# features: "unique-runtime" -# runtime: "unique" -# mainnet_branch: v924010 -# mainnet_tag: v924010 - - steps: -# - name: Skip if pull request is in Draft + - name: Skip if pull request is in Draft # `if: github.event.pull_request.draft == true` should be kept here, at # the step level, rather than at the job level. The latter is not # recommended because when the PR is moved from "Draft" to "Ready to @@ -99,8 +81,8 @@ # 4. Move it to "Ready for review"; now the workflow is passing (it was # skipped) and "Check reviews" is also passing (it won't be updated # until the workflow is finished) -# if: github.event.pull_request.draft == true -# run: exit 1 + if: github.event.pull_request.draft == true + run: exit 1 - name: Clean Workspace uses: AutoModality/action-clean@v1.1.0 @@ -128,6 +110,7 @@ FEATURE=${{ matrix.features }} RUNTIME=${{ matrix.runtime }} BRANCH=${{ github.head_ref }} + FORK_FROM=${{ matrix.fork_from_address }} - name: Show build configuration run: cat .docker/forking/docker-compose.${{ matrix.network }}.yml -- gitstuff