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
before · .docker/forking/launch-config-fork.j2
1{2      "relaychain": {3        "bin": "/polkadot/target/release/polkadot",4        "upgradeBin": "/polkadot/target/release/polkadot",5        "upgradeWasm": "/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm",6        "chain": "westend-local",7        "nodes": [8            {9                "name": "alice",10                "wsPort": 9844,11                "rpcPort": 9843,12                "port": 30444,13                "flags": [14                    "-lparachain::candidate_validation=debug",15                    "-lxcm=trace",16                    "--rpc-cors=all",17                    "--unsafe-rpc-external",18                    "--unsafe-ws-external"19                ]20            },21            {22                "name": "bob",23                "wsPort": 9855,24                "rpcPort": 9854,25                "port": 30555,26                "flags": [27                    "-lparachain::candidate_validation=debug",28                    "-lxcm=trace",29                    "--rpc-cors=all",30                    "--unsafe-rpc-external",31                    "--unsafe-ws-external"32                ]33            },34            {35                "name": "charlie",36                "wsPort": 9866,37                "rpcPort": 9865,38                "port": 30666,39                "flags": [40                    "-lparachain::candidate_validation=debug",41                    "-lxcm=trace",42                    "--rpc-cors=all",43                    "--unsafe-rpc-external",44                    "--unsafe-ws-external"45                ]46            },47            {48                "name": "dave",49                "wsPort": 9877,50                "rpcPort": 9876,51                "port": 30777,52                "flags": [53                    "-lparachain::candidate_validation=debug",54                    "-lxcm=trace",55                    "--rpc-cors=all",56                    "--unsafe-rpc-external",57                    "--unsafe-ws-external"58                ]59            },60            {61                "name": "eve",62                "wsPort": 9888,63                "rpcPort": 9887,64                "port": 30888,65                "flags": [66                    "-lparachain::candidate_validation=debug",67                    "-lxcm=trace",68                    "--rpc-cors=all",69                    "--unsafe-rpc-external",70                    "--unsafe-ws-external"71                ]72            }73        ],74        "genesis": {75            "runtime": {76                "runtime_genesis_config": {77                    "parachainsConfiguration": {78                        "config": {79                            "validation_upgrade_frequency": 1,80                            "validation_upgrade_delay": 181                        }82                    }83                }84            }85        }86    },87      "parachains": [88        {89            "bin": "/unique-chain/current/release/unique-collator",90            "upgradeBin": "/unique-chain/target/release/unique-collator",91            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm",92            "id": "1000",93            "balance": "1000000000000000000000000",94            "chainRawInitializer": [95                "chainql",96                "--ext-str=FORK_FROM",97                "--tla-code=rawSpec=import '${rawSpec}'",98                "--tla-code=forkFrom=std.extVar('FORK_FROM')",99                "fork.jsonnet"100            ],101            "nodes": [102                {103                    "port": 31200,104                    "wsPort": 9944,105                    "rpcPort": 9933,106                    "name": "alice",107                    "flags": [108                        "--rpc-cors=all",109                        "--unsafe-rpc-external",110                        "--unsafe-ws-external",111                        "-lxcm=trace"112                    ]113                },114                {115                    "port": 31201,116                    "wsPort": 9945,117                    "rpcPort": 9934,118                    "name": "bob",119                    "flags": [120                        "--rpc-cors=all",121                        "--unsafe-rpc-external",122                        "--unsafe-ws-external",123                        "-lxcm=trace"124                    ]125                }126            ]127        }128    ],129    "simpleParachains": [],130    "hrmpChannels": [],131    "finalization": false132}
after · .docker/forking/launch-config-fork.j2
1{2      "relaychain": {3        "bin": "/polkadot/target/release/polkadot",4        "chain": "westend-local",5        "nodes": [6            {7                "name": "alice",8                "wsPort": 9844,9                "rpcPort": 9843,10                "port": 30444,11                "flags": [12                    "-lparachain::candidate_validation=debug",13                    "-lxcm=trace",14                    "--rpc-cors=all",15                    "--unsafe-rpc-external",16                    "--unsafe-ws-external"17                ]18            },19            {20                "name": "bob",21                "wsPort": 9855,22                "rpcPort": 9854,23                "port": 30555,24                "flags": [25                    "-lparachain::candidate_validation=debug",26                    "-lxcm=trace",27                    "--rpc-cors=all",28                    "--unsafe-rpc-external",29                    "--unsafe-ws-external"30                ]31            },32            {33                "name": "charlie",34                "wsPort": 9866,35                "rpcPort": 9865,36                "port": 30666,37                "flags": [38                    "-lparachain::candidate_validation=debug",39                    "-lxcm=trace",40                    "--rpc-cors=all",41                    "--unsafe-rpc-external",42                    "--unsafe-ws-external"43                ]44            },45            {46                "name": "dave",47                "wsPort": 9877,48                "rpcPort": 9876,49                "port": 30777,50                "flags": [51                    "-lparachain::candidate_validation=debug",52                    "-lxcm=trace",53                    "--rpc-cors=all",54                    "--unsafe-rpc-external",55                    "--unsafe-ws-external"56                ]57            },58            {59                "name": "eve",60                "wsPort": 9888,61                "rpcPort": 9887,62                "port": 30888,63                "flags": [64                    "-lparachain::candidate_validation=debug",65                    "-lxcm=trace",66                    "--rpc-cors=all",67                    "--unsafe-rpc-external",68                    "--unsafe-ws-external"69                ]70            }71        ],72        "genesis": {73            "runtime": {74                "runtime_genesis_config": {75                    "parachainsConfiguration": {76                        "config": {77                            "validation_upgrade_frequency": 1,78                            "validation_upgrade_delay": 179                        }80                    }81                }82            }83        }84    },85      "parachains": [86        {87            "bin": "/unique-chain/current/release/unique-collator",88            "id": "1000",89            "balance": "1000000000000000000000000",90            "chainRawInitializer": [91                "chainql",92                "--ext-str=FORK_FROM",93                "--tla-code=rawSpec=import '${rawSpec}'",94                "--tla-code=forkFrom=std.extVar('FORK_FROM')",95                "fork.jsonnet"96            ],97            "nodes": [98                {99                    "port": 31200,100                    "wsPort": 9944,101                    "rpcPort": 9933,102                    "name": "alice",103                    "flags": [104                        "--rpc-cors=all",105                        "--unsafe-rpc-external",106                        "--unsafe-ws-external",107                        "-lxcm=trace"108                    ]109                },110                {111                    "port": 31201,112                    "wsPort": 9945,113                    "rpcPort": 9934,114                    "name": "bob",115                    "flags": [116                        "--rpc-cors=all",117                        "--unsafe-rpc-external",118                        "--unsafe-ws-external",119                        "-lxcm=trace"120                    ]121                }122            ]123        }124    ],125    "simpleParachains": [],126    "hrmpChannels": [],127    "finalization": false128}
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