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
before · .docker/Dockerfile-xcm.j2
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45#ARG RUST_TOOLCHAIN=67#ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21    rustup toolchain install {{ RUST_TOOLCHAIN }} && \22    rustup default {{ RUST_TOOLCHAIN }} && \23    rustup target list --installed && \24    rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}2627RUN mkdir /unique_parachain28WORKDIR /unique_parachain293031# ===== BUILD ======32FROM rust-builder as builder-unique3334ARG PROFILE=release35#ARG FEATURE=36#ARG BRANCH=3738WORKDIR /unique_parachain3940COPY ./xcm-config/launch-config-xcm-{{ NETWORK }}.json ./launch-config-xcm-{{ NETWORK }}.json41COPY ./xcm-config/5validators.jsonnet ./5validators.jsonnet4243RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \44    cd unique-chain && \45    cargo build --features={{ FEATURE }} --$PROFILE4647# ===== BUILD POLKADOT =====48FROM rust-builder as builder-polkadot4950#ARG POLKADOT_BUILD_BRANCH=51#ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH525354WORKDIR /unique_parachain5556RUN git clone -b {{ POLKADOT_BUILD_BRANCH }} --depth 1 https://github.com/paritytech/polkadot.git && \57    cd polkadot && \58    cargo build --release5960# ===== BUILD ACALA =====61FROM rust-builder as builder-acala6263#ARG ACALA_BUILD_BRANCH=64#ENV ACALA_BUILD_BRANCH $ACALA_BUILD_BRANCH656667WORKDIR /unique_parachain6869RUN git clone -b {{ ACALA_BUILD_BRANCH }} --depth 1 https://github.com/AcalaNetwork/Acala.git && \70    cd Acala && \71    make init && \72    make build-release7374# ===== BUILD MOONBEAM =====75FROM rust-builder as builder-moonbeam7677#ARG MOONBEAM_BUILD_BRANCH=78#ENV MOONBEAM_BUILD_BRANCH $MOONBEAM_BUILD_BRANCH798081WORKDIR /unique_parachain8283RUN git clone -b {{ MOONBEAM_BUILD_BRANCH }} --depth 1 https://github.com/PureStake/moonbeam.git && \84    cd moonbeam && \85    cargo build --release8687# ===== BUILD CUMULUS =====88FROM rust-builder as builder-cumulus8990#ARG CUMULUS_BUILD_BRANCH=91#ENV CUMULUS_BUILD_BRANCH $CUMULUS_BUILD_BRANCH929394WORKDIR /unique_parachain9596RUN git clone -b {{ CUMULUS_BUILD_BRANCH }} --depth 1 https://github.com/paritytech/cumulus.git && \97    cd cumulus && \98    cargo build --release99100# ===== BUILD CHAINQL =====101FROM rust-builder as builder-chainql102103RUN mkdir chainql104WORKDIR /chainql105106RUN git clone -b v0.1.0 --depth 1 https://github.com/CertainLach/chainql.git . && \107    cargo build --release108109# ===== RUN ======110111FROM ubuntu:20.04112113#ARG POLKADOT_LAUNCH_BRANCH=114#ENV POLKADOT_LAUNCH_BRANCH $POLKADOT_LAUNCH_BRANCH115116RUN apt-get -y update && \117      apt-get -y install curl git && \118      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \119      export NVM_DIR="$HOME/.nvm" && \120      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \121      nvm install v16.16.0 && \122      nvm use v16.16.0123124RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}125126RUN export NVM_DIR="$HOME/.nvm" && \127    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \128    cd /polkadot-launch && \129    npm install --global yarn && \130    yarn install131132COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/133COPY --from=builder-unique /unique_parachain/launch-config-xcm-{{ NETWORK }}.json /polkadot-launch/134COPY --from=builder-unique /unique_parachain/5validators.jsonnet /polkadot-launch/5validators.jsonnet135COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/136COPY --from=builder-moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/137COPY --from=builder-cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus138COPY --from=builder-acala /unique_parachain/Acala/target/production/acala /acala/target/release/139COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/140141EXPOSE 9844142EXPOSE 9944143EXPOSE 9946144EXPOSE 9947145EXPOSE 9948146147CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \148    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \149    cd /polkadot-launch && \150    yarn start launch-config-xcm-{{ NETWORK }}.json
after · .docker/Dockerfile-xcm.j2
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45#ARG RUST_TOOLCHAIN=67#ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21    rustup toolchain install {{ RUST_TOOLCHAIN }} && \22    rustup default {{ RUST_TOOLCHAIN }} && \23    rustup target list --installed && \24    rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}2627RUN mkdir /unique_parachain28WORKDIR /unique_parachain293031# ===== BUILD ======32FROM rust-builder as builder-unique3334ARG PROFILE=release35#ARG FEATURE=36#ARG BRANCH=3738WORKDIR /unique_parachain3940COPY ./xcm-config/launch-config-xcm-{{ NETWORK }}.json ./launch-config-xcm-{{ NETWORK }}.json41COPY ./xcm-config/5validators.jsonnet ./5validators.jsonnet42COPY ./xcm-config/minBondFix.jsonnet ./minBondFix.jsonnet4344RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \45    cd unique-chain && \46    cargo build --features={{ FEATURE }} --$PROFILE4748# ===== BUILD POLKADOT =====49FROM rust-builder as builder-polkadot5051#ARG POLKADOT_BUILD_BRANCH=52#ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH535455WORKDIR /unique_parachain5657RUN git clone -b {{ POLKADOT_BUILD_BRANCH }} --depth 1 https://github.com/paritytech/polkadot.git && \58    cd polkadot && \59    cargo build --release6061# ===== BUILD ACALA =====62FROM rust-builder as builder-acala6364#ARG ACALA_BUILD_BRANCH=65#ENV ACALA_BUILD_BRANCH $ACALA_BUILD_BRANCH666768WORKDIR /unique_parachain6970RUN git clone -b {{ ACALA_BUILD_BRANCH }} --depth 1 https://github.com/AcalaNetwork/Acala.git && \71    cd Acala && \72    make init && \73    make build-release7475# ===== BUILD MOONBEAM =====76FROM rust-builder as builder-moonbeam7778#ARG MOONBEAM_BUILD_BRANCH=79#ENV MOONBEAM_BUILD_BRANCH $MOONBEAM_BUILD_BRANCH808182WORKDIR /unique_parachain8384RUN git clone -b {{ MOONBEAM_BUILD_BRANCH }} --depth 1 https://github.com/PureStake/moonbeam.git && \85    cd moonbeam && \86    cargo build --release8788# ===== BUILD CUMULUS =====89FROM rust-builder as builder-cumulus9091#ARG CUMULUS_BUILD_BRANCH=92#ENV CUMULUS_BUILD_BRANCH $CUMULUS_BUILD_BRANCH939495WORKDIR /unique_parachain9697RUN git clone -b {{ CUMULUS_BUILD_BRANCH }} --depth 1 https://github.com/paritytech/cumulus.git && \98    cd cumulus && \99    cargo build --release100101# ===== BUILD CHAINQL =====102FROM rust-builder as builder-chainql103104RUN mkdir chainql105WORKDIR /chainql106107RUN git clone -b v0.1.0 --depth 1 https://github.com/CertainLach/chainql.git . && \108    cargo build --release109110# ===== RUN ======111112FROM ubuntu:20.04113114#ARG POLKADOT_LAUNCH_BRANCH=115#ENV POLKADOT_LAUNCH_BRANCH $POLKADOT_LAUNCH_BRANCH116117RUN apt-get -y update && \118      apt-get -y install curl git && \119      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \120      export NVM_DIR="$HOME/.nvm" && \121      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \122      nvm install v16.16.0 && \123      nvm use v16.16.0124125RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}126127RUN export NVM_DIR="$HOME/.nvm" && \128    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \129    cd /polkadot-launch && \130    npm install --global yarn && \131    yarn install132133COPY --from=builder-unique /unique_parachain/launch-config-xcm-{{ NETWORK }}.json /polkadot-launch/134COPY --from=builder-unique /unique_parachain/5validators.jsonnet /polkadot-launch/5validators.jsonnet135COPY --from=builder-unique /unique_parachain/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet136137COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/138COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/139COPY --from=builder-moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/140COPY --from=builder-cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus141COPY --from=builder-acala /unique_parachain/Acala/target/production/acala /acala/target/release/142COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/143144EXPOSE 9844145EXPOSE 9944146EXPOSE 9946147EXPOSE 9947148EXPOSE 9948149150CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \151    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \152    cd /polkadot-launch && \153    yarn start launch-config-xcm-{{ NETWORK }}.json
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
--- 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