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
1818
19 name: Prepare execution matrix19 name: Prepare execution matrix
2020
21 runs-on: XL21 runs-on: [XL]
22 outputs:22 outputs:
23 matrix: ${{ steps.create_matrix.outputs.matrix }}23 matrix: ${{ steps.create_matrix.outputs.matrix }}
2424
39 uses: fabiocaccamo/create-matrix-action@v239 uses: fabiocaccamo/create-matrix-action@v2
40 id: create_matrix40 id: create_matrix
41 with:41 with:
42 matrix: |42 matrix: |
43 network {opal}, runtime {opal}, features {opal-runtime}43 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 }}}
44 network {quartz}, runtime {quartz}, features {quartz-runtime}44 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 }}}
45 network {unique}, runtime {unique}, features {unique-runtime}45 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 }}}
4646
47 xcm-build:47 xcm-build:
48 48
81 with:81 with:
82 template: .docker/Dockerfile-xcm.j282 template: .docker/Dockerfile-xcm.j2
83 output_file: .docker/Dockerfile-xcm.${{ matrix.network }}.yml83 output_file: .docker/Dockerfile-xcm.${{ matrix.network }}.yml
84 variables: |84 variables: |
85 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}85 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
86 NETWORK=${{ matrix.network }}86 NETWORK=${{ matrix.network }}
87 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}87 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
88 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}88 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
89 FEATURE=${{ matrix.features }}89 FEATURE=${{ matrix.features }}
90 RUNTIME=${{ matrix.runtime }}90 RUNTIME=${{ matrix.runtime }}
91 BRANCH=${{ github.head_ref }}91 BRANCH=${{ github.head_ref }}
92 ACALA_BUILD_BRANCH=${{ env.ACALA_BUILD_BRANCH }}92 ACALA_BUILD_BRANCH=${{ matrix.acala_version }}
93 MOONBEAM_BUILD_BRANCH=${{ env.MOONBEAM_BUILD_BRANCH }}93 MOONBEAM_BUILD_BRANCH=${{ matrix.moonbeam_version }}
94 CUMULUS_BUILD_BRANCH=${{ env.CUMULUS_BUILD_BRANCH }}94 CUMULUS_BUILD_BRANCH=${{ matrix.cumulus_version }}
9595
96 - name: Show build Dockerfile96 - name: Show build Dockerfile
97 run: cat .docker/Dockerfile-xcm.${{ matrix.network }}.yml97 run: cat .docker/Dockerfile-xcm.${{ matrix.network }}.yml
114 password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}114 password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}
115115
116 - name: Pull acala docker image116 - name: Pull acala docker image
117 run: docker pull uniquenetwork/builder-acala:${{ env.ACALA_BUILD_BRANCH }}117 run: docker pull uniquenetwork/builder-acala:${{ matrix.acala_version }}
118118
119 - name: Pull moonbeam docker image119 - name: Pull moonbeam docker image
120 run: docker pull uniquenetwork/builder-moonbeam:${{ env.MOONBEAM_BUILD_BRANCH }}120 run: docker pull uniquenetwork/builder-moonbeam:${{ matrix.moonbeam_version }}
121121
122 - name: Pull cumulus docker image122 - name: Pull cumulus docker image
123 run: docker pull uniquenetwork/builder-cumulus:${{ env.CUMULUS_BUILD_BRANCH }}123 run: docker pull uniquenetwork/builder-cumulus:${{ matrix.cumulus_version }}
124124
125 - name: Pull polkadot docker image125 - name: Pull polkadot docker image
126 run: docker pull uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }}126 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
--- 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;