git.delta.rocks / unique-network / refs/commits / edec42acc11c

difftreelog

changes for fork

Konstantin Astakhov2022-08-15parent: #c6aaa88.patch.diff
in: master

4 files changed

modified.docker/forking/Dockerfile-parachain-live-forkdiffbeforeafterboth
--- 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
 
 
modified.docker/forking/docker-compose.tmp-fork.j2diffbeforeafterboth
--- 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 }}"
modified.docker/forking/launch-config-fork.j2diffbeforeafterboth
--- 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": [
modified.github/workflows/fork-update-withdata.ymldiffbeforeafterboth
before · .github/workflows/fork-update-withdata.yml
1name: Forkless Parachain update with no data23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6  pull_request:7    branches:8      - develop9    types:10      - opened11      - reopened12      - synchronize   #commit(s) pushed to the pull request1314  # Allows you to run this workflow manually from the Actions tab15  workflow_dispatch:1617#Define Workflow variables18env:19  REPO_URL: ${{ github.server_url }}/${{ github.repository }}2021# A workflow run is made up of one or more jobs that can run sequentially or in parallel22jobs:2324  prepare-execution-marix-fork:25    26    name: Prepare execution matrix for fork27    28    runs-on: self-hosted-ci29    outputs:30      matrix: ${{ steps.create_matrix.outputs.matrix }}31    steps:32      33      - name: Clean Workspace34        uses: AutoModality/action-clean@v1.1.03536      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it37      - uses: actions/checkout@v338        with:39          ref: ${{ github.head_ref }}  #Checking out head commit4041      - name: Read .env file42        uses: xom9ikk/dotenv@v1.0.24344      - name: Create Execution matrix45        uses: fabiocaccamo/create-matrix-action@v246        id: create_matrix47        with:48          matrix: |49            network {Opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}50            network {Quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}51            network {Unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}52535455  fork-update-withdata:56    needs: prepare-execution-marix-fork57    # The type of runner that the job will run on58    runs-on: ci-tests5960    name: Build Container, Spin it Up an test6162    continue-on-error: true         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.6364    strategy:65      matrix:66        include: ${{fromJson(needs.prepare-execution-marix-fork.outputs.matrix)}}67#        include:68#          - network: "Opal"69#            features: "opal-runtime"70#            runtime: "opal"71#            mainnet_branch: v92401072#            mainnet_tag: v92401073#          - network: "Quartz"   # KUSAMA_MAINNET_BRANCH для quartz-runtime74#            features: "quartz-runtime"75#            runtime: "quartz"76#            mainnet_branch: quartz-v924012-277#            mainnet_tag: v92401278#          - network: "Unique"   # POLKADOT_MAINNET_BRANCH для unique-runtime79#            features: "unique-runtime"80#            runtime: "unique"81#            mainnet_branch: v92401082#            mainnet_tag: v92401083848586    steps:87#      - name: Skip if pull request is in Draft88        # `if: github.event.pull_request.draft == true` should be kept here, at89        # the step level, rather than at the job level. The latter is not90        # recommended because when the PR is moved from "Draft" to "Ready to91        # review" the workflow will immediately be passing (since it was skipped),92        # even though it hasn't actually ran, since it takes a few seconds for93        # the workflow to start. This is also disclosed in:94        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1795        # That scenario would open an opportunity for the check to be bypassed:96        # 1. Get your PR approved97        # 2. Move it to Draft98        # 3. Push whatever commits you want99        # 4. Move it to "Ready for review"; now the workflow is passing (it was100        #    skipped) and "Check reviews" is also passing (it won't be updated101        #    until the workflow is finished)102#        if: github.event.pull_request.draft == true103#        run: exit 1104105      - name: Clean Workspace106        uses: AutoModality/action-clean@v1.1.0107108      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it109      - uses: actions/checkout@v3110        with:111          ref: ${{ github.head_ref }}  #Checking out head commit112113      - name: Read .env file114        uses: xom9ikk/dotenv@v1.0.2115116      - name: Generate ENV related extend file for docker-compose117        uses: cuchi/jinja2-action@v1.2.0118        with:119          template: .docker/forking/docker-compose.tmp-fork.j2120          output_file: .docker/forking/docker-compose.${{ matrix.network }}.yml121          variables: |122            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git123            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}124            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}125            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}126            MAINNET_TAG=${{ matrix.mainnet_tag }}127            MAINNET_BRANCH=${{ matrix.mainnet_branch }}128            FEATURE=${{ matrix.features }}129            RUNTIME=${{ matrix.runtime }}130            BRANCH=${{ github.head_ref }}131132      - name: Show build configuration133        run: cat .docker/forking/docker-compose.${{ matrix.network }}.yml134135      - name: Generate launch-config-fork.json136        uses: cuchi/jinja2-action@v1.2.0137        with:138          template: .docker/forking/launch-config-fork.j2139          output_file: .docker/forking/launch-config-fork.json140          variables: |141            FEATURE=${{ matrix.features }}142            RUNTIME=${{ matrix.runtime }}143144      - name: Show launch-config-fork configuration145        run: cat .docker/forking/launch-config-fork.json146147148      - name: Build the stack149        run: docker-compose -f ".docker/forking/docker-compose-fork.yaml" -f ".docker/forking/docker-compose.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300150151      - name: Check if docker logs consist logs related to Runtime Upgrade testing.152        if: success()153        run: |154            counter=160155            function do_docker_logs {156                docker logs --details parachain-fork  2>&1157            }158            function is_started {159                echo "Check Docker logs"160                DOCKER_LOGS=$(do_docker_logs)161                if [[ ${DOCKER_LOGS} = *"🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"* ]];then162                     echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"163                     return 0164                     exit 0165                fi166                     echo "Function is_started: Return 1"167                     return 1168            }169            while ! is_started; do170                echo "Waiting for special message in log files "171                sleep 30s172                counter=$(( $counter - 1 ))173                echo "Counter: $counter"174                if [ "$counter" -gt "0" ]; then175                     continue176                else177                     break178                fi179            done180            exit 1181        shell: bash182183      - name: Collect Docker Logs184        if: success() || failure()185        uses: jwalton/gh-docker-logs@v2.2.0186        with:187          dest: './fork-parachain-update-withdata-logs.${{ matrix.features }}'188          images: 'parachain-fork' 189190      - name: Tar logs191        if: success() || failure()192        run: tar cvzf ./fork-parachain-update-withdata-logs.${{ matrix.features }}.tgz ./fork-parachain-update-withdata-logs.${{ matrix.features }}193194      - name: Upload logs to GitHub195        if: success() || failure()196        uses: actions/upload-artifact@master197        with:198          name: fork-parachain-update-withdata-logs.${{ matrix.features }}.tgz199          path: ./fork-parachain-update-withdata-logs.${{ matrix.features }}.tgz200201#      - name: Stop running containers202#        if: always()                   # run this step always203#        run: docker-compose -f ".docker/forking/docker-compose-fork.yaml" -f ".docker/forking/docker-compose.${{ matrix.network }}.yml" down
after · .github/workflows/fork-update-withdata.yml
1name: Forkless Parachain update with no data23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6  pull_request:7    branches:8      - develop9    types:10      - opened11      - reopened12      - synchronize   #commit(s) pushed to the pull request1314  # Allows you to run this workflow manually from the Actions tab15  workflow_dispatch:1617#Define Workflow variables18env:19  REPO_URL: ${{ github.server_url }}/${{ github.repository }}2021# A workflow run is made up of one or more jobs that can run sequentially or in parallel22jobs:2324  prepare-execution-marix-fork:25    26    name: Prepare execution matrix for fork27    28    runs-on: self-hosted-ci29    outputs:30      matrix: ${{ steps.create_matrix.outputs.matrix }}31    steps:32      33      - name: Clean Workspace34        uses: AutoModality/action-clean@v1.1.03536      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it37      - uses: actions/checkout@v338        with:39          ref: ${{ github.head_ref }}  #Checking out head commit4041      - name: Read .env file42        uses: xom9ikk/dotenv@v1.0.24344      - name: Create Execution matrix45        uses: fabiocaccamo/create-matrix-action@v246        id: create_matrix47        with:48          matrix: |49            network {Opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443}50            network {Quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443}51            network {Unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443}52535455  fork-update-withdata:56    needs: prepare-execution-marix-fork57    # The type of runner that the job will run on58    runs-on: ci-tests5960    name: Build Container, Spin it Up an test6162    continue-on-error: true         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.6364    strategy:65      matrix:66        include: ${{fromJson(needs.prepare-execution-marix-fork.outputs.matrix)}}6768    steps:69      - name: Skip if pull request is in Draft70        # `if: github.event.pull_request.draft == true` should be kept here, at71        # the step level, rather than at the job level. The latter is not72        # recommended because when the PR is moved from "Draft" to "Ready to73        # review" the workflow will immediately be passing (since it was skipped),74        # even though it hasn't actually ran, since it takes a few seconds for75        # the workflow to start. This is also disclosed in:76        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1777        # That scenario would open an opportunity for the check to be bypassed:78        # 1. Get your PR approved79        # 2. Move it to Draft80        # 3. Push whatever commits you want81        # 4. Move it to "Ready for review"; now the workflow is passing (it was82        #    skipped) and "Check reviews" is also passing (it won't be updated83        #    until the workflow is finished)84        if: github.event.pull_request.draft == true85        run: exit 18687      - name: Clean Workspace88        uses: AutoModality/action-clean@v1.1.08990      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it91      - uses: actions/checkout@v392        with:93          ref: ${{ github.head_ref }}  #Checking out head commit9495      - name: Read .env file96        uses: xom9ikk/dotenv@v1.0.29798      - name: Generate ENV related extend file for docker-compose99        uses: cuchi/jinja2-action@v1.2.0100        with:101          template: .docker/forking/docker-compose.tmp-fork.j2102          output_file: .docker/forking/docker-compose.${{ matrix.network }}.yml103          variables: |104            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git105            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}106            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}107            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}108            MAINNET_TAG=${{ matrix.mainnet_tag }}109            MAINNET_BRANCH=${{ matrix.mainnet_branch }}110            FEATURE=${{ matrix.features }}111            RUNTIME=${{ matrix.runtime }}112            BRANCH=${{ github.head_ref }}113            FORK_FROM=${{ matrix.fork_from_address }}114115      - name: Show build configuration116        run: cat .docker/forking/docker-compose.${{ matrix.network }}.yml117118      - name: Generate launch-config-fork.json119        uses: cuchi/jinja2-action@v1.2.0120        with:121          template: .docker/forking/launch-config-fork.j2122          output_file: .docker/forking/launch-config-fork.json123          variables: |124            FEATURE=${{ matrix.features }}125            RUNTIME=${{ matrix.runtime }}126127      - name: Show launch-config-fork configuration128        run: cat .docker/forking/launch-config-fork.json129130131      - name: Build the stack132        run: docker-compose -f ".docker/forking/docker-compose-fork.yaml" -f ".docker/forking/docker-compose.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300133134      - name: Check if docker logs consist logs related to Runtime Upgrade testing.135        if: success()136        run: |137            counter=160138            function do_docker_logs {139                docker logs --details parachain-fork  2>&1140            }141            function is_started {142                echo "Check Docker logs"143                DOCKER_LOGS=$(do_docker_logs)144                if [[ ${DOCKER_LOGS} = *"🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"* ]];then145                     echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"146                     return 0147                     exit 0148                fi149                     echo "Function is_started: Return 1"150                     return 1151            }152            while ! is_started; do153                echo "Waiting for special message in log files "154                sleep 30s155                counter=$(( $counter - 1 ))156                echo "Counter: $counter"157                if [ "$counter" -gt "0" ]; then158                     continue159                else160                     break161                fi162            done163            exit 1164        shell: bash165166      - name: Collect Docker Logs167        if: success() || failure()168        uses: jwalton/gh-docker-logs@v2.2.0169        with:170          dest: './fork-parachain-update-withdata-logs.${{ matrix.features }}'171          images: 'parachain-fork' 172173      - name: Tar logs174        if: success() || failure()175        run: tar cvzf ./fork-parachain-update-withdata-logs.${{ matrix.features }}.tgz ./fork-parachain-update-withdata-logs.${{ matrix.features }}176177      - name: Upload logs to GitHub178        if: success() || failure()179        uses: actions/upload-artifact@master180        with:181          name: fork-parachain-update-withdata-logs.${{ matrix.features }}.tgz182          path: ./fork-parachain-update-withdata-logs.${{ matrix.features }}.tgz183184#      - name: Stop running containers185#        if: always()                   # run this step always186#        run: docker-compose -f ".docker/forking/docker-compose-fork.yaml" -f ".docker/forking/docker-compose.${{ matrix.network }}.yml" down