git.delta.rocks / unique-network / refs/commits / 88e36460f932

difftreelog

fix rename variable

Alexander Aksenov2022-08-22parent: #93a0bf6.patch.diff
in: master

9 files changed

modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
--- 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
modified.docker/Dockerfile-try-runtimediffbeforeafterboth
--- 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
modified.docker/docker-compose.tmp-forkless-data.j2diffbeforeafterboth
--- 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
modified.docker/docker-compose.try-runtime.j2diffbeforeafterboth
--- 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 }}"
 
modified.docker/forkless-config/launch-config-forkless-data.j2diffbeforeafterboth
--- 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": [
modified.envdiffbeforeafterboth
--- 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
modified.github/workflows/codestyle.ymldiffbeforeafterboth
--- 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 }}
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
before · .github/workflows/forkless-update-data.yml
1name: upgrade replica23# 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      - master9    types:10      - opened11      - reopened12      - synchronize   #commit(s) pushed to the pull request13      - ready_for_review1415  # Allows you to run this workflow manually from the Actions tab16  workflow_dispatch:1718#Define Workflow variables19env:20  REPO_URL: ${{ github.server_url }}/${{ github.repository }}2122concurrency:23  group: ${{ github.workflow }}-${{ github.ref }}24  cancel-in-progress: true2526# A workflow run is made up of one or more jobs that can run sequentially or in parallel27jobs:2829  prepare-execution-marix:3031    name: Prepare execution matrix3233    runs-on: self-hosted-ci34    outputs:35      matrix: ${{ steps.create_matrix.outputs.matrix }}3637    steps:3839      - name: Clean Workspace40        uses: AutoModality/action-clean@v1.1.04142      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it43      - uses: actions/checkout@v344        with:45          ref: ${{ github.head_ref }}  #Checking out head commit4647      - name: Read .env file48        uses: xom9ikk/dotenv@v1.0.24950      - name: Create Execution matrix51        uses: CertainLach/create-matrix-action@v352        id: create_matrix53        with:54          matrix: |55            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {${{ env.OPAL_FORK_FROM }}}56            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {${{ env.QUARTZ_FORK_FROM }}}57            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, fork_from_address {${{ env.UNIQUE_FORK_FROM }}}58596061  forkless-update-data:62    needs: prepare-execution-marix63    # The type of runner that the job will run on64    runs-on: [self-hosted-ci,large]65    timeout-minutes: 138066676869    name: ${{ matrix.network }}7071    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.7273    strategy:74      matrix:75        include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}767778    steps:79      - name: Skip if pull request is in Draft80        # `if: github.event.pull_request.draft == true` should be kept here, at81        # the step level, rather than at the job level. The latter is not82        # recommended because when the PR is moved from "Draft" to "Ready to83        # review" the workflow will immediately be passing (since it was skipped),84        # even though it hasn't actually ran, since it takes a few seconds for85        # the workflow to start. This is also disclosed in:86        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1787        # That scenario would open an opportunity for the check to be bypassed:88        # 1. Get your PR approved89        # 2. Move it to Draft90        # 3. Push whatever commits you want91        # 4. Move it to "Ready for review"; now the workflow is passing (it was92        #    skipped) and "Check reviews" is also passing (it won't be updated93        #    until the workflow is finished)94        if: github.event.pull_request.draft == true95        run: exit 19697      - name: Clean Workspace98        uses: AutoModality/action-clean@v1.1.099100      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it101      - uses: actions/checkout@v3102        with:103          ref: ${{ github.head_ref }}  #Checking out head commit104105      - name: Read .env file106        uses: xom9ikk/dotenv@v1.0.2107108      - name: Generate ENV related extend file for docker-compose109        uses: cuchi/jinja2-action@v1.2.0110        with:111          template: .docker/docker-compose.tmp-forkless-data.j2112          output_file: .docker/docker-compose.${{ matrix.network }}.yml113          variables: |114            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git115            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}116            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}117            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}118            MAINNET_TAG=${{ matrix.mainnet_tag }}119            MAINNET_BRANCH=${{ matrix.mainnet_branch }}120            FEATURE=${{ matrix.features }}121            RUNTIME=${{ matrix.runtime }}122            BRANCH=${{ github.head_ref }}123            FORK_FROM=${{ matrix.fork_from_address }}124125      - name: Show build configuration126        run: cat .docker/docker-compose.${{ matrix.network }}.yml127128      - name: Generate launch-config-forkless-data.json129        uses: cuchi/jinja2-action@v1.2.0130        with:131          template: .docker/forkless-config/launch-config-forkless-data.j2132          output_file: .docker/launch-config-forkless-data.json133          variables: |134            FEATURE=${{ matrix.features }}135            RUNTIME=${{ matrix.runtime }}136137      - name: Show launch-config-forkless configuration138        run: cat .docker/launch-config-forkless-data.json139140141      - name: Build the stack142        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300143144      - name: Check if docker logs consist logs related to Runtime Upgrade testing.145        if: success()146        run: |147          counter=160148          function check_container_status {149                docker inspect -f {{.State.Running}} node-parachain150          }151          function do_docker_logs {152                docker logs --details node-parachain  2>&1153          }154          function is_started {155                if [ "$(check_container_status)" == "true" ]; then156                        echo "Container: node-parachain RUNNING";157                        echo "Check Docker logs"158                        DOCKER_LOGS=$(do_docker_logs)159                        if [[ ${DOCKER_LOGS} = *"🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"* ]];then160                                echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"161                                return 0162                        elif [[ ${DOCKER_LOGS} = *"🚧 PARACHAINS' RUNTIME UPGRADE TESTING FAILED 🚧"* ]];then163                                echo "🚧 PARACHAINS' RUNTIME UPGRADE TESTING FAILED 🚧"164                                return 1165                        else166                                echo "Message not found in logs output, repeating..."167                                return 1168                        fi169                else170                        echo "Container node-parachain not RUNNING"171                        echo "Halting all future checks"172                        exit 1173                fi174          exit 0175          }176          while ! is_started; do177                echo "Waiting for special message in log files "178                sleep 30s179                counter=$(( $counter - 1 ))180                echo "Counter: $counter"181                if [ "$counter" -gt "0" ]; then182                         continue183                else184                         break185                fi186          done187          echo "Halting script"188          exit 0189        shell: bash190191      - name: Collect Docker Logs192        if: success() || failure()193        uses: jwalton/gh-docker-logs@v2.2.0194        with:195          dest: './forkless-parachain-upgrade-data-logs.${{ matrix.features }}'196          images: 'node-parachain'197198      - name: Show Docker logs199        if: success() || failure()200        run: cat './forkless-parachain-upgrade-data-logs.${{ matrix.features }}/node-parachain.log'201202      - name: Stop running containers203        if: always()                   # run this step always204        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
after · .github/workflows/forkless-update-data.yml
1name: upgrade replica23# 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      - master9    types:10      - opened11      - reopened12      - synchronize   #commit(s) pushed to the pull request13      - ready_for_review1415  # Allows you to run this workflow manually from the Actions tab16  workflow_dispatch:1718#Define Workflow variables19env:20  REPO_URL: ${{ github.server_url }}/${{ github.repository }}2122concurrency:23  group: ${{ github.workflow }}-${{ github.ref }}24  cancel-in-progress: true2526# A workflow run is made up of one or more jobs that can run sequentially or in parallel27jobs:2829  prepare-execution-marix:3031    name: Prepare execution matrix3233    runs-on: self-hosted-ci34    outputs:35      matrix: ${{ steps.create_matrix.outputs.matrix }}3637    steps:3839      - name: Clean Workspace40        uses: AutoModality/action-clean@v1.1.04142      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it43      - uses: actions/checkout@v344        with:45          ref: ${{ github.head_ref }}  #Checking out head commit4647      - name: Read .env file48        uses: xom9ikk/dotenv@v1.0.24950      - name: Create Execution matrix51        uses: CertainLach/create-matrix-action@v352        id: create_matrix53        with:54          matrix: |55            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}56            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}57            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}}58596061  forkless-update-data:62    needs: prepare-execution-marix63    # The type of runner that the job will run on64    runs-on: [self-hosted-ci,large]65    timeout-minutes: 138066676869    name: ${{ matrix.network }}7071    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.7273    strategy:74      matrix:75        include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}767778    steps:79      - name: Skip if pull request is in Draft80        # `if: github.event.pull_request.draft == true` should be kept here, at81        # the step level, rather than at the job level. The latter is not82        # recommended because when the PR is moved from "Draft" to "Ready to83        # review" the workflow will immediately be passing (since it was skipped),84        # even though it hasn't actually ran, since it takes a few seconds for85        # the workflow to start. This is also disclosed in:86        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1787        # That scenario would open an opportunity for the check to be bypassed:88        # 1. Get your PR approved89        # 2. Move it to Draft90        # 3. Push whatever commits you want91        # 4. Move it to "Ready for review"; now the workflow is passing (it was92        #    skipped) and "Check reviews" is also passing (it won't be updated93        #    until the workflow is finished)94        if: github.event.pull_request.draft == true95        run: exit 19697      - name: Clean Workspace98        uses: AutoModality/action-clean@v1.1.099100      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it101      - uses: actions/checkout@v3102        with:103          ref: ${{ github.head_ref }}  #Checking out head commit104105      - name: Read .env file106        uses: xom9ikk/dotenv@v1.0.2107108      - name: Generate ENV related extend file for docker-compose109        uses: cuchi/jinja2-action@v1.2.0110        with:111          template: .docker/docker-compose.tmp-forkless-data.j2112          output_file: .docker/docker-compose.${{ matrix.network }}.yml113          variables: |114            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git115            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}116            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}117            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}118            MAINNET_TAG=${{ matrix.mainnet_tag }}119            MAINNET_BRANCH=${{ matrix.mainnet_branch }}120            FEATURE=${{ matrix.features }}121            RUNTIME=${{ matrix.runtime }}122            BRANCH=${{ github.head_ref }}123            REPLICA_FROM=${{ matrix.replica_from_address }}124125      - name: Show build configuration126        run: cat .docker/docker-compose.${{ matrix.network }}.yml127128      - name: Generate launch-config-forkless-data.json129        uses: cuchi/jinja2-action@v1.2.0130        with:131          template: .docker/forkless-config/launch-config-forkless-data.j2132          output_file: .docker/launch-config-forkless-data.json133          variables: |134            FEATURE=${{ matrix.features }}135            RUNTIME=${{ matrix.runtime }}136137      - name: Show launch-config-forkless configuration138        run: cat .docker/launch-config-forkless-data.json139140141      - name: Build the stack142        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300143144      - name: Check if docker logs consist logs related to Runtime Upgrade testing.145        if: success()146        run: |147          counter=160148          function check_container_status {149                docker inspect -f {{.State.Running}} node-parachain150          }151          function do_docker_logs {152                docker logs --details node-parachain  2>&1153          }154          function is_started {155                if [ "$(check_container_status)" == "true" ]; then156                        echo "Container: node-parachain RUNNING";157                        echo "Check Docker logs"158                        DOCKER_LOGS=$(do_docker_logs)159                        if [[ ${DOCKER_LOGS} = *"🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"* ]];then160                                echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"161                                return 0162                        elif [[ ${DOCKER_LOGS} = *"🚧 PARACHAINS' RUNTIME UPGRADE TESTING FAILED 🚧"* ]];then163                                echo "🚧 PARACHAINS' RUNTIME UPGRADE TESTING FAILED 🚧"164                                return 1165                        else166                                echo "Message not found in logs output, repeating..."167                                return 1168                        fi169                else170                        echo "Container node-parachain not RUNNING"171                        echo "Halting all future checks"172                        exit 1173                fi174          exit 0175          }176          while ! is_started; do177                echo "Waiting for special message in log files "178                sleep 30s179                counter=$(( $counter - 1 ))180                echo "Counter: $counter"181                if [ "$counter" -gt "0" ]; then182                         continue183                else184                         break185                fi186          done187          echo "Halting script"188          exit 0189        shell: bash190191      - name: Collect Docker Logs192        if: success() || failure()193        uses: jwalton/gh-docker-logs@v2.2.0194        with:195          dest: './forkless-parachain-upgrade-data-logs.${{ matrix.features }}'196          images: 'node-parachain'197198      - name: Show Docker logs199        if: success() || failure()200        run: cat './forkless-parachain-upgrade-data-logs.${{ matrix.features }}/node-parachain.log'201202      - name: Stop running containers203        if: always()                   # run this step always204        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
modified.github/workflows/try-runtime.ymldiffbeforeafterboth
--- 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