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
44
5ARG RUST_TOOLCHAIN=5ARG RUST_TOOLCHAIN=
66
7ARG UNIQUE_BRANCH=develop
8
9ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN7ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
10ENV UNIQUE_BRANCH $UNIQUE_BRANCH
118
12ENV CARGO_HOME="/cargo-home"9ENV CARGO_HOME="/cargo-home"
13ENV PATH="/cargo-home/bin:$PATH"10ENV PATH="/cargo-home/bin:$PATH"
28 rustup show25 rustup show
29RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN26RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
3027
31# ===== BUILD current version ======
32FROM rust-builder as builder-unique-current
33
34ARG PROFILE=release
35ARG FEATURE=
36ARG MAINNET_BRANCH=
37ARG REPO_URL=
38
39RUN mkdir /unique_parachain
40WORKDIR /unique_parachain
41
42RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
43 cargo build --features=$FEATURE --$PROFILE
44
45
46# ===== BUILD target version ======28# ===== BUILD target version ======
47FROM rust-builder as builder-unique-target29FROM rust-builder as builder-unique-target
4830
100 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \82 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
101 cd /polkadot-launch && \83 cd /polkadot-launch && \
102 npm install --global yarn && \84 npm install --global yarn && \
103 yarn85 yarn install
10486
105RUN echo "$RUNTIME"87RUN echo "$RUNTIME"
10688
107COPY --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/89COPY --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.wasm
11090
111COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/91COPY --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.wasm
11392
114COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/93COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/
11594
116ARG FORK_FROM=wss://eu-ws-quartz.unique.network:44395ARG FORK_FROM=
117ENV FORK_FROM=$FORK_FROM96ENV FORK_FROM=$FORK_FROM
118CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" FORK_FROM && \97CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" FORK_FROM && \
119 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \98 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
120 cd /polkadot-launch && \99 cd /polkadot-launch && \
121 yarn start launch-config.json --test-upgrade-parachains100 yarn start launch-config.json
122
123
124
125101
126102
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