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
before · .github/workflows/xcm-testnet-build.yml
1name: xcm-testnet-build23# Controls when the action will run.4on:5  workflow_call:6  7  # Allows you to run this workflow manually from the Actions tab8  workflow_dispatch:910#Define Workflow variables11env:12  REPO_URL: ${{ github.server_url }}/${{ github.repository }}1314# A workflow run is made up of one or more jobs that can run sequentially or in parallel15jobs:1617  prepare-execution-marix:1819    name: Prepare execution matrix2021    runs-on: XL22    outputs:23      matrix: ${{ steps.create_matrix.outputs.matrix }}2425    steps:2627      - name: Clean Workspace28        uses: AutoModality/action-clean@v1.1.02930      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it31      - uses: actions/checkout@v332        with:33          ref: ${{ github.head_ref }}  #Checking out head commit3435      - name: Read .env file36        uses: xom9ikk/dotenv@v1.0.23738      - name: Create Execution matrix39        uses: fabiocaccamo/create-matrix-action@v240        id: create_matrix41        with:42          matrix: |43            network {opal}, runtime {opal}, features {opal-runtime}44            network {quartz}, runtime {quartz}, features {quartz-runtime}45            network {unique}, runtime {unique}, features {unique-runtime}4647  xcm-build:48    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)}}6263    steps:64      - name: Skip if pull request is in Draft65        if: github.event.pull_request.draft == true66        run: exit 16768      - name: Clean Workspace69        uses: AutoModality/action-clean@v1.1.07071      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it72      - uses: actions/checkout@v373        with:74          ref: ${{ github.head_ref }}  #Checking out head commit7576      - name: Read .env file77        uses: xom9ikk/dotenv@v1.0.27879      - name: Generate ENV related extend Dockerfile file80        uses: cuchi/jinja2-action@v1.2.081        with:82          template: .docker/Dockerfile-xcm.j283          output_file: .docker/Dockerfile-xcm.${{ matrix.network }}.yml84          variables: |85            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}86            NETWORK=${{ matrix.network }}87            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}88            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}89            FEATURE=${{ matrix.features }}90            RUNTIME=${{ matrix.runtime }}91            BRANCH=${{ github.head_ref }}92            ACALA_BUILD_BRANCH=${{ env.ACALA_BUILD_BRANCH }}93            MOONBEAM_BUILD_BRANCH=${{ env.MOONBEAM_BUILD_BRANCH }}94            CUMULUS_BUILD_BRANCH=${{ env.CUMULUS_BUILD_BRANCH }}9596      - name: Show build Dockerfile97        run: cat .docker/Dockerfile-xcm.${{ matrix.network }}.yml9899      - name: Show launch-config-xcm-${{ matrix.network }} configuration100        run: cat .docker/xcm-config/launch-config-xcm-${{ matrix.network }}.json101102      - name: Run find-and-replace to remove slashes from branch name103        uses: mad9000/actions-find-and-replace-string@2104        id: branchname105        with:106          source: ${{ github.head_ref }}107          find: '/'108          replace: '-'109110      - name: Log in to Docker Hub111        uses: docker/login-action@v2.0.0112        with:113          username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}114          password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}115116      - name: Pull acala docker image117        run: docker pull uniquenetwork/builder-acala:${{ env.ACALA_BUILD_BRANCH }}118119      - name: Pull moonbeam docker image120        run: docker pull uniquenetwork/builder-moonbeam:${{ env.MOONBEAM_BUILD_BRANCH }}121122      - name: Pull cumulus docker image123        run: docker pull uniquenetwork/builder-cumulus:${{ env.CUMULUS_BUILD_BRANCH }}124125      - name: Pull polkadot docker image126        run: docker pull uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }}127128      - name: Pull chainql docker image129        run: docker pull uniquenetwork/builder-chainql:latest130131      - name: Build the stack132        run: cd .docker/ && docker build --no-cache --file ./Dockerfile-xcm.${{ matrix.network }}.yml --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ steps.branchname.outputs.value }}-${{ github.sha }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest .133134      - name: Push docker image version135        run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ steps.branchname.outputs.value }}-${{ github.sha }}136137      - name: Push docker image latest138        run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest139140      - name: Clean Workspace141        if: always()142        uses: AutoModality/action-clean@v1.1.0143144      - name: Remove builder cache145        if: always()                   # run this step always146        run: |147          docker builder prune -f148          docker system prune -f149150151
modified.github/workflows/xcm-tests_v2.ymldiffbeforeafterboth
--- a/.github/workflows/xcm-tests_v2.yml
+++ b/.github/workflows/xcm-tests_v2.yml
@@ -146,6 +146,7 @@
         run: |
           yarn install
           yarn add mochawesome
+          # node scripts/readyness.js
           echo "Ready to start tests"
           NOW=$(date +%s) && yarn ${{ matrix.runtest }} --reporter mochawesome --reporter-options reportFilename=test-${NOW}
 
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;