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
--- 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
5353
54const RELAY_PORT = '9844';54const RELAY_PORT = '9844';
55const UNIQUE_PORT = '9944';55const UNIQUE_PORT = '9944';
56const STATEMINE_PORT = '9946';56const STATEMINE_PORT = '9948';
57const STATEMINE_PALLET_INSTANCE = 50;57const STATEMINE_PALLET_INSTANCE = 50;
58const ASSET_ID = 100;58const ASSET_ID = 100;
59const ASSET_METADATA_DECIMALS = 18;59const ASSET_METADATA_DECIMALS = 18;