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
--- a/.docker/forkless-config/launch-config-forkless-data.j2
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-      "relaychain": {
-        "bin": "/polkadot/target/release/polkadot",
-        "upgradeBin": "/polkadot/target/release/polkadot",
-        "upgradeWasm": "/polkadot/target/release/wbuild/{{ RELAY_CHAIN_TYPE }}-runtime/{{ RELAY_CHAIN_TYPE }}_runtime.compact.compressed.wasm",
-        "chain": "{{ RELAY_CHAIN_TYPE }}-local",
-        "nodes": [
-            {
-                "name": "alice",
-                "wsPort": 9844,
-                "rpcPort": 9843,
-                "port": 30444,
-                "flags": [
-                    "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace",
-                    "--rpc-cors=all",
-                    "--unsafe-rpc-external",
-                    "--unsafe-ws-external"
-                ]
-            },
-            {
-                "name": "bob",
-                "wsPort": 9855,
-                "rpcPort": 9854,
-                "port": 30555,
-                "flags": [
-                    "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace",
-                    "--rpc-cors=all",
-                    "--unsafe-rpc-external",
-                    "--unsafe-ws-external"
-                ]
-            },
-            {
-                "name": "charlie",
-                "wsPort": 9866,
-                "rpcPort": 9865,
-                "port": 30666,
-                "flags": [
-                    "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace",
-                    "--rpc-cors=all",
-                    "--unsafe-rpc-external",
-                    "--unsafe-ws-external"
-                ]
-            },
-            {
-                "name": "dave",
-                "wsPort": 9877,
-                "rpcPort": 9876,
-                "port": 30777,
-                "flags": [
-                    "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace",
-                    "--rpc-cors=all",
-                    "--unsafe-rpc-external",
-                    "--unsafe-ws-external"
-                ]
-            },
-            {
-                "name": "eve",
-                "wsPort": 9888,
-                "rpcPort": 9887,
-                "port": 30888,
-                "flags": [
-                    "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace",
-                    "--rpc-cors=all",
-                    "--unsafe-rpc-external",
-                    "--unsafe-ws-external"
-                ]
-            }
-        ],
-        "genesis": {
-            "runtime": {
-                "runtime_genesis_config": {
-                    "parachainsConfiguration": {
-                        "config": {
-                            "validation_upgrade_frequency": 1,
-                            "validation_upgrade_delay": 1
-                        }
-                    }
-                }
-            }
-        }
-    },
-      "parachains": [
-        {
-            "bin": "/unique-chain/current/release/unique-collator",
-            "upgradeBin": "/unique-chain/target/release/unique-collator",
-            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm",
-            "id": "1000",
-            "balance": "1000000000000000000000000",
-            "chainRawInitializer": [
-                "chainql",
-                "--tla-code=rawSpec=import '${rawSpec}'",
-                "--tla-str=forkFrom={{ REPLICA_FROM }}",
-                "fork.jsonnet"
-            ],
-            "nodes": [
-                {
-                    "port": 31200,
-                    "wsPort": 9944,
-                    "rpcPort": 9933,
-                    "name": "alice",
-                    "flags": [
-                        "--rpc-cors=all",
-                        "--unsafe-rpc-external",
-                        "--unsafe-ws-external",
-                        "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",
-                        "--",
-                        "--port=31335",
-                        "--ws-port=9745",
-                        "--rpc-port=9734"
-                    ]
-                },
-                {
-                    "port": 31201,
-                    "wsPort": 9945,
-                    "rpcPort": 9934,
-                    "name": "bob",
-                    "flags": [
-                        "--rpc-cors=all",
-                        "--unsafe-rpc-external",
-                        "--unsafe-ws-external",
-                        "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug"
-                    ]
-                }
-            ]
-        }
-    ],
-    "simpleParachains": [],
-    "hrmpChannels": [],
-    "finalization": false
-}
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
76        with:76        with:
77          template: .docker/Dockerfile-parachain-upgrade-data.j277          template: .docker/Dockerfile-parachain-upgrade-data.j2
78          output_file: .docker/Dockerfile-parachain-upgrade-data.${{ matrix.network }}.yml78          output_file: .docker/Dockerfile-parachain-upgrade-data.${{ matrix.network }}.yml
79          variables: |79          variables: |
80            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}80            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
81            NETWORK=${{ matrix.network }}81            NETWORK=${{ matrix.network }}
82            MAINNET_BRANCH=${{ matrix.mainnet_branch }}82            MAINNET_BRANCH=${{ matrix.mainnet_branch }}
83            WASM_NAME=${{ matrix.wasm_name }}83            WASM_NAME=${{ matrix.wasm_name }}
84            POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}84            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
85            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}85            POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}
86            REPLICA_FROM=${{ matrix.replica_from_address }}86            REPLICA_FROM=${{ matrix.replica_from_address }}
87            CHAINQL=${{ env.CHAINQL }}87            CHAINQL=${{ env.CHAINQL }}
88            EXTRA_FEATURES=${{ matrix.extra_features }}88            EXTRA_FEATURES=${{ matrix.extra_features }}
8989
90      - name: Show build configuration90      - name: Show build configuration
91        run: cat .docker/Dockerfile-parachain-upgrade-data.${{ matrix.network }}.yml91        run: cat .docker/Dockerfile-parachain-upgrade-data.${{ matrix.network }}.yml
92
93      - name: Generate launch-config-forkless-data.json
94        uses: cuchi/jinja2-action@v1.2.0
95        with:
96          template: .docker/forkless-config/launch-config-forkless-data.j2
97          output_file: .docker/forkless-config/launch-config-forkless-data.json
98          variables: |
99            WASM_NAME=${{ matrix.wasm_name }}
100            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
101            REPLICA_FROM=${{ matrix.replica_from_address }}            
102
103      - name: Show launch-config-forkless configuration
104        run: cat .docker/forkless-config/launch-config-forkless-data.json
10592
106      - name: Run find-and-replace to remove slashes from branch name93      - name: Run find-and-replace to remove slashes from branch name
107        uses: mad9000/actions-find-and-replace-string@494        uses: mad9000/actions-find-and-replace-string@4