git.delta.rocks / unique-network / refs/commits / c3c533b25c1e

difftreelog

Merge branch 'CI-86-87-XCM-docker' into feature/multi-assets-redone

Konstantin Astakhov2022-08-30parents: #53c2ff3 #269ae53.patch.diff
in: master

5 files changed

modified.docker/Dockerfile-xcm.j2diffbeforeafterboth
--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -39,6 +39,7 @@
 
 COPY ./xcm-config/launch-config-xcm-{{ NETWORK }}.json ./launch-config-xcm-{{ NETWORK }}.json
 COPY ./xcm-config/5validators.jsonnet ./5validators.jsonnet
+COPY ./xcm-config/minBondFix.jsonnet ./minBondFix.jsonnet
 
 RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
     cd unique-chain && \
@@ -129,9 +130,11 @@
     npm install --global yarn && \
     yarn install
 
-COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
 COPY --from=builder-unique /unique_parachain/launch-config-xcm-{{ NETWORK }}.json /polkadot-launch/
 COPY --from=builder-unique /unique_parachain/5validators.jsonnet /polkadot-launch/5validators.jsonnet
+COPY --from=builder-unique /unique_parachain/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet
+
+COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
 COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 COPY --from=builder-moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/
 COPY --from=builder-cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus
modified.docker/xcm-config/launch-config-xcm-quartz.jsondiffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-quartz.json
+++ b/.docker/xcm-config/launch-config-xcm-quartz.json
@@ -118,6 +118,11 @@
             "id": 2023,
             "balance": "1000000000000000000000",
             "chain": "moonriver-local",
+            "chainInitializer": [
+                "chainql",
+                "--tla-code=spec=import '${spec}'",
+                "minBondFix.jsonnet"
+            ],		    
             "nodes": [
                 {
                     "wsPort": 9947,
added.docker/xcm-config/minBondFix.jsonnetdiffbeforeafterboth
--- /dev/null
+++ b/.docker/xcm-config/minBondFix.jsonnet
@@ -0,0 +1,10 @@
+function(spec)
+spec {
+	genesis+: {
+		runtime+: {
+			parachainStaking+: {
+				candidates: std.map(function(candidate) [candidate[0], candidate[1] * 1000], super.candidates)
+			},
+		},
+	},
+}
modified.envdiffbeforeafterboth
before · .env
1RUST_TOOLCHAIN=nightly-2022-07-242POLKADOT_BUILD_BRANCH=release-v0.9.2734POLKADOT_MAINNET_BRANCH=release-v0.9.265UNIQUE_MAINNET_TAG=feature/multi-assets-redone67KUSAMA_MAINNET_BRANCH=release-v0.9.268QUARTZ_MAINNET_TAG=feature/multi-assets-redone910OPAL_MAINNET_TAG=feature/multi-assets-redone1112OPAL_REPLICA_FROM=wss://eu-ws-opal.unique.network:44313QUARTZ_REPLICA_FROM=wss://eu-ws-quartz.unique.network:44314UNIQUE_REPLICA_FROM=wss://eu-ws.unique.network:443151617POLKADOT_LAUNCH_BRANCH=feature/rewrite-chain-id-in-spec1819ACALA_BUILD_BRANCH=2.9.020MOONBEAM_BUILD_BRANCH=v0.25.021CUMULUS_BUILD_BRANCH=release-v0.9.2302223
after · .env
1RUST_TOOLCHAIN=nightly-2022-07-242POLKADOT_BUILD_BRANCH=release-v0.9.2734POLKADOT_MAINNET_BRANCH=release-v0.9.265UNIQUE_MAINNET_TAG=v92401067KUSAMA_MAINNET_BRANCH=release-v0.9.268QUARTZ_MAINNET_TAG=quartz-v924012-2910UNQWND_MAINNET_BRANCH=release-v0.9.241112OPAL_REPLICA_FROM=wss://eu-ws-opal.unique.network:44313QUARTZ_REPLICA_FROM=wss://eu-ws-quartz.unique.network:44314UNIQUE_REPLICA_FROM=wss://eu-ws.unique.network:443151617POLKADOT_LAUNCH_BRANCH=feature/rewrite-chain-id-in-spec1819ACALA_BUILD_BRANCH=2.9.020MOONBEAM_BUILD_BRANCH=v0.25.021CUMULUS_BUILD_BRANCH=release-v0.9.2302223
modified.github/workflows/xcm-testnet.ymldiffbeforeafterboth
--- a/.github/workflows/xcm-testnet.yml
+++ b/.github/workflows/xcm-testnet.yml
@@ -114,7 +114,7 @@
             POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
             FEATURE=${{ matrix.features }}
             RUNTIME=${{ matrix.runtime }}
-            BRANCH=${{ mainnet_branch }}
+            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 }}
@@ -126,7 +126,7 @@
         run: cat .docker/xcm-config/launch-config-xcm-${{ matrix.network }}.json
 
       - name: Build the stack
-        run: cd .docker/ && docker build --file ./Dockerfile-xcm.${{ matrix.network }}.yml --tag xcm-nodes-${{ matrix.network }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ mainnet_branch }}-${{ github.sha }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest .
+        run: cd .docker/ && docker build --file ./Dockerfile-xcm.${{ matrix.network }}.yml --tag xcm-nodes-${{ matrix.network }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ github.head_ref }}-${{ github.sha }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest .
 
           #      - name: Collect Docker Logs
           #        if: success() || failure()
@@ -146,7 +146,7 @@
           password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}
 
       - name: Push docker version image 
-        run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ mainnet_branch }}-${{ github.sha }}
+        run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ github.head_ref }}-${{ github.sha }}
 
       - name: Push docker image latest
         run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest