git.delta.rocks / unique-network / refs/commits / 42b88ddc5c27

difftreelog

ci add required specNamePrefix for moonbeam

Yaroslav Bolyukin2023-02-21parent: #69b4e9b.patch.diff
in: master

8 files changed

modified.docker/Dockerfile-xcm.j2diffbeforeafterboth
--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -23,7 +23,6 @@
 
 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 && \
@@ -51,7 +50,6 @@
 
 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/
modified.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.tempdiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.temp
+++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.temp
@@ -63,7 +63,6 @@
 
 COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json /polkadot-launch/launch-config.json
 COPY --from=builder-unique /unique_parachain/.docker/xcm-config/5validators.jsonnet /polkadot-launch/5validators.jsonnet
-COPY --from=builder-unique /unique_parachain/.docker/xcm-config/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet
 
 COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
 COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
modified.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.tempdiffbeforeafterboth
before · .docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.temp
1FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot2FROM uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} as moonbeam3FROM uniquenetwork/builder-cumulus:{{ STATEMINT_BUILD_BRANCH }} as cumulus4FROM uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} as acala56# ===== Rust builder =====7FROM ubuntu:20.04 as rust-builder8LABEL maintainer="Unique.Network"910ENV CARGO_HOME="/cargo-home"11ENV PATH="/cargo-home/bin:$PATH"12ENV TZ=UTC13RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1415RUN apt-get update && \16    apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \17    apt-get clean && \18    rm -r /var/lib/apt/lists/*1920RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2122RUN rustup toolchain uninstall $(rustup toolchain list) && \23    rustup toolchain install {{ RUST_TOOLCHAIN }} && \24    rustup default {{ RUST_TOOLCHAIN }} && \25    rustup target list --installed && \26    rustup show27RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}2829RUN mkdir /unique_parachain30WORKDIR /unique_parachain3132# ===== BUILD ======33FROM rust-builder as builder-unique3435ARG BRANCH36ARG PROFILE=release3738WORKDIR /unique_parachain39#COPY . .4041RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git . && \42#    cd unique-chain && \43  cargo build --features=unique-runtime --$PROFILE4445# ===== RUN ======46FROM ubuntu:20.044748RUN apt-get -y update && \49      apt-get -y install curl git && \50      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \51      export NVM_DIR="$HOME/.nvm" && \52      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \53      nvm install v16.16.0 && \54      nvm use v16.16.05556RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}5758RUN export NVM_DIR="$HOME/.nvm" && \59    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \60    cd /polkadot-launch && \61    npm install --global yarn && \62    yarn install6364COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json /polkadot-launch/launch-config.json65COPY --from=builder-unique /unique_parachain/.docker/xcm-config/5validators.jsonnet /polkadot-launch/5validators.jsonnet66COPY --from=builder-unique /unique_parachain/.docker/xcm-config/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet6768COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/69COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/70COPY --from=moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/71COPY --from=cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus72COPY --from=acala /unique_parachain/Acala/target/production/acala /acala/target/release/73COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/7475EXPOSE 984476EXPOSE 994477EXPOSE 994678EXPOSE 994779EXPOSE 99488081CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \82    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \83    cd /polkadot-launch && \84    yarn start launch-config.json
after · .docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.temp
1FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot2FROM uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} as moonbeam3FROM uniquenetwork/builder-cumulus:{{ STATEMINT_BUILD_BRANCH }} as cumulus4FROM uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} as acala56# ===== Rust builder =====7FROM ubuntu:20.04 as rust-builder8LABEL maintainer="Unique.Network"910ENV CARGO_HOME="/cargo-home"11ENV PATH="/cargo-home/bin:$PATH"12ENV TZ=UTC13RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1415RUN apt-get update && \16    apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \17    apt-get clean && \18    rm -r /var/lib/apt/lists/*1920RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2122RUN rustup toolchain uninstall $(rustup toolchain list) && \23    rustup toolchain install {{ RUST_TOOLCHAIN }} && \24    rustup default {{ RUST_TOOLCHAIN }} && \25    rustup target list --installed && \26    rustup show27RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}2829RUN mkdir /unique_parachain30WORKDIR /unique_parachain3132# ===== BUILD ======33FROM rust-builder as builder-unique3435ARG BRANCH36ARG PROFILE=release3738WORKDIR /unique_parachain39#COPY . .4041RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git . && \42#    cd unique-chain && \43  cargo build --features=unique-runtime --$PROFILE4445# ===== RUN ======46FROM ubuntu:20.044748RUN apt-get -y update && \49      apt-get -y install curl git && \50      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \51      export NVM_DIR="$HOME/.nvm" && \52      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \53      nvm install v16.16.0 && \54      nvm use v16.16.05556RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}5758RUN export NVM_DIR="$HOME/.nvm" && \59    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \60    cd /polkadot-launch && \61    npm install --global yarn && \62    yarn install6364COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json /polkadot-launch/launch-config.json65COPY --from=builder-unique /unique_parachain/.docker/xcm-config/5validators.jsonnet /polkadot-launch/5validators.jsonnet6667COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/68COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/69COPY --from=moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/70COPY --from=cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus71COPY --from=acala /unique_parachain/Acala/target/production/acala /acala/target/release/72COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/7374EXPOSE 984475EXPOSE 994476EXPOSE 994677EXPOSE 994778EXPOSE 99487980CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \81    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \82    cd /polkadot-launch && \83    yarn start launch-config.json
modified.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.jsondiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json
+++ b/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json
@@ -124,11 +124,7 @@
             "id": 2023,
             "balance": "1000000000000000000000",
             "chain": "moonriver-local",
-            "chainInitializer": [
-                "chainql",
-                "--tla-code=spec=import '${spec}'",
-                "minBondFix.jsonnet"
-            ],		    
+            "specNamePrefix": "moonriver-local-",
             "nodes": [
                 {
                     "wsPort": 9947,
modified.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.jsondiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json
+++ b/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json
@@ -124,6 +124,7 @@
             "id": "2004",
             "balance": "1000000000000000000000",
             "chain": "moonbeam-local",
+            "specNamePrefix": "moonbeam-local-",
             "nodes": [
                 {
                     "wsPort": 9947,
modified.docker/xcm-config/launch-config-xcm-quartz.j2diffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-quartz.j2
+++ b/.docker/xcm-config/launch-config-xcm-quartz.j2
@@ -124,11 +124,7 @@
             "id": 2023,
             "balance": "1000000000000000000000",
             "chain": "moonriver-local",
-            "chainInitializer": [
-                "chainql",
-                "--tla-code=spec=import '${spec}'",
-                "minBondFix.jsonnet"
-            ],		    
+            "specNamePrefix": "moonriver-local-",
             "nodes": [
                 {
                     "wsPort": 9947,
modified.docker/xcm-config/launch-config-xcm-unique.j2diffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-unique.j2
+++ b/.docker/xcm-config/launch-config-xcm-unique.j2
@@ -124,6 +124,7 @@
             "id": "2004",
             "balance": "1000000000000000000000",
             "chain": "moonbeam-local",
+            "specNamePrefix": "moonbeam-local-",
             "nodes": [
                 {
                     "wsPort": 9947,
deleted.docker/xcm-config/minBondFix.jsonnetdiffbeforeafterboth
--- a/.docker/xcm-config/minBondFix.jsonnet
+++ /dev/null
@@ -1,10 +0,0 @@
-function(spec)
-spec {
-	genesis+: {
-		runtime+: {
-			parachainStaking+: {
-				candidates: std.map(function(candidate) [candidate[0], candidate[1] * 1000], super.candidates)
-			},
-		},
-	},
-}