--- a/.docker/Dockerfile-parachain-upgrade-data.j2 +++ b/.docker/Dockerfile-parachain-upgrade-data.j2 @@ -40,6 +40,7 @@ # ===== RUN ====== FROM ubuntu:22.04 +ENV RELAY_CHAIN_TYPE={{ RELAY_CHAIN_TYPE }} 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 @@ -68,7 +69,7 @@ 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 COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/rococo-runtime/rococo_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/rococo-runtime/rococo_runtime.compact.compressed.wasm -CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM NEW_PARA_BIN NEW_PARA_WASM && \ +CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM NEW_PARA_BIN NEW_PARA_WASM RELAY_CHAIN_TYPE && \ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ cd /unique-chain/tests && \ npm install --global yarn && \ --- /dev/null +++ b/.docker/forkless-config/zombienet-forkless-data.toml @@ -0,0 +1,46 @@ +[settings] +provider = "native" + +[relaychain] +default_command = "/polkadot/target/release/polkadot" +default_args = [ "-lparachain::candidate_validation=debug", "-lxcm=trace", ] +chain = "{{ RELAY_CHAIN_TYPE }}-local" + + [[relaychain.nodes]] + name = "relay-alice" + ws_port = 9844 + rpc_port = 9843 + p2p_port = 30444 + + [[relaychain.node_groups]] + name = "relay" + count = 4 + +[[parachains]] +id = 1000 +chain_spec_modifier_commands = [[ + "chainql", + "--tla-code=rawSpec=import '{{'raw'|chainSpec}}'", + "--tla-str=forkFrom={{ REPLICA_FROM }}", + "fork.jsonnet", +]] + + [[parachains.collators]] + name = "alice" + command = "/unique-chain/current/release/unique-collator" + ws_port = 9944 + rpc_port = 9933 + p2p_port = 31200 + args = [ + "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug", + ] + + [[parachains.collators]] + name = "bob" + command = "/unique-chain/current/release/unique-collator" + ws_port = 9945 + rpc_port = 9934 + p2p_port = 31201 + args = [ + "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug", + ] --- a/.github/workflows/forkless-update-data.yml +++ b/.github/workflows/forkless-update-data.yml @@ -90,17 +90,17 @@ - name: Show build configuration run: cat .docker/Dockerfile-parachain-upgrade-data.${{ matrix.network }}.yml - - name: Generate zombienet-forkless-data.toml - uses: cuchi/jinja2-action@v1.2.0 - with: - template: .docker/forkless-config/zombienet-forkless-data.j2 - output_file: .docker/forkless-config/zombienet-forkless-data.toml - variables: | - RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }} - REPLICA_FROM=${{ matrix.replica_from_address }} + # - name: Generate zombienet-forkless-data.toml + # uses: cuchi/jinja2-action@v1.2.0 + # with: + # template: .docker/forkless-config/zombienet-forkless-data.j2 + # output_file: .docker/forkless-config/zombienet-forkless-data.toml + # variables: | + # RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }} + # REPLICA_FROM=${{ matrix.replica_from_address }} - - name: Show zombienet-forkless-data configuration - run: cat .docker/forkless-config/zombienet-forkless-data.toml + # - name: Show zombienet-forkless-data configuration + # run: cat .docker/forkless-config/zombienet-forkless-data.toml - name: Run find-and-replace to remove slashes from branch name uses: mad9000/actions-find-and-replace-string@4