From 867f6e7698ed4384963e269a0585daabdcb4d3b6 Mon Sep 17 00:00:00 2001 From: Dengjianping Date: Tue, 22 Aug 2023 12:54:17 +0800 Subject: [PATCH 1/4] Add zombienet examples Signed-off-by: Dengjianping --- zombienet/examples/README.md | 0 .../examples/check-block-production.zndsl | 10 +++ zombienet/examples/custom-script.js | 7 ++ zombienet/examples/custom-script.toml | 48 ++++++++++++ zombienet/examples/custom-script.zndsl | 8 ++ zombienet/examples/runtime-upgrade.js | 24 ++++++ zombienet/examples/runtime-upgrade.toml | 48 ++++++++++++ zombienet/examples/runtime-upgrade.zndsl | 9 +++ zombienet/examples/small-network.toml | 49 ++++++++++++ zombienet/examples/two-parachains.toml | 76 +++++++++++++++++++ 10 files changed, 279 insertions(+) create mode 100644 zombienet/examples/README.md create mode 100644 zombienet/examples/check-block-production.zndsl create mode 100644 zombienet/examples/custom-script.js create mode 100644 zombienet/examples/custom-script.toml create mode 100644 zombienet/examples/custom-script.zndsl create mode 100644 zombienet/examples/runtime-upgrade.js create mode 100644 zombienet/examples/runtime-upgrade.toml create mode 100644 zombienet/examples/runtime-upgrade.zndsl create mode 100644 zombienet/examples/small-network.toml create mode 100644 zombienet/examples/two-parachains.toml diff --git a/zombienet/examples/README.md b/zombienet/examples/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/zombienet/examples/check-block-production.zndsl b/zombienet/examples/check-block-production.zndsl new file mode 100644 index 000000000..fcc90a5d1 --- /dev/null +++ b/zombienet/examples/check-block-production.zndsl @@ -0,0 +1,10 @@ +Description: Block Production Test +Network: ./small-network.toml +Creds: config + +# metrics +Alice: reports node_roles is 4 + +# logs +alice: parachain 2084 is registered within 225 seconds +Alice: reports block height is at least 5 within 250 seconds \ No newline at end of file diff --git a/zombienet/examples/custom-script.js b/zombienet/examples/custom-script.js new file mode 100644 index 000000000..f65e08373 --- /dev/null +++ b/zombienet/examples/custom-script.js @@ -0,0 +1,7 @@ +const assert = require("assert"); + +async function run(nodeName, networkInfo, args) { + return 2084; +} + +module.exports = { run } \ No newline at end of file diff --git a/zombienet/examples/custom-script.toml b/zombienet/examples/custom-script.toml new file mode 100644 index 000000000..5c7c101a9 --- /dev/null +++ b/zombienet/examples/custom-script.toml @@ -0,0 +1,48 @@ +[settings] +timeout = 300 + +[relaychain] +chain = "rococo-local" +default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/polkadot" + +[[relaychain.nodes]] +name = "alice" +validator = true +ws_port = 9944 + +[[relaychain.nodes]] +name = "bob" +validator = true +ws_port = 9911 + +[[parachains]] +chain = "calamari-local" +cumulus_based = true +id = 2084 + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +name = "Alice" +validator = true +rcp_port = 9967 +ws_port = 9921 + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +name = "Bob" +validator = true + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +name = "Charlie" +validator = true + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +name = "Dave" +validator = true + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +name = "Eve" +validator = true diff --git a/zombienet/examples/custom-script.zndsl b/zombienet/examples/custom-script.zndsl new file mode 100644 index 000000000..2eb112d97 --- /dev/null +++ b/zombienet/examples/custom-script.zndsl @@ -0,0 +1,8 @@ +Description: Runtime Upgrade Test +Network: ./custom-script.toml +Creds: config + +alice: parachain 2084 is registered within 225 seconds +Bob: reports block height is at least 5 within 250 seconds +Dave: reports block height is at least 5 within 250 seconds +Dave: js-script ./custom-script.js return is equal to 2084 within 300 seconds \ No newline at end of file diff --git a/zombienet/examples/runtime-upgrade.js b/zombienet/examples/runtime-upgrade.js new file mode 100644 index 000000000..7692d3cef --- /dev/null +++ b/zombienet/examples/runtime-upgrade.js @@ -0,0 +1,24 @@ +const assert = require("assert"); + +async function run(nodeName, networkInfo, args) { + const {wsUri, userDefinedTypes} = networkInfo.nodesByName[nodeName]; + const api = await zombie.connect(wsUri, userDefinedTypes); + + // get blockhash/runtimeVersion at block 1 + const hashAtBlock1 = await api.rpc.chain.getBlockHash(1); + const versionAtBlock1 = await api.rpc.state.getRuntimeVersion(hashAtBlock1.toHuman()); + + // get blockhash/runtimeVersion at current head + const currentHeader = await api.rpc.chain.getHeader(); + const hashAtCurrent = await api.rpc.chain.getBlockHash(currentHeader.number.toHuman()); + const versionAtCurrent = await api.rpc.state.getRuntimeVersion(hashAtCurrent.toHuman()); + + const oldVersionIncremented = parseInt(versionAtBlock1.specVersion.toHuman(),10) + 1; + console.log("current", versionAtCurrent.specVersion.toHuman()); + console.log("oldVersionIncremented", oldVersionIncremented); + + // 2 == 2 + assert.equal( oldVersionIncremented, versionAtCurrent.specVersion.toHuman(), "Running version should be the incremented version"); +} + +module.exports = { run } \ No newline at end of file diff --git a/zombienet/examples/runtime-upgrade.toml b/zombienet/examples/runtime-upgrade.toml new file mode 100644 index 000000000..67aa0548a --- /dev/null +++ b/zombienet/examples/runtime-upgrade.toml @@ -0,0 +1,48 @@ +[settings] +timeout = 300 + +[relaychain] +chain = "rococo-local" +default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/polkadot" + +[[relaychain.nodes]] +name = "alice" +validator = true +ws_port = 9944 + +[[relaychain.nodes]] +name = "bob" +validator = true +ws_port = 9911 + +[[parachains]] +chain = "calamari-local" +cumulus_based = true +id = 2084 + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/demo/manta" +name = "Alice" +validator = true +rcp_port = 9967 +ws_port = 9921 + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/demo/manta" +name = "Bob" +validator = true + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/demo/manta" +name = "Charlie" +validator = true + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/demo/manta" +name = "Dave" +validator = true + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/demo/manta" +name = "Eve" +validator = true diff --git a/zombienet/examples/runtime-upgrade.zndsl b/zombienet/examples/runtime-upgrade.zndsl new file mode 100644 index 000000000..dc1275f41 --- /dev/null +++ b/zombienet/examples/runtime-upgrade.zndsl @@ -0,0 +1,9 @@ +Description: Runtime Upgrade Test +Network: ./runtime-upgrade.toml +Creds: config + +alice: parachain 2084 is registered within 225 seconds +bob: parachain 2084 perform upgrade with ./calamari-runtime-v4400.compact.compressed.wasm within 300 seconds +Bob: reports block height is at least 5 within 250 seconds +Dave: reports block height is at least 5 within 250 seconds +Dave: js-script ./runtime.unpragde.js within 600 seconds \ No newline at end of file diff --git a/zombienet/examples/small-network.toml b/zombienet/examples/small-network.toml new file mode 100644 index 000000000..0c28d808e --- /dev/null +++ b/zombienet/examples/small-network.toml @@ -0,0 +1,49 @@ +[settings] +timeout = 300 + +[relaychain] +chain = "rococo-local" +default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/polkadot" + +[[relaychain.nodes]] +name = "alice" +validator = true +ws_port = 9944 + +[[relaychain.nodes]] +name = "bob" +validator = true +ws_port = 9911 + +[[parachains]] +chain = "calamari-local" +# chain_spec_file = "" +cumulus_based = true +id = 2084 + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +name = "Alice" # cannot use alice here, alice has been occupied by one of relaychain node +validator = true +rcp_port = 9967 +ws_port = 9921 + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +name = "Bob" +validator = true + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +name = "Charlie" +validator = true + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +name = "Dave" +validator = true + +[[parachains.collators]] +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +name = "Eve" +validator = true diff --git a/zombienet/examples/two-parachains.toml b/zombienet/examples/two-parachains.toml new file mode 100644 index 000000000..c429baa28 --- /dev/null +++ b/zombienet/examples/two-parachains.toml @@ -0,0 +1,76 @@ +[settings] +timeout = 300 + +[relaychain] +chain = "rococo-local" +default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/polkadot" + +[[relaychain.nodes]] +name = "eve" +validator = true +ws_port = 9944 + +[[relaychain.nodes]] +name = "bob" +validator = true +ws_port = 9911 + +[[parachains]] +chain = "calamari-local" +cumulus_based = true +id = 2084 +default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" + +[[parachains.collators]] +name = "Alice" # case sensitive, if you use `alice` here, zombienet will generate a key from alice-1 +rcp_port = 9967 +ws_port = 9921 +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +validator = true +args = [ "-lparachain=debug,xcm=trace" ] + +[[parachains.collators]] +name = "Bob" +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +validator = true + +[[parachains.collators]] +name = "Charlie" +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +validator = true + +[[parachains.collators]] +name = "Dave" +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +validator = true + +[[parachains.collators]] +name = "Eve" +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +validator = true + +[[parachains]] +chain = "manta-dev" +cumulus_based = true +id = 2104 +default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" + +[[parachains.collators]] +name = "Alice" # Alice-1 +rcp_port = 9968 +ws_port = 9922 +command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +validator = true +# args = ["-lparachain=debug"] + +[[hrmp_channels]] +sender = 2104 +recipient = 2084 +max_capacity = 4 +max_message_size = 524288 + +[[hrmp_channels]] +sender = 2084 +recipient = 2104 +max_capacity = 4 +max_message_size = 524288 \ No newline at end of file From cf86ae4bd60ba4eb8c380148dca740c91c19b180 Mon Sep 17 00:00:00 2001 From: Dengjianping Date: Mon, 18 Sep 2023 22:55:55 +0800 Subject: [PATCH 2/4] [no ci]Update readme for zombienet's examples Signed-off-by: Dengjianping --- zombienet/examples/README.md | 74 +++++++++++++++++++++++++ zombienet/examples/custom-script.toml | 12 ++-- zombienet/examples/runtime-upgrade.toml | 12 ++-- zombienet/examples/small-network.toml | 12 ++-- zombienet/examples/two-parachains.toml | 16 +++--- 5 files changed, 100 insertions(+), 26 deletions(-) diff --git a/zombienet/examples/README.md b/zombienet/examples/README.md index e69de29bb..32c63c51c 100644 --- a/zombienet/examples/README.md +++ b/zombienet/examples/README.md @@ -0,0 +1,74 @@ +# Manta's zombienet examples + +## Docs and examples +- docs: https://paritytech.github.io/zombienet/ +- examples: + - https://github.com/paritytech/zombienet/tree/main/examples + - https://github.com/paritytech/cumulus/tree/master/zombienet + - https://github.com/paritytech/polkadot/tree/master/zombienet_tests + +- Demo docs: [demo](https://www.notion.so/mantanetwork/Zombienet-Demo-fa7e38568b474498b73f5e13adf906f9?pvs=4) + +## Install zombienet + +According to your platform, download the latest pre-compiled binary from [zombinet](https://github.com/paritytech/zombienet/releases) repository. + +## Start network + +### Start one paracahin network locally by zombienet +1. Go to [small-network](./small-network.toml), make the `command` point to the polkadot binary and manta binary. +2. Start the network. + ```shell + zombienet spawn --provider native small-network.toml + ``` + After a while, the network will be started. + +### Start two parachains +1. Go to [two-parachains](./two-parachains.toml), make the `command` point to the polkadot binary and manta binary. +2. Start the network. + ```shell + zombienet spawn --provider native two-parachains.toml + ``` + After a while, two paracahins(`2084` and `2104`) will be started. + +## Testing + +Zombienet supports testing as well, but you have to write test cases with a special dsl: `zndsl`. +Please take a look at this [doc](https://paritytech.github.io/zombienet/cli/test-dsl-definition-spec.html) to see more details about how to write test cases. + +### Runtime upgrade(not ready) +1. Go to [runtime-upgrade](./runtime-upgrade.toml), make the `command` point to the polkadot binary and manta binary. And go to [runtime upgrade test case](./runtime-upgrade.zndsl), make sure `line 6` point to the correct wasm binary. +2. Run runtime upgrade. + ```shell + zombienet -f --provider native test runtime-upgrade.zndsl + ``` + This test case would take minutes to be finished. + +### Run you own customized test script +1. Go to [custom-script](./custom-script.toml), make the `command` point to the polkadot binary and manta binary. +2. Define and implement a function named `run` in your script. + ```ts + async function run(nodeName, networkInfo, args) { + return 2084; + } + ``` +3. Go to the [custom-script test case](./custom-script.zndsl), make sure `line 8` point to your script, and compare the expected value. + ``` + Dave: js-script ./custom-script.js return is equal to 2084 within 300 seconds + ``` +4. Start the test. + ```shell + zombienet -f --provider native test custom-script.zndsl + ``` + +## Tips: +1. When run the network, please do not use the same node name for relaychain and parachain. +For example: if one relaychain node takes `Alice`, so you cannot use `Alice` for any parachain nodes, but you can use `alice`. +2. Please be careful the node name in your test case, you must understand what you want to test. +For example, if one relaychain node takes `Alice` as node, you can use `alice` for one of paracahin nodes, the `Alice` will test relaychain node, but `alice` is for parachain only. + ``` + alice: parachain 2084 is registered within 225 seconds + Alice: reports block height is at least 5 within 250 seconds + ``` + The first line will check parachain's block production, the second line will check relaychain's. + Because relaychain and parachain use the same node name, the zombienet's test framework won't know who is `Alice`. diff --git a/zombienet/examples/custom-script.toml b/zombienet/examples/custom-script.toml index 5c7c101a9..48d1ed642 100644 --- a/zombienet/examples/custom-script.toml +++ b/zombienet/examples/custom-script.toml @@ -3,7 +3,7 @@ timeout = 300 [relaychain] chain = "rococo-local" -default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/polkadot" +default_command = "polkadot-binary" [[relaychain.nodes]] name = "alice" @@ -21,28 +21,28 @@ cumulus_based = true id = 2084 [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" name = "Alice" validator = true rcp_port = 9967 ws_port = 9921 [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" name = "Bob" validator = true [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" name = "Charlie" validator = true [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" name = "Dave" validator = true [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" name = "Eve" validator = true diff --git a/zombienet/examples/runtime-upgrade.toml b/zombienet/examples/runtime-upgrade.toml index 67aa0548a..48d1ed642 100644 --- a/zombienet/examples/runtime-upgrade.toml +++ b/zombienet/examples/runtime-upgrade.toml @@ -3,7 +3,7 @@ timeout = 300 [relaychain] chain = "rococo-local" -default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/polkadot" +default_command = "polkadot-binary" [[relaychain.nodes]] name = "alice" @@ -21,28 +21,28 @@ cumulus_based = true id = 2084 [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/demo/manta" +command = "manta-binary" name = "Alice" validator = true rcp_port = 9967 ws_port = 9921 [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/demo/manta" +command = "manta-binary" name = "Bob" validator = true [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/demo/manta" +command = "manta-binary" name = "Charlie" validator = true [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/demo/manta" +command = "manta-binary" name = "Dave" validator = true [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/demo/manta" +command = "manta-binary" name = "Eve" validator = true diff --git a/zombienet/examples/small-network.toml b/zombienet/examples/small-network.toml index 0c28d808e..05bef90ca 100644 --- a/zombienet/examples/small-network.toml +++ b/zombienet/examples/small-network.toml @@ -3,7 +3,7 @@ timeout = 300 [relaychain] chain = "rococo-local" -default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/polkadot" +default_command = "polkadot-binary" [[relaychain.nodes]] name = "alice" @@ -22,28 +22,28 @@ cumulus_based = true id = 2084 [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" name = "Alice" # cannot use alice here, alice has been occupied by one of relaychain node validator = true rcp_port = 9967 ws_port = 9921 [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" name = "Bob" validator = true [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" name = "Charlie" validator = true [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" name = "Dave" validator = true [[parachains.collators]] -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" name = "Eve" validator = true diff --git a/zombienet/examples/two-parachains.toml b/zombienet/examples/two-parachains.toml index c429baa28..768c59592 100644 --- a/zombienet/examples/two-parachains.toml +++ b/zombienet/examples/two-parachains.toml @@ -19,47 +19,47 @@ ws_port = 9911 chain = "calamari-local" cumulus_based = true id = 2084 -default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +default_command = "manta-binary" [[parachains.collators]] name = "Alice" # case sensitive, if you use `alice` here, zombienet will generate a key from alice-1 rcp_port = 9967 ws_port = 9921 -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" validator = true args = [ "-lparachain=debug,xcm=trace" ] [[parachains.collators]] name = "Bob" -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" validator = true [[parachains.collators]] name = "Charlie" -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" validator = true [[parachains.collators]] name = "Dave" -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" validator = true [[parachains.collators]] name = "Eve" -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" validator = true [[parachains]] chain = "manta-dev" cumulus_based = true id = 2104 -default_command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +default_command = "manta-binary" [[parachains.collators]] name = "Alice" # Alice-1 rcp_port = 9968 ws_port = 9922 -command = "/home/jamie/my-repo/forks/jdeng/Manta/zombienet/manta" +command = "manta-binary" validator = true # args = ["-lparachain=debug"] From 7584bbe126d421e5c3344e20e60779608f6ca220 Mon Sep 17 00:00:00 2001 From: Dengjianping Date: Tue, 26 Sep 2023 10:15:46 +0800 Subject: [PATCH 3/4] Try to fix taplo installation Signed-off-by: Dengjianping --- .github/workflows/run_linters.yml | 2 +- zombienet/examples/README.md | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/run_linters.yml b/.github/workflows/run_linters.yml index f31a36fd3..19d814f8c 100644 --- a/.github/workflows/run_linters.yml +++ b/.github/workflows/run_linters.yml @@ -55,7 +55,7 @@ jobs: source ${HOME}/.cargo/env rustup toolchain install nightly-2023-03-13 rustup default nightly-2023-03-13 - cargo install taplo-cli + cargo install taplo-cli --locked - name: cache cargo uses: Swatinem/rust-cache@v2 - name: Check Formatting diff --git a/zombienet/examples/README.md b/zombienet/examples/README.md index 32c63c51c..c06ed6fb8 100644 --- a/zombienet/examples/README.md +++ b/zombienet/examples/README.md @@ -7,8 +7,6 @@ - https://github.com/paritytech/cumulus/tree/master/zombienet - https://github.com/paritytech/polkadot/tree/master/zombienet_tests -- Demo docs: [demo](https://www.notion.so/mantanetwork/Zombienet-Demo-fa7e38568b474498b73f5e13adf906f9?pvs=4) - ## Install zombienet According to your platform, download the latest pre-compiled binary from [zombinet](https://github.com/paritytech/zombienet/releases) repository. From c85918b0a8f2538e8e51c135e8e8489640b82e71 Mon Sep 17 00:00:00 2001 From: Dengjianping Date: Tue, 26 Sep 2023 11:05:09 +0800 Subject: [PATCH 4/4] Fix taplo fmt Signed-off-by: Dengjianping --- zombienet/examples/custom-script.toml | 2 +- zombienet/examples/runtime-upgrade.toml | 2 +- zombienet/examples/small-network.toml | 4 +-- zombienet/examples/two-parachains.toml | 36 ++++++++++++------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/zombienet/examples/custom-script.toml b/zombienet/examples/custom-script.toml index 48d1ed642..46bdc9d99 100644 --- a/zombienet/examples/custom-script.toml +++ b/zombienet/examples/custom-script.toml @@ -23,8 +23,8 @@ id = 2084 [[parachains.collators]] command = "manta-binary" name = "Alice" -validator = true rcp_port = 9967 +validator = true ws_port = 9921 [[parachains.collators]] diff --git a/zombienet/examples/runtime-upgrade.toml b/zombienet/examples/runtime-upgrade.toml index 48d1ed642..46bdc9d99 100644 --- a/zombienet/examples/runtime-upgrade.toml +++ b/zombienet/examples/runtime-upgrade.toml @@ -23,8 +23,8 @@ id = 2084 [[parachains.collators]] command = "manta-binary" name = "Alice" -validator = true rcp_port = 9967 +validator = true ws_port = 9921 [[parachains.collators]] diff --git a/zombienet/examples/small-network.toml b/zombienet/examples/small-network.toml index 05bef90ca..26769dfb6 100644 --- a/zombienet/examples/small-network.toml +++ b/zombienet/examples/small-network.toml @@ -23,9 +23,9 @@ id = 2084 [[parachains.collators]] command = "manta-binary" -name = "Alice" # cannot use alice here, alice has been occupied by one of relaychain node -validator = true +name = "Alice" # cannot use alice here, alice has been occupied by one of relaychain node rcp_port = 9967 +validator = true ws_port = 9921 [[parachains.collators]] diff --git a/zombienet/examples/two-parachains.toml b/zombienet/examples/two-parachains.toml index 768c59592..9a66cb6a2 100644 --- a/zombienet/examples/two-parachains.toml +++ b/zombienet/examples/two-parachains.toml @@ -18,59 +18,59 @@ ws_port = 9911 [[parachains]] chain = "calamari-local" cumulus_based = true -id = 2084 default_command = "manta-binary" +id = 2084 [[parachains.collators]] -name = "Alice" # case sensitive, if you use `alice` here, zombienet will generate a key from alice-1 -rcp_port = 9967 -ws_port = 9921 +args = ["-lparachain=debug,xcm=trace"] command = "manta-binary" +name = "Alice" # case sensitive, if you use `alice` here, zombienet will generate a key from alice-1 +rcp_port = 9967 validator = true -args = [ "-lparachain=debug,xcm=trace" ] +ws_port = 9921 [[parachains.collators]] -name = "Bob" command = "manta-binary" +name = "Bob" validator = true [[parachains.collators]] -name = "Charlie" command = "manta-binary" +name = "Charlie" validator = true [[parachains.collators]] -name = "Dave" command = "manta-binary" +name = "Dave" validator = true [[parachains.collators]] -name = "Eve" command = "manta-binary" +name = "Eve" validator = true [[parachains]] chain = "manta-dev" cumulus_based = true -id = 2104 default_command = "manta-binary" +id = 2104 [[parachains.collators]] -name = "Alice" # Alice-1 -rcp_port = 9968 -ws_port = 9922 command = "manta-binary" +name = "Alice" # Alice-1 +rcp_port = 9968 validator = true +ws_port = 9922 # args = ["-lparachain=debug"] [[hrmp_channels]] -sender = 2104 -recipient = 2084 max_capacity = 4 max_message_size = 524288 +recipient = 2084 +sender = 2104 [[hrmp_channels]] -sender = 2084 -recipient = 2104 max_capacity = 4 -max_message_size = 524288 \ No newline at end of file +max_message_size = 524288 +recipient = 2104 +sender = 2084