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
--- a/.env
+++ b/.env
@@ -2,12 +2,12 @@
 POLKADOT_BUILD_BRANCH=release-v0.9.27
 
 POLKADOT_MAINNET_BRANCH=release-v0.9.26
-UNIQUE_MAINNET_TAG=feature/multi-assets-redone
+UNIQUE_MAINNET_TAG=v924010
 
 KUSAMA_MAINNET_BRANCH=release-v0.9.26
-QUARTZ_MAINNET_TAG=feature/multi-assets-redone
+QUARTZ_MAINNET_TAG=quartz-v924012-2
 
-OPAL_MAINNET_TAG=feature/multi-assets-redone
+UNQWND_MAINNET_BRANCH=release-v0.9.24
 
 OPAL_REPLICA_FROM=wss://eu-ws-opal.unique.network:443
 QUARTZ_REPLICA_FROM=wss://eu-ws-quartz.unique.network:443
modified.github/workflows/xcm-testnet.ymldiffbeforeafterboth
107        with:107        with:
108          template: .docker/Dockerfile-xcm.j2108          template: .docker/Dockerfile-xcm.j2
109          output_file: .docker/Dockerfile-xcm.${{ matrix.network }}.yml109          output_file: .docker/Dockerfile-xcm.${{ matrix.network }}.yml
110          variables: |110          variables: |
111            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}111            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
112            NETWORK=${{ matrix.network }}112            NETWORK=${{ matrix.network }}
113            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}113            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
114            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}114            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
115            FEATURE=${{ matrix.features }}115            FEATURE=${{ matrix.features }}
116            RUNTIME=${{ matrix.runtime }}116            RUNTIME=${{ matrix.runtime }}
117            BRANCH=${{ mainnet_branch }}117            BRANCH=${{ github.head_ref }}
118            ACALA_BUILD_BRANCH=${{ env.ACALA_BUILD_BRANCH }}118            ACALA_BUILD_BRANCH=${{ env.ACALA_BUILD_BRANCH }}
119            MOONBEAM_BUILD_BRANCH=${{ env.MOONBEAM_BUILD_BRANCH }}119            MOONBEAM_BUILD_BRANCH=${{ env.MOONBEAM_BUILD_BRANCH }}
120            CUMULUS_BUILD_BRANCH=${{ env.CUMULUS_BUILD_BRANCH }}120            CUMULUS_BUILD_BRANCH=${{ env.CUMULUS_BUILD_BRANCH }}
121121
122      - name: Show build Dockerfile122      - name: Show build Dockerfile
123        run: cat .docker/Dockerfile-xcm.${{ matrix.network }}.yml123        run: cat .docker/Dockerfile-xcm.${{ matrix.network }}.yml
126        run: cat .docker/xcm-config/launch-config-xcm-${{ matrix.network }}.json126        run: cat .docker/xcm-config/launch-config-xcm-${{ matrix.network }}.json
127127
128      - name: Build the stack128      - name: Build the stack
129        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 .129        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 .
130130
131          #      - name: Collect Docker Logs131          #      - name: Collect Docker Logs
132          #        if: success() || failure()132          #        if: success() || failure()
146          password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}146          password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}
147147
148      - name: Push docker version image 148      - name: Push docker version image 
149        run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ mainnet_branch }}-${{ github.sha }}149        run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ github.head_ref }}-${{ github.sha }}
150150
151      - name: Push docker image latest151      - name: Push docker image latest
152        run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest152        run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest