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

difftreelog

changes for fork

Konstantin Astakhov2022-08-15parent: #c6aaa88.patch.diff
in: master

4 files changed

modified.docker/forking/Dockerfile-parachain-live-forkdiffbeforeafterboth
before · .docker/forking/Dockerfile-parachain-live-fork
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ARG UNIQUE_BRANCH=develop89ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN10ENV UNIQUE_BRANCH $UNIQUE_BRANCH1112ENV CARGO_HOME="/cargo-home"13ENV PATH="/cargo-home/bin:$PATH"14ENV TZ=UTC15RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1617RUN apt-get update && \18    apt-get install -y curl cmake pkg-config libssl-dev git clang && \19    apt-get clean && \20    rm -r /var/lib/apt/lists/*2122RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2324RUN rustup toolchain uninstall $(rustup toolchain list) && \25    rustup toolchain install $RUST_TOOLCHAIN && \26    rustup default $RUST_TOOLCHAIN && \27    rustup target list --installed && \28    rustup show29RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN3031# ===== BUILD current version ======32FROM rust-builder as builder-unique-current3334ARG PROFILE=release35ARG FEATURE=36ARG MAINNET_BRANCH=37ARG REPO_URL=3839RUN mkdir /unique_parachain40WORKDIR /unique_parachain4142RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \43    cargo build --features=$FEATURE --$PROFILE444546# ===== BUILD target version ======47FROM rust-builder as builder-unique-target4849ARG PROFILE=release50ARG FEATURE=51ARG BRANCH=52ARG REPO_URL=5354RUN mkdir /unique_parachain55WORKDIR /unique_parachain5657RUN git clone $REPO_URL -b $BRANCH . && \58    cargo build --features=$FEATURE --$PROFILE5960# ===== BUILD POLKADOT =====61FROM rust-builder as builder-polkadot6263ARG POLKADOT_BUILD_BRANCH=64ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6566RUN mkdir /unique_parachain67WORKDIR /unique_parachain6869RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \70    cd polkadot && \71    cargo build --release7273# ===== BUILD CHAINQL =====74FROM rust-builder as builder-chainql7576RUN mkdir chainql77WORKDIR /chainql7879RUN git clone --depth 1 https://github.com/CertainLach/chainql.git . && \80    cargo build --release8182# ===== RUN ======8384FROM ubuntu:20.048586ARG RUNTIME=87ENV RUNTIME $RUNTIME8889RUN apt-get -y update && \90      apt-get -y install curl git && \91      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \92      export NVM_DIR="$HOME/.nvm" && \93      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \94      nvm install v16.16.0 && \95      nvm use v16.16.09697RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/parachain-forking9899RUN export NVM_DIR="$HOME/.nvm" && \100    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \101    cd /polkadot-launch && \102    npm install --global yarn && \103    yarn104105RUN echo "$RUNTIME"106107COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/108COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/109COPY --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.wasm110111COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/112COPY --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.wasm113114COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/115116ARG FORK_FROM=wss://eu-ws-quartz.unique.network:443117ENV FORK_FROM=$FORK_FROM118CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" FORK_FROM && \119    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \120    cd /polkadot-launch && \121    yarn start launch-config.json --test-upgrade-parachains122123124125126
after · .docker/forking/Dockerfile-parachain-live-fork
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN89ENV CARGO_HOME="/cargo-home"10ENV PATH="/cargo-home/bin:$PATH"11ENV TZ=UTC12RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1314RUN apt-get update && \15    apt-get install -y curl cmake pkg-config libssl-dev git clang && \16    apt-get clean && \17    rm -r /var/lib/apt/lists/*1819RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2021RUN rustup toolchain uninstall $(rustup toolchain list) && \22    rustup toolchain install $RUST_TOOLCHAIN && \23    rustup default $RUST_TOOLCHAIN && \24    rustup target list --installed && \25    rustup show26RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2728# ===== BUILD target version ======29FROM rust-builder as builder-unique-target3031ARG PROFILE=release32ARG FEATURE=33ARG BRANCH=34ARG REPO_URL=3536RUN mkdir /unique_parachain37WORKDIR /unique_parachain3839RUN git clone $REPO_URL -b $BRANCH . && \40    cargo build --features=$FEATURE --$PROFILE4142# ===== BUILD POLKADOT =====43FROM rust-builder as builder-polkadot4445ARG POLKADOT_BUILD_BRANCH=46ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH4748RUN mkdir /unique_parachain49WORKDIR /unique_parachain5051RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \52    cd polkadot && \53    cargo build --release5455# ===== BUILD CHAINQL =====56FROM rust-builder as builder-chainql5758RUN mkdir chainql59WORKDIR /chainql6061RUN git clone --depth 1 https://github.com/CertainLach/chainql.git . && \62    cargo build --release6364# ===== RUN ======6566FROM ubuntu:20.046768ARG RUNTIME=69ENV RUNTIME $RUNTIME7071RUN apt-get -y update && \72      apt-get -y install curl git && \73      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \74      export NVM_DIR="$HOME/.nvm" && \75      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \76      nvm install v16.16.0 && \77      nvm use v16.16.07879RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/parachain-forking8081RUN export NVM_DIR="$HOME/.nvm" && \82    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \83    cd /polkadot-launch && \84    npm install --global yarn && \85    yarn install8687RUN echo "$RUNTIME"8889COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/9091COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/9293COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/9495ARG FORK_FROM=96ENV FORK_FROM=$FORK_FROM97CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" FORK_FROM && \98    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \99    cd /polkadot-launch && \100    yarn start launch-config.json101102
modified.docker/forking/docker-compose.tmp-fork.j2diffbeforeafterboth
--- a/.docker/forking/docker-compose.tmp-fork.j2
+++ b/.docker/forking/docker-compose.tmp-fork.j2
@@ -12,3 +12,4 @@
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "MAINNET_TAG={{ MAINNET_TAG }}"
         - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
+        - "FORK_FROM={{ FORK_FROM }}"
modified.docker/forking/launch-config-fork.j2diffbeforeafterboth
--- a/.docker/forking/launch-config-fork.j2
+++ b/.docker/forking/launch-config-fork.j2
@@ -1,8 +1,6 @@
 {
       "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
-        "upgradeBin": "/polkadot/target/release/polkadot",
-        "upgradeWasm": "/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm",
         "chain": "westend-local",
         "nodes": [
             {
@@ -87,8 +85,6 @@
       "parachains": [
         {
             "bin": "/unique-chain/current/release/unique-collator",
-            "upgradeBin": "/unique-chain/target/release/unique-collator",
-            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm",
             "id": "1000",
             "balance": "1000000000000000000000000",
             "chainRawInitializer": [
modified.github/workflows/fork-update-withdata.ymldiffbeforeafterboth
--- a/.github/workflows/fork-update-withdata.yml
+++ b/.github/workflows/fork-update-withdata.yml
@@ -46,9 +46,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {Opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
-            network {Quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
-            network {Unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
+            network {Opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443}
+            network {Quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443}
+            network {Unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443}
 
 
 
@@ -64,27 +64,9 @@
     strategy:
       matrix:
         include: ${{fromJson(needs.prepare-execution-marix-fork.outputs.matrix)}}
-#        include:
-#          - network: "Opal"
-#            features: "opal-runtime"
-#            runtime: "opal"
-#            mainnet_branch: v924010
-#            mainnet_tag: v924010
-#          - network: "Quartz"   # KUSAMA_MAINNET_BRANCH для quartz-runtime
-#            features: "quartz-runtime"
-#            runtime: "quartz"
-#            mainnet_branch: quartz-v924012-2
-#            mainnet_tag: v924012
-#          - network: "Unique"   # POLKADOT_MAINNET_BRANCH для unique-runtime
-#            features: "unique-runtime"
-#            runtime: "unique"
-#            mainnet_branch: v924010
-#            mainnet_tag: v924010
-
-
 
     steps:
-#      - name: Skip if pull request is in Draft
+      - name: Skip if pull request is in Draft
         # `if: github.event.pull_request.draft == true` should be kept here, at
         # the step level, rather than at the job level. The latter is not
         # recommended because when the PR is moved from "Draft" to "Ready to
@@ -99,8 +81,8 @@
         # 4. Move it to "Ready for review"; now the workflow is passing (it was
         #    skipped) and "Check reviews" is also passing (it won't be updated
         #    until the workflow is finished)
-#        if: github.event.pull_request.draft == true
-#        run: exit 1
+        if: github.event.pull_request.draft == true
+        run: exit 1
 
       - name: Clean Workspace
         uses: AutoModality/action-clean@v1.1.0
@@ -128,6 +110,7 @@
             FEATURE=${{ matrix.features }}
             RUNTIME=${{ matrix.runtime }}
             BRANCH=${{ github.head_ref }}
+            FORK_FROM=${{ matrix.fork_from_address }}
 
       - name: Show build configuration
         run: cat .docker/forking/docker-compose.${{ matrix.network }}.yml