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
--- a/.docker/forking/Dockerfile-parachain-live-fork
+++ b/.docker/forking/Dockerfile-parachain-live-fork
@@ -4,10 +4,7 @@
 
 ARG RUST_TOOLCHAIN=
 
-ARG UNIQUE_BRANCH=develop
-
 ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
-ENV UNIQUE_BRANCH $UNIQUE_BRANCH
 
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
@@ -27,22 +24,7 @@
     rustup target list --installed && \
     rustup show
 RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
-
-# ===== BUILD current version ======
-FROM rust-builder as builder-unique-current
-
-ARG PROFILE=release
-ARG FEATURE=
-ARG MAINNET_BRANCH=
-ARG REPO_URL=
-
-RUN mkdir /unique_parachain
-WORKDIR /unique_parachain
-
-RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
-    cargo build --features=$FEATURE --$PROFILE
 
-
 # ===== BUILD target version ======
 FROM rust-builder as builder-unique-target
 
@@ -100,27 +82,21 @@
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
     npm install --global yarn && \
-    yarn
+    yarn install
 
 RUN echo "$RUNTIME"
 
-COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
 COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
-COPY --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
 
 COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-COPY --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
 
 COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/
 
-ARG FORK_FROM=wss://eu-ws-quartz.unique.network:443
+ARG FORK_FROM=
 ENV FORK_FROM=$FORK_FROM
 CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" FORK_FROM && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
-    yarn start launch-config.json --test-upgrade-parachains
-
-
-
+    yarn start launch-config.json
 
 
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
45 uses: fabiocaccamo/create-matrix-action@v245 uses: fabiocaccamo/create-matrix-action@v2
46 id: create_matrix46 id: create_matrix
47 with:47 with:
48 matrix: |48 matrix: |
49 network {Opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}49 network {Opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443}
50 network {Quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}50 network {Quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443}
51 network {Unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}51 network {Unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, fork_from_address {wss://eu-ws-quartz.unique.network:443}
5252
5353
5454
64 strategy:64 strategy:
65 matrix:65 matrix:
66 include: ${{fromJson(needs.prepare-execution-marix-fork.outputs.matrix)}}66 include: ${{fromJson(needs.prepare-execution-marix-fork.outputs.matrix)}}
67# include:
68# - network: "Opal"
69# features: "opal-runtime"
70# runtime: "opal"
71# mainnet_branch: v924010
72# mainnet_tag: v924010
73# - network: "Quartz" # KUSAMA_MAINNET_BRANCH для quartz-runtime
74# features: "quartz-runtime"
75# runtime: "quartz"
76# mainnet_branch: quartz-v924012-2
77# mainnet_tag: v924012
78# - network: "Unique" # POLKADOT_MAINNET_BRANCH для unique-runtime
79# features: "unique-runtime"
80# runtime: "unique"
81# mainnet_branch: v924010
82# mainnet_tag: v924010
83
84
8567
86 steps:68 steps:
87# - name: Skip if pull request is in Draft69 - name: Skip if pull request is in Draft
88 # `if: github.event.pull_request.draft == true` should be kept here, at70 # `if: github.event.pull_request.draft == true` should be kept here, at
89 # the step level, rather than at the job level. The latter is not71 # the step level, rather than at the job level. The latter is not
90 # recommended because when the PR is moved from "Draft" to "Ready to72 # recommended because when the PR is moved from "Draft" to "Ready to
99 # 4. Move it to "Ready for review"; now the workflow is passing (it was81 # 4. Move it to "Ready for review"; now the workflow is passing (it was
100 # skipped) and "Check reviews" is also passing (it won't be updated82 # skipped) and "Check reviews" is also passing (it won't be updated
101 # until the workflow is finished)83 # until the workflow is finished)
102# if: github.event.pull_request.draft == true84 if: github.event.pull_request.draft == true
103# run: exit 185 run: exit 1
10486
105 - name: Clean Workspace87 - name: Clean Workspace
106 uses: AutoModality/action-clean@v1.1.088 uses: AutoModality/action-clean@v1.1.0
118 with:100 with:
119 template: .docker/forking/docker-compose.tmp-fork.j2101 template: .docker/forking/docker-compose.tmp-fork.j2
120 output_file: .docker/forking/docker-compose.${{ matrix.network }}.yml102 output_file: .docker/forking/docker-compose.${{ matrix.network }}.yml
121 variables: |103 variables: |
122 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git104 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
123 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}105 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
124 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}106 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
125 POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}107 POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
126 MAINNET_TAG=${{ matrix.mainnet_tag }}108 MAINNET_TAG=${{ matrix.mainnet_tag }}
127 MAINNET_BRANCH=${{ matrix.mainnet_branch }}109 MAINNET_BRANCH=${{ matrix.mainnet_branch }}
128 FEATURE=${{ matrix.features }}110 FEATURE=${{ matrix.features }}
129 RUNTIME=${{ matrix.runtime }}111 RUNTIME=${{ matrix.runtime }}
130 BRANCH=${{ github.head_ref }}112 BRANCH=${{ github.head_ref }}
113 FORK_FROM=${{ matrix.fork_from_address }}
131114
132 - name: Show build configuration115 - name: Show build configuration
133 run: cat .docker/forking/docker-compose.${{ matrix.network }}.yml116 run: cat .docker/forking/docker-compose.${{ matrix.network }}.yml