git.delta.rocks / unique-network / refs/commits / 88e36460f932

difftreelog

fix rename variable

Alexander Aksenov2022-08-22parent: #93a0bf6.patch.diff
in: master

9 files changed

modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
before · .docker/Dockerfile-parachain-upgrade-data
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV 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 && \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_TOOLCHAIN2627RUN mkdir /unique_parachain28WORKDIR /unique_parachain2930# ===== BUILD current version ======31FROM rust-builder as builder-unique-current3233ARG PROFILE=release34ARG FEATURE=35ARG MAINNET_BRANCH=36ARG REPO_URL=3738WORKDIR /unique_parachain3940RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \41    cargo build --features=$FEATURE --$PROFILE4243# ===== BUILD target version ======44FROM rust-builder as builder-unique-target4546ARG PROFILE=release47ARG FEATURE=48ARG BRANCH=49ARG REPO_URL=5051COPY . /unique_parachain52WORKDIR /unique_parachain5354RUN cargo build --features=$FEATURE --$PROFILE5556# ===== BUILD POLKADOT =====57FROM rust-builder as builder-polkadot5859ARG POLKADOT_BUILD_BRANCH=60ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6162WORKDIR /unique_parachain6364RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \65    cd polkadot && \66    cargo build --release6768# ===== BUILD CHAINQL =====69FROM rust-builder as builder-chainql7071RUN mkdir chainql72WORKDIR /chainql7374RUN git clone -b v0.1.0 --depth 1 https://github.com/CertainLach/chainql.git . && \75    cargo build --release7677# ===== RUN ======7879FROM ubuntu:20.048081ARG RUNTIME=82ENV RUNTIME $RUNTIME8384RUN apt-get -y update && \85    apt-get -y install curl git && \86    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \87    export NVM_DIR="$HOME/.nvm" && \88    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \89    nvm install v16.16.0 && \90    nvm use v16.16.09192RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b feature/parachain-forking9394RUN export NVM_DIR="$HOME/.nvm" && \95    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \96    cd /polkadot-launch && \97    npm install --global yarn && \98    yarn install99100RUN echo "$RUNTIME"101102COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/103COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/104COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm105106COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/107108COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/109COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm110111ARG FORK_FROM=112ENV FORK_FROM=$FORK_FROM113CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" FORK_FROM && \114    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \115    cd /polkadot-launch && \116    yarn start launch-config.json --test-upgrade-parachains
after · .docker/Dockerfile-parachain-upgrade-data
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV 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 && \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_TOOLCHAIN2627RUN mkdir /unique_parachain28WORKDIR /unique_parachain2930# ===== BUILD current version ======31FROM rust-builder as builder-unique-current3233ARG PROFILE=release34ARG FEATURE=35ARG MAINNET_BRANCH=36ARG REPO_URL=3738WORKDIR /unique_parachain3940RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \41    cargo build --features=$FEATURE --$PROFILE4243# ===== BUILD target version ======44FROM rust-builder as builder-unique-target4546ARG PROFILE=release47ARG FEATURE=48ARG BRANCH=49ARG REPO_URL=5051COPY . /unique_parachain52WORKDIR /unique_parachain5354RUN cargo build --features=$FEATURE --$PROFILE5556# ===== BUILD POLKADOT =====57FROM rust-builder as builder-polkadot5859ARG POLKADOT_BUILD_BRANCH=60ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6162WORKDIR /unique_parachain6364RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \65    cd polkadot && \66    cargo build --release6768# ===== BUILD CHAINQL =====69FROM rust-builder as builder-chainql7071RUN mkdir chainql72WORKDIR /chainql7374RUN git clone -b v0.1.0 --depth 1 https://github.com/CertainLach/chainql.git . && \75    cargo build --release7677# ===== RUN ======7879FROM ubuntu:20.048081ARG RUNTIME=82ENV RUNTIME $RUNTIME8384RUN apt-get -y update && \85    apt-get -y install curl git && \86    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \87    export NVM_DIR="$HOME/.nvm" && \88    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \89    nvm install v16.16.0 && \90    nvm use v16.16.09192RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b feature/parachain-forking9394RUN export NVM_DIR="$HOME/.nvm" && \95    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \96    cd /polkadot-launch && \97    npm install --global yarn && \98    yarn install99100RUN echo "$RUNTIME"101102COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/103COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/104COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm105106COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/107108COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/109COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm110111ARG REPLICA_FROM=112ENV REPLICA_FROM=$REPLICA_FROM113CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \114    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \115    cd /polkadot-launch && \116    yarn start launch-config.json --test-upgrade-parachains
modified.docker/Dockerfile-try-runtimediffbeforeafterboth
--- a/.docker/Dockerfile-try-runtime
+++ b/.docker/Dockerfile-try-runtime
@@ -34,17 +34,17 @@
 
 ARG PROFILE=release
 ARG FEATURE=
-ARG FORK_FROM=
+ARG REPLICA_FROM=
 ENV FEATURE $FEATURE
-ENV FORK_FROM $FORK_FROM
+ENV REPLICA_FROM $REPLICA_FROM
 
 COPY . /unique_parachain
 WORKDIR /unique_parachain
 
 
 RUN echo "Requested features: $FEATURE\n" && \
-    echo "Fork from: $FORK_FROM\n" && \
+    echo "Fork from: $REPLICA_FROM\n" && \
     cargo build --features=$FEATURE --release
     
 
-CMD cargo run --features=$FEATURE --release -- try-runtime on-runtime-upgrade live --uri $FORK_FROM
+CMD cargo run --features=$FEATURE --release -- try-runtime on-runtime-upgrade live --uri $REPLICA_FROM
modified.docker/docker-compose.tmp-forkless-data.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless-data.j2
+++ b/.docker/docker-compose.tmp-forkless-data.j2
@@ -12,7 +12,7 @@
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "MAINNET_TAG={{ MAINNET_TAG }}"
         - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
-        - "FORK_FROM={{ FORK_FROM }}"
+        - "REPLICA_FROM={{ REPLICA_FROM }}"
       context: ../
       dockerfile: .docker/Dockerfile-parachain-upgrade-data
     image: node-parachain
modified.docker/docker-compose.try-runtime.j2diffbeforeafterboth
--- a/.docker/docker-compose.try-runtime.j2
+++ b/.docker/docker-compose.try-runtime.j2
@@ -6,5 +6,5 @@
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "FEATURE={{ FEATURE }}"
-        - "FORK_FROM={{ FORK_FROM }}"
+        - "REPLICA_FROM={{ REPLICA_FROM }}"
 
modified.docker/forkless-config/launch-config-forkless-data.j2diffbeforeafterboth
--- a/.docker/forkless-config/launch-config-forkless-data.j2
+++ b/.docker/forkless-config/launch-config-forkless-data.j2
@@ -93,9 +93,9 @@
             "balance": "1000000000000000000000000",
             "chainRawInitializer": [
                 "chainql",
-                "--ext-str=FORK_FROM",
+                "--ext-str=REPLICA_FROM",
                 "--tla-code=rawSpec=import '${rawSpec}'",
-                "--tla-code=forkFrom=std.extVar('FORK_FROM')",
+                "--tla-code=forkFrom=std.extVar('REPLICA_FROM')",
                 "fork.jsonnet"
             ],
             "nodes": [
modified.envdiffbeforeafterboth
--- a/.env
+++ b/.env
@@ -7,6 +7,6 @@
 KUSAMA_MAINNET_BRANCH=release-v0.9.26
 QUARTZ_MAINNET_TAG=quartz-v924012-2
 
-OPAL_FORK_FROM=wss://eu-ws-opal.unique.network:443
-QUARTZ_FORK_FROM=wss://eu-ws-quartz.unique.network:443
-UNIQUE_FORK_FROM=wss://eu-ws.unique.network:443
+OPAL_REPLICA_FROM=wss://eu-ws-opal.unique.network:443
+QUARTZ_REPLICA_FROM=wss://eu-ws-quartz.unique.network:443
+UNIQUE_REPLICA_FROM=wss://eu-ws.unique.network:443
modified.github/workflows/codestyle.ymldiffbeforeafterboth
--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@ -37,16 +37,20 @@
         if: github.event.pull_request.draft == true
         run: exit 1
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:
             toolchain: nightly
             default: true
             target: wasm32-unknown-unknown
-            components: rustfmt, clippy
+            components: rustfmt, clippy 
       - name: Run cargo fmt
-        run: cargo fmt -- --check
+        run: cargo fmt -- --check   # In that mode it returns only exit code.
+      - name: Cargo fmt state
+        if: success()
+        run: echo "Nothing to do. Cargo fmt returned exit code 0."
+
 
   clippy:
     if: ${{ false }}
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -52,9 +52,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {${{ env.OPAL_FORK_FROM }}}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {${{ env.QUARTZ_FORK_FROM }}}
-            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, fork_from_address {${{ env.UNIQUE_FORK_FROM }}}
+            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}
+            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}
+            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}}
 
 
 
@@ -120,7 +120,7 @@
             FEATURE=${{ matrix.features }}
             RUNTIME=${{ matrix.runtime }}
             BRANCH=${{ github.head_ref }}
-            FORK_FROM=${{ matrix.fork_from_address }}
+            REPLICA_FROM=${{ matrix.replica_from_address }}
 
       - name: Show build configuration
         run: cat .docker/docker-compose.${{ matrix.network }}.yml
modified.github/workflows/try-runtime.ymldiffbeforeafterboth
--- a/.github/workflows/try-runtime.yml
+++ b/.github/workflows/try-runtime.yml
@@ -38,13 +38,13 @@
         include:
           - network: opal
             features: try-runtime,opal-runtime
-            fork_from_address: wss://eu-ws-opal.unique.network:443
+            replica_from_address: wss://eu-ws-opal.unique.network:443
           - network: quartz
             features: try-runtime,quartz-runtime
-            fork_from_address: wss://eu-ws-quartz.unique.network:443
+            replica_from_address: wss://eu-ws-quartz.unique.network:443
           - network: unique
             features: try-runtime,unique-runtime
-            fork_from_address: wss://eu-ws.unique.network:443
+            replica_from_address: wss://eu-ws.unique.network:443
 
     steps:
       - name: Skip if pull request is in Draft
@@ -85,7 +85,7 @@
           variables: |
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             FEATURE=${{ matrix.features }}
-            FORK_FROM=${{ matrix.fork_from_address }}
+            REPLICA_FROM=${{ matrix.replica_from_address }}
 
       - name: Show build configuration
         run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml