git.delta.rocks / unique-network / refs/commits / 405963f1d11c

difftreelog

Fixing state by the end if day.

Alexander Aksenov2022-08-09parent: #5fb6f23.patch.diff
in: master

6 files changed

modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -11,7 +11,7 @@
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update && \
-    apt-get install -y cmake curl pkg-config libssl-dev git clang && \
+    apt-get install -y curl cmake pkg-config libssl-dev git clang && \
     apt-get clean && \
     rm -r /var/lib/apt/lists/*
 
@@ -40,9 +40,8 @@
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
-RUN echo "$MAINNET_BRANCH" && echo "$REPO_URL"
 RUN git clone $REPO_URL -b $MAINNET_BRANCH .
-RUN cargo build $FEATURE --$PROFILE
+RUN cargo build --features=$FEATURE --$PROFILE
 
 
 # ===== BUILD target version ======
@@ -57,10 +56,8 @@
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $BRANCH .
-RUN cargo build $FEATURE --$PROFILE
+RUN cargo build --features=$FEATURE --$PROFILE
 
-COPY /unique_parachain/launch-config-forkless.json /polkadot-launch/launch-config.json
-
 
 # ===== BUILD POLKADOT =====
 FROM rust-builder as builder-polkadot
@@ -98,11 +95,8 @@
 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-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-
-COPY --from=builder-unique-target /unique_parachain/launch-config-forkless.json /polkadot-launch/launch-config.json
 
-
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
-    yarn start launch-config.json --test-upgrade
+    yarn start launch-config.json
modified.docker/docker-compose-forkless.yamldiffbeforeafterboth
--- a/.docker/docker-compose-forkless.yaml
+++ b/.docker/docker-compose-forkless.yaml
@@ -7,6 +7,8 @@
       dockerfile: .docker/Dockerfile-parachain-upgrade
     image: node-parachain
     container_name: node-parachain
+    volumes:
+      - .docker/launch-config-forkless.json:/polkadot-launch/launch-config.json
     expose:
       - 9944
       - 9933
added.docker/launch-config.j2diffbeforeafterboth
--- /dev/null
+++ b/.docker/launch-config.j2
@@ -0,0 +1,40 @@
+{
+      "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",
+            "nodes": [
+                {
+                    "port": 31200,
+                    "wsPort": 9944,
+                    "rpcPort": 9933,
+                    "name": "alice",
+                    "flags": [
+                        "--rpc-cors=all",
+                        "--unsafe-rpc-external",
+                        "--unsafe-ws-external",
+                        "-lxcm=trace"
+                    ]
+                },
+                {
+                    "port": 31201,
+                    "wsPort": 9945,
+                    "rpcPort": 9934,
+                    "name": "bob",
+                    "flags": [
+                        "--rpc-cors=all",
+                        "--unsafe-rpc-external",
+                        "--unsafe-ws-external",
+                        "-lxcm=trace"
+                    ]
+                }
+            ]
+        }
+    ],
+    "simpleParachains": [],
+    "hrmpChannels": [],
+    "finalization": false
+}
deleted.docker/launch-config.jsondiffbeforeafterboth
--- a/.docker/launch-config.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "relaychain": {
-        "bin": "../polkadot/target/release/polkadot",
-        "chain": "westend-local",
-        "nodes": [
-            {
-                "name": "alice",
-                "wsPort": 9844,
-                "rpcPort": 9843,
-                "port": 30444,
-                "flags": [
-                    "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace",
-                    "--rpc-cors=all",
-                    "--unsafe-rpc-external",
-                    "--unsafe-ws-external"
-                ]
-            },
-            {
-                "name": "bob",
-                "wsPort": 9855,
-                "rpcPort": 9854,
-                "port": 30555,
-                "flags": [
-                    "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace",
-                    "--rpc-cors=all",
-                    "--unsafe-rpc-external",
-                    "--unsafe-ws-external"
-                ]
-            },
-            {
-                "name": "charlie",
-                "wsPort": 9866,
-                "rpcPort": 9865,
-                "port": 30666,
-                "flags": [
-                    "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace",
-                    "--rpc-cors=all",
-                    "--unsafe-rpc-external",
-                    "--unsafe-ws-external"
-                ]
-            },
-            {
-                "name": "dave",
-                "wsPort": 9877,
-                "rpcPort": 9876,
-                "port": 30777,
-                "flags": [
-                    "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace",
-                    "--rpc-cors=all",
-                    "--unsafe-rpc-external",
-                    "--unsafe-ws-external"
-                ]
-            },
-            {
-                "name": "eve",
-                "wsPort": 9888,
-                "rpcPort": 9887,
-                "port": 30888,
-                "flags": [
-                    "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace",
-                    "--rpc-cors=all",
-                    "--unsafe-rpc-external",
-                    "--unsafe-ws-external"
-                ]
-            }
-        ],
-        "genesis": {
-            "runtime": {
-                "runtime_genesis_config": {
-                    "parachainsConfiguration": {
-                        "config": {
-                            "validation_upgrade_frequency": 1,
-                            "validation_upgrade_delay": 1
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "parachains": [
-        {
-            "bin": "../unique-chain/current/release/unique-collator",    #Mainnet TAG
-            "upgradeBin": "../unique-chain/target/release/unique-collator",   # version in PR develop to master
-            "upgradeWasm": "../unique-chain/target/release/wbuild/opal-runtime/opal_runtime.compact.compressed.wasm",
-            "id": "1000",
-            "balance": "1000000000000000000000000",
-            "nodes": [
-                {
-                    "port": 31200,
-                    "wsPort": 9944,
-                    "rpcPort": 9933,
-                    "name": "alice",
-                    "flags": [
-                        "--rpc-cors=all",
-                        "--unsafe-rpc-external",
-                        "--unsafe-ws-external",
-                        "-lxcm=trace"
-                    ]
-                },
-                {
-                    "port": 31201,
-                    "wsPort": 9945,
-                    "rpcPort": 9934,
-                    "name": "bob",
-                    "flags": [
-                        "--rpc-cors=all",
-                        "--unsafe-rpc-external",
-                        "--unsafe-ws-external",
-                        "-lxcm=trace"
-                    ]
-                }
-            ]
-        }
-    ],
-    "simpleParachains": [],
-    "hrmpChannels": [],
-    "finalization": false
-}
modified.envdiffbeforeafterboth
--- a/.env
+++ b/.env
@@ -1,6 +1,8 @@
 RUST_TOOLCHAIN=nightly-2022-05-11
-RUST_C=1.62.0-nightly
-POLKA_VERSION=release-v0.9.24
-UNIQUE_BRANCH=develop
-USER=***
-PASS=***
+POLKADOT_BUILD_BRANCH=release-v0.9.24
+
+POLKADOT_MAINNET_BRANCH=release-v0.9.25
+UNIQUE_MAINNET_TAG=v924010
+
+KUSAMA_MAINNET_BRANCH=release-v0.9.26
+QUARTZ_MAINNET_TAG=v924012
\ No newline at end of file
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
before · .github/workflows/forkless-update-nodata.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  RUST_TOOLCHAIN: nightly-2022-05-1120  REPO_URL: ${{ github.server_url }}/${{ github.repository }}21  POLKADOT_BUILD_BRANCH: release-v0.9.2422  POLKADOT_MAINNET_BRANCH: release-v0.9.25  # for unique-runtime23  UNIQUE_MAINNET_TAG: v92401024  KUSAMA_MAINNET_BRANCH: release-v0.9.26    # for для quartz-runtime25  QUARTZ_MAINNET_TAG: v9240122627# A workflow run is made up of one or more jobs that can run sequentially or in parallel28jobs:29  build:30    # The type of runner that the job will run on31    runs-on: self-hosted-ci3233    name: Build Container, Spin it Up an test3435    continue-on-error: false         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.3637    strategy:38      matrix:39        include:40        #  - network: "Opal"41        #    features: "--features=opal-runtime"42        #    binary_version:43          - network: "Quartz"   # KUSAMA_MAINNET_BRANCH для quartz-runtime44            features: "--features=quartz-runtime"45            mainnet_branch: quartz-v924012-246            mainnet_tag: v92401247          - network: "Unique"   # POLKADOT_MAINNET_BRANCH для unique-runtime48            features: "--features=unique-runtime"49            mainnet_branch: v92401050            mainnet_tag: v92401051525354    steps:55#      - name: Skip if pull request is in Draft56        # `if: github.event.pull_request.draft == true` should be kept here, at57        # the step level, rather than at the job level. The latter is not58        # recommended because when the PR is moved from "Draft" to "Ready to59        # review" the workflow will immediately be passing (since it was skipped),60        # even though it hasn't actually ran, since it takes a few seconds for61        # the workflow to start. This is also disclosed in:62        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1763        # That scenario would open an opportunity for the check to be bypassed:64        # 1. Get your PR approved65        # 2. Move it to Draft66        # 3. Push whatever commits you want67        # 4. Move it to "Ready for review"; now the workflow is passing (it was68        #    skipped) and "Check reviews" is also passing (it won't be updated69        #    until the workflow is finished)70#        if: github.event.pull_request.draft == true71#        run: exit 17273      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it74      - uses: actions/checkout@v375        with:76          ref: ${{ github.head_ref }}  #Checking out head commit7778      - name: Generate ENV related extend file for docker-compose79        uses: cuchi/jinja2-action@v1.2.080        with:81          template: .docker/docker-compose.tmp-forkless.j282          output_file: .docker/docker-compose.${{ matrix.network }}.yml83          variables: |84            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git85            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}86            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}87            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}88            MAINNET_TAG=${{ matrix.mainnet_tag }}89            MAINNET_BRANCH=${{ matrix.mainnet_branch }}90            FEATURE=${{ matrix.features }}91            BRANCH=${{ github.head_ref }}9293      - name: Show build configuration94        run: cat .docker/docker-compose.${{ matrix.network }}.yml9596      - name: Build the stack97        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build9899100#      - name: Test Report101#        uses: phoenix-actions/test-reporting@v8102#        if: success() || failure()    # run this step even if previous step failed103#        with:104#          name: Tests ${{ matrix.network }}            # Name of the check run which will be created105#          path: tests/mochawesome-report/test-*.json    # Path to test results106#          reporter: mochawesome-json107#          fail-on-error: 'false'108#109#      - name: Read output variables110#        run: |111#          echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"112113      - name: Stop running containers114        if: always()                   # run this step always115        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
after · .github/workflows/forkless-update-nodata.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:23  build:24    # The type of runner that the job will run on25    runs-on: self-hosted-ci2627    name: Build Container, Spin it Up an test2829    continue-on-error: false         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.3031    strategy:32      matrix:33        include:34        #  - network: "Opal"35        #    features: "--features=opal-runtime"36        #    binary_version:37          - network: "Quartz"   # KUSAMA_MAINNET_BRANCH для quartz-runtime38            features: "quartz-runtime"39            runtime: "quartz"40            mainnet_branch: quartz-v924012-241            mainnet_tag: v92401242          - network: "Unique"   # POLKADOT_MAINNET_BRANCH для unique-runtime43            features: "unique-runtime"44            runtime: "unique"45            mainnet_branch: v92401046            mainnet_tag: v92401047484950    steps:51#      - name: Skip if pull request is in Draft52        # `if: github.event.pull_request.draft == true` should be kept here, at53        # the step level, rather than at the job level. The latter is not54        # recommended because when the PR is moved from "Draft" to "Ready to55        # review" the workflow will immediately be passing (since it was skipped),56        # even though it hasn't actually ran, since it takes a few seconds for57        # the workflow to start. This is also disclosed in:58        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1759        # That scenario would open an opportunity for the check to be bypassed:60        # 1. Get your PR approved61        # 2. Move it to Draft62        # 3. Push whatever commits you want63        # 4. Move it to "Ready for review"; now the workflow is passing (it was64        #    skipped) and "Check reviews" is also passing (it won't be updated65        #    until the workflow is finished)66#        if: github.event.pull_request.draft == true67#        run: exit 16869      - name: Clean Workspace70        uses: AutoModality/action-clean@v1.1.07172      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it73      - uses: actions/checkout@v374        with:75          ref: ${{ github.head_ref }}  #Checking out head commit7677      - name: Read .env file78        uses: xom9ikk/dotenv@v1.0.27980      - name: Generate ENV related extend file for docker-compose81        uses: cuchi/jinja2-action@v1.2.082        with:83          template: .docker/docker-compose.tmp-forkless.j284          output_file: .docker/docker-compose.${{ matrix.network }}.yml85          variables: |86            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git87            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}88            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}89            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}90            MAINNET_TAG=${{ matrix.mainnet_tag }}91            MAINNET_BRANCH=${{ matrix.mainnet_branch }}92            FEATURE=${{ matrix.features }}93            BRANCH=${{ github.head_ref }}9495      - name: Show build configuration96        run: cat .docker/docker-compose.${{ matrix.network }}.yml9798      - name: Generate launch-config.json99        uses: cuchi/jinja2-action@v1.2.0100        with:101          template: .docker/launch-config.j2102          output_file: .docker/launch-config-forkless.json103          variables: |104            FEATURE=${{ matrix.features }}105            RUNTIME=${{ matrix.runtime }}106107      - name: Show launch-config-forkless configuration108        run: cat .docker/launch-config-forkless.json109110      - name: Show files in directory111        run: ls -la112113114      - name: Build the stack115        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --force-recreate --remove-orphans116117118#      - name: Test Report119#        uses: phoenix-actions/test-reporting@v8120#        if: success() || failure()    # run this step even if previous step failed121#        with:122#          name: Tests ${{ matrix.network }}            # Name of the check run which will be created123#          path: tests/mochawesome-report/test-*.json    # Path to test results124#          reporter: mochawesome-json125#          fail-on-error: 'false'126#127#      - name: Read output variables128#        run: |129#          echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"130131#      - name: Stop running containers132#        if: always()                   # run this step always133#        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down