git.delta.rocks / unique-network / refs/commits / 445ddceca1e3

difftreelog

Merge branch 'feature/multi-assets-redone' of github.com:UniqueNetwork/unique-chain into feature/multi-assets-redone

Alexander Aksenov2022-09-05parents: #af94a85 #8252400.patch.diff
in: master

6 files changed

modified.envdiffbeforeafterboth
--- a/.env
+++ b/.env
@@ -15,6 +15,13 @@
 
 POLKADOT_LAUNCH_BRANCH=feature/rewrite-chain-id-in-spec
 
-ACALA_BUILD_BRANCH=2.9.0
-MOONBEAM_BUILD_BRANCH=v0.25.0
-CUMULUS_BUILD_BRANCH=release-v0.9.230
+KARURA_BUILD_BRANCH=2.9.1
+ACALA_BUILD_BRANCH=2.9.2
+
+MOONRIVER_BUILD_BRANCH=runtime-1701
+MOONBEAM_BUILD_BRANCH=runtime-1701
+
+STATEMINE_BUILD_BRANCH=parachains-v9270
+STATEMINT_BUILD_BRANCH=release-parachains-v9230
+WESTMINT_BUILD_BRANCH=parachains-v9270
+
modified.github/workflows/xcm-testnet-build.ymldiffbeforeafterboth
--- a/.github/workflows/xcm-testnet-build.yml
+++ b/.github/workflows/xcm-testnet-build.yml
@@ -18,7 +18,7 @@
 
     name: Prepare execution matrix
 
-    runs-on: XL
+    runs-on: [XL]
     outputs:
       matrix: ${{ steps.create_matrix.outputs.matrix }}
 
@@ -40,9 +40,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}
-            network {unique}, runtime {unique}, features {unique-runtime}
+            network {opal}, runtime {opal}, features {opal-runtime}, acala_version {${{ env.ACALA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONBEAM_BUILD_BRANCH }}}, cumulus_version {${{ env.WESTMINT_BUILD_BRANCH }}}
+            network {quartz}, runtime {quartz}, features {quartz-runtime}, acala_version {${{ env.KARURA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONRIVER_BUILD_BRANCH }}}, cumulus_version {${{ env.STATEMINE_BUILD_BRANCH }}}
+            network {unique}, runtime {unique}, features {unique-runtime}, acala_version {${{ env.ACALA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONBEAM_BUILD_BRANCH }}}, cumulus_version {${{ env.STATEMINT_BUILD_BRANCH }}}
 
   xcm-build:
     
@@ -89,9 +89,9 @@
             FEATURE=${{ matrix.features }}
             RUNTIME=${{ matrix.runtime }}
             BRANCH=${{ github.head_ref }}
-            ACALA_BUILD_BRANCH=${{ env.ACALA_BUILD_BRANCH }}
-            MOONBEAM_BUILD_BRANCH=${{ env.MOONBEAM_BUILD_BRANCH }}
-            CUMULUS_BUILD_BRANCH=${{ env.CUMULUS_BUILD_BRANCH }}
+            ACALA_BUILD_BRANCH=${{ matrix.acala_version }}
+            MOONBEAM_BUILD_BRANCH=${{ matrix.moonbeam_version }}
+            CUMULUS_BUILD_BRANCH=${{ matrix.cumulus_version }}
 
       - name: Show build Dockerfile
         run: cat .docker/Dockerfile-xcm.${{ matrix.network }}.yml
@@ -114,13 +114,13 @@
           password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}
 
       - name: Pull acala docker image
-        run: docker pull uniquenetwork/builder-acala:${{ env.ACALA_BUILD_BRANCH }}
+        run: docker pull uniquenetwork/builder-acala:${{ matrix.acala_version }}
 
       - name: Pull moonbeam docker image
-        run: docker pull uniquenetwork/builder-moonbeam:${{ env.MOONBEAM_BUILD_BRANCH }}
+        run: docker pull uniquenetwork/builder-moonbeam:${{ matrix.moonbeam_version }}
 
       - name: Pull cumulus docker image
-        run: docker pull uniquenetwork/builder-cumulus:${{ env.CUMULUS_BUILD_BRANCH }}
+        run: docker pull uniquenetwork/builder-cumulus:${{ matrix.cumulus_version }}
 
       - name: Pull polkadot docker image
         run: docker pull uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }}
modified.github/workflows/xcm-tests_v2.ymldiffbeforeafterboth
before Β· .github/workflows/xcm-tests_v2.yml
1name: xcm-tests23# Controls when the action will run.4on:5  # Allows you to run this workflow manually from the Actions tab6  workflow_call:78#Define Workflow variables9env:10  REPO_URL: ${{ github.server_url }}/${{ github.repository }}111213# A workflow run is made up of one or more jobs that can run sequentially or in parallel14jobs:1516  prepare-execution-marix:1718    name: Prepare execution matrix1920#    needs: [xcm-testnet-build]2122    runs-on: XL23    outputs:24      matrix: ${{ steps.create_matrix.outputs.matrix }}2526    steps:2728      - name: Clean Workspace29        uses: AutoModality/action-clean@v1.1.03031      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it32      - uses: actions/checkout@v333        with:34          ref: ${{ github.head_ref }}  #Checking out head commit3536      - name: Read .env file37        uses: xom9ikk/dotenv@v1.0.23839      - name: Create Execution matrix40        uses: fabiocaccamo/create-matrix-action@v241        id: create_matrix42        with:43          matrix: |44            network {opal}, runtime {opal}, features {opal-runtime}, runtest {testXcmOpal}45            network {quartz}, runtime {quartz}, features {quartz-runtime}, runtest {testXcmQuartz}46            network {unique}, runtime {unique}, features {unique-runtime}, runtest {testXcmUnique}4748  xcm-tests:49    needs: prepare-execution-marix50    # The type of runner that the job will run on51    runs-on: [XL]5253    timeout-minutes: 6005455    name: ${{ matrix.network }}5657    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.5859    strategy:60      matrix:61        include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}626364    steps:65      - name: Skip if pull request is in Draft66        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-xcm-tests.j284          output_file: .docker/docker-compose.xcm-tests.${{ matrix.network }}.yml85          variables: |86            NETWORK=${{ matrix.network }}8788      - name: Show build configuration89        run: cat .docker/docker-compose.xcm-tests.${{ matrix.network }}.yml9091      - uses: actions/setup-node@v392        with:93          node-version: 169495      - name: Build the stack96        run: docker-compose -f ".docker/docker-compose.xcm-tests.${{ matrix.network }}.yml" up -d --remove-orphans --force-recreate --timeout 3009798      #  πŸš€ POLKADOT LAUNCH COMPLETE πŸš€99      - name: Check if docker logs consist messages related to testing of xcm tests 100        if: success()101        run: |102          counter=160103          function check_container_status {104                docker inspect -f {{.State.Running}} xcm-${{ matrix.network }}-testnet-local105          }106          function do_docker_logs {107                docker logs --details xcm-${{ matrix.network }}-testnet-local 2>&1108          }109          function is_started {110                if [ "$(check_container_status)" == "true" ]; then111                        echo "Container: xcm-${{ matrix.network }}-testnet-local RUNNING";112                        echo "Check Docker logs"113                        DOCKER_LOGS=$(do_docker_logs)114                        if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then115                                echo "πŸš€ POLKADOT LAUNCH COMPLETE πŸš€"116                                return 0117                        else118                                echo "Message not found in logs output, repeating..."119                                return 1120                        fi121                else122                        echo "Container xcm-${{ matrix.network }}-testnet-local NOT RUNNING"123                        echo "Halting all future checks"124                        exit 1125                fi126          echo "something goes wrong"127          exit 1128          }129          while ! is_started; do130                echo "Waiting for special message in log files "131                sleep 30s132                counter=$(( $counter - 1 ))133                echo "Counter: $counter"134                if [ "$counter" -gt "0" ]; then135                         continue136                else137                         break138                fi139          done140          echo "Halting script"141          exit 0142        shell: bash143144      - name: Run XCM tests 145        working-directory: tests146        run: |147          yarn install148          yarn add mochawesome149          echo "Ready to start tests"150          NOW=$(date +%s) && yarn ${{ matrix.runtest }} --reporter mochawesome --reporter-options reportFilename=test-${NOW}151152      - name: XCM Test Report153        uses: phoenix-actions/test-reporting@v8154        id: test-report155        if: success() || failure()    # run this step even if previous step failed156        with:157          name: XCM Tests ${{ matrix.network }}            # Name of the check run which will be created158          path: tests/mochawesome-report/test-*.json    # Path to test results159          reporter: mochawesome-json160          fail-on-error: 'false'161162      - name: Stop running containers163        if: always()                   # run this step always164        run: docker-compose -f ".docker/docker-compose.xcm-tests.${{ matrix.network }}.yml" down165166      - name: Clean Workspace167        if: always()168        uses: AutoModality/action-clean@v1.1.0169170      - name: Remove builder cache171        if: always()                   # run this step always172        run: |173          docker system prune -a -f174
after Β· .github/workflows/xcm-tests_v2.yml
1name: xcm-tests23# Controls when the action will run.4on:5  # Allows you to run this workflow manually from the Actions tab6  workflow_call:78#Define Workflow variables9env:10  REPO_URL: ${{ github.server_url }}/${{ github.repository }}111213# A workflow run is made up of one or more jobs that can run sequentially or in parallel14jobs:1516  prepare-execution-marix:1718    name: Prepare execution matrix1920#    needs: [xcm-testnet-build]2122    runs-on: XL23    outputs:24      matrix: ${{ steps.create_matrix.outputs.matrix }}2526    steps:2728      - name: Clean Workspace29        uses: AutoModality/action-clean@v1.1.03031      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it32      - uses: actions/checkout@v333        with:34          ref: ${{ github.head_ref }}  #Checking out head commit3536      - name: Read .env file37        uses: xom9ikk/dotenv@v1.0.23839      - name: Create Execution matrix40        uses: fabiocaccamo/create-matrix-action@v241        id: create_matrix42        with:43          matrix: |44            network {opal}, runtime {opal}, features {opal-runtime}, runtest {testXcmOpal}45            network {quartz}, runtime {quartz}, features {quartz-runtime}, runtest {testXcmQuartz}46            network {unique}, runtime {unique}, features {unique-runtime}, runtest {testXcmUnique}4748  xcm-tests:49    needs: prepare-execution-marix50    # The type of runner that the job will run on51    runs-on: [XL]5253    timeout-minutes: 6005455    name: ${{ matrix.network }}5657    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.5859    strategy:60      matrix:61        include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}626364    steps:65      - name: Skip if pull request is in Draft66        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-xcm-tests.j284          output_file: .docker/docker-compose.xcm-tests.${{ matrix.network }}.yml85          variables: |86            NETWORK=${{ matrix.network }}8788      - name: Show build configuration89        run: cat .docker/docker-compose.xcm-tests.${{ matrix.network }}.yml9091      - uses: actions/setup-node@v392        with:93          node-version: 169495      - name: Build the stack96        run: docker-compose -f ".docker/docker-compose.xcm-tests.${{ matrix.network }}.yml" up -d --remove-orphans --force-recreate --timeout 3009798      #  πŸš€ POLKADOT LAUNCH COMPLETE πŸš€99      - name: Check if docker logs consist messages related to testing of xcm tests 100        if: success()101        run: |102          counter=160103          function check_container_status {104                docker inspect -f {{.State.Running}} xcm-${{ matrix.network }}-testnet-local105          }106          function do_docker_logs {107                docker logs --details xcm-${{ matrix.network }}-testnet-local 2>&1108          }109          function is_started {110                if [ "$(check_container_status)" == "true" ]; then111                        echo "Container: xcm-${{ matrix.network }}-testnet-local RUNNING";112                        echo "Check Docker logs"113                        DOCKER_LOGS=$(do_docker_logs)114                        if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then115                                echo "πŸš€ POLKADOT LAUNCH COMPLETE πŸš€"116                                return 0117                        else118                                echo "Message not found in logs output, repeating..."119                                return 1120                        fi121                else122                        echo "Container xcm-${{ matrix.network }}-testnet-local NOT RUNNING"123                        echo "Halting all future checks"124                        exit 1125                fi126          echo "something goes wrong"127          exit 1128          }129          while ! is_started; do130                echo "Waiting for special message in log files "131                sleep 30s132                counter=$(( $counter - 1 ))133                echo "Counter: $counter"134                if [ "$counter" -gt "0" ]; then135                         continue136                else137                         break138                fi139          done140          echo "Halting script"141          exit 0142        shell: bash143144      - name: Run XCM tests 145        working-directory: tests146        run: |147          yarn install148          yarn add mochawesome149          # node scripts/readyness.js150          echo "Ready to start tests"151          NOW=$(date +%s) && yarn ${{ matrix.runtest }} --reporter mochawesome --reporter-options reportFilename=test-${NOW}152153      - name: XCM Test Report154        uses: phoenix-actions/test-reporting@v8155        id: test-report156        if: success() || failure()    # run this step even if previous step failed157        with:158          name: XCM Tests ${{ matrix.network }}            # Name of the check run which will be created159          path: tests/mochawesome-report/test-*.json    # Path to test results160          reporter: mochawesome-json161          fail-on-error: 'false'162163      - name: Stop running containers164        if: always()                   # run this step always165        run: docker-compose -f ".docker/docker-compose.xcm-tests.${{ matrix.network }}.yml" down166167      - name: Clean Workspace168        if: always()169        uses: AutoModality/action-clean@v1.1.0170171      - name: Remove builder cache172        if: always()                   # run this step always173        run: |174          docker system prune -a -f175
modifiedtests/src/xcm/xcmOpal.test.tsdiffbeforeafterboth
--- a/tests/src/xcm/xcmOpal.test.ts
+++ b/tests/src/xcm/xcmOpal.test.ts
@@ -35,7 +35,7 @@
 
 const RELAY_PORT = '9844';
 const UNIQUE_PORT = '9944';
-const STATEMINE_PORT = '9946';
+const STATEMINE_PORT = '9948';
 const STATEMINE_PALLET_INSTANCE = 50;
 const ASSET_ID = 100;
 const ASSET_METADATA_DECIMALS = 18;
modifiedtests/src/xcm/xcmTransferMoonbeam.test.tsdiffbeforeafterboth
--- a/tests/src/xcm/xcmTransferMoonbeam.test.ts
+++ b/tests/src/xcm/xcmTransferMoonbeam.test.ts
@@ -50,7 +50,7 @@
 });
 
 const UNIQUE_PORT = '9944';
-const MOONBEAM_PORT = '9946';
+const MOONBEAM_PORT = '9947';
 const TRANSFER_AMOUNT = 2000000000000000000000000n;
 
 describe('Integration test: Exchanging UNQ with Moonbeam', () => {
modifiedtests/src/xcm/xcmTransferStatemine.test.tsdiffbeforeafterboth
--- a/tests/src/xcm/xcmTransferStatemine.test.ts
+++ b/tests/src/xcm/xcmTransferStatemine.test.ts
@@ -53,7 +53,7 @@
 
 const RELAY_PORT = '9844';
 const UNIQUE_PORT = '9944';
-const STATEMINE_PORT = '9946';
+const STATEMINE_PORT = '9948';
 const STATEMINE_PALLET_INSTANCE = 50;
 const ASSET_ID = 100;
 const ASSET_METADATA_DECIMALS = 18;