git.delta.rocks / unique-network / refs/commits / 4a38064d3943

difftreelog

ci(forkless-data) replace polkadot-launch with zombienet

Fahrrader2023-04-28parent: #45fd3eb.patch.diff
in: master

3 files changed

modified.docker/Dockerfile-parachain-upgrade-data.j2diffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data.j2
+++ b/.docker/Dockerfile-parachain-upgrade-data.j2
@@ -41,6 +41,8 @@
 FROM ubuntu:22.04
 
 ENV REPLICA_FROM={{ REPLICA_FROM }}
+ENV NEW_PARA_BIN=/unique-chain/target/release/unique-collator
+ENV NEW_PARA_WASM=/unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm
 
 RUN apt-get -y update && \
     apt-get -y install curl git && \
@@ -50,28 +52,25 @@
     nvm install v16.16.0 && \
     nvm use v16.16.0
 
-RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b {{ POLKADOT_LAUNCH_BRANCH }}
-
 RUN export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
+    cd /unique-chain/tests && \
     npm install --global yarn && \
     yarn install
 
 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/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm
+COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm {{ NEW_PARA_WASM }}
 
-COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/launch-config-forkless-data.json /polkadot-launch/launch-config.json
-COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/fork.jsonnet /polkadot-launch/fork.jsonnet
-COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/typeNames.jsonnet /polkadot-launch/typeNames.jsonnet
+COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/zombienet-forkless-data.toml /unique-chain/zombienet-forkless.toml
+COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/fork.jsonnet /unique-chain/tests/fork.jsonnet
 
 COPY --from=uniquenetwork/builder-chainql:{{ CHAINQL }} /chainql/target/release/chainql /chainql/target/release/
 
 COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 COPY --from=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
 
-CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \
+CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM NEW_PARA_BIN NEW_PARA_WASM && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
-    yarn start launch-config.json --test-upgrade-parachains
+    cd /unique-chain/tests && \
+    yarn frankenstein zombienet-forkless.json
deleted.docker/forkless-config/launch-config-forkless-data.j2diffbeforeafterboth
before · .docker/forkless-config/launch-config-forkless-data.j2
1{2      "relaychain": {3        "bin": "/polkadot/target/release/polkadot",4        "upgradeBin": "/polkadot/target/release/polkadot",5        "upgradeWasm": "/polkadot/target/release/wbuild/{{ RELAY_CHAIN_TYPE }}-runtime/{{ RELAY_CHAIN_TYPE }}_runtime.compact.compressed.wasm",6        "chain": "{{ RELAY_CHAIN_TYPE }}-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/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm",92            "id": "1000",93            "balance": "1000000000000000000000000",94            "chainRawInitializer": [95                "chainql",96                "--tla-code=rawSpec=import '${rawSpec}'",97                "--tla-str=forkFrom={{ REPLICA_FROM }}",98                "fork.jsonnet"99            ],100            "nodes": [101                {102                    "port": 31200,103                    "wsPort": 9944,104                    "rpcPort": 9933,105                    "name": "alice",106                    "flags": [107                        "--rpc-cors=all",108                        "--unsafe-rpc-external",109                        "--unsafe-ws-external",110                        "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",111                        "--",112                        "--port=31335",113                        "--ws-port=9745",114                        "--rpc-port=9734"115                    ]116                },117                {118                    "port": 31201,119                    "wsPort": 9945,120                    "rpcPort": 9934,121                    "name": "bob",122                    "flags": [123                        "--rpc-cors=all",124                        "--unsafe-rpc-external",125                        "--unsafe-ws-external",126                        "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug"127                    ]128                }129            ]130        }131    ],132    "simpleParachains": [],133    "hrmpChannels": [],134    "finalization": false135}
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -81,27 +81,14 @@
             NETWORK=${{ matrix.network }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
             WASM_NAME=${{ matrix.wasm_name }}
+            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
             POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}
-            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
             REPLICA_FROM=${{ matrix.replica_from_address }}
             CHAINQL=${{ env.CHAINQL }}
             EXTRA_FEATURES=${{ matrix.extra_features }}
 
       - name: Show build configuration
         run: cat .docker/Dockerfile-parachain-upgrade-data.${{ matrix.network }}.yml
-
-      - name: Generate launch-config-forkless-data.json
-        uses: cuchi/jinja2-action@v1.2.0
-        with:
-          template: .docker/forkless-config/launch-config-forkless-data.j2
-          output_file: .docker/forkless-config/launch-config-forkless-data.json
-          variables: |
-            WASM_NAME=${{ matrix.wasm_name }}
-            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
-            REPLICA_FROM=${{ matrix.replica_from_address }}            
-
-      - name: Show launch-config-forkless configuration
-        run: cat .docker/forkless-config/launch-config-forkless-data.json
 
       - name: Run find-and-replace to remove slashes from branch name
         uses: mad9000/actions-find-and-replace-string@4