From 62fd343316b7077088bef2418dd50c7c69e5977e Mon Sep 17 00:00:00 2001 From: Abhishek Harde <47945971+abhiyana@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:46:33 +0530 Subject: [PATCH 1/2] feat: implement kurtosis package for local setup of clover parachain (#29) * feat: implement kurtosis package for local setup of clover parachain * feat: implement method to run relay chains with local.config * refactor: change port key values from port number to ws and tcp --- main.star | 9 +++++++-- parachain/clover.star | 30 ++++++++++++++++++++++++++++++ parachain/litentry.star | 11 +++++------ relaychain/relay-chain.star | 11 ++++++++++- 4 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 parachain/clover.star diff --git a/main.star b/main.star index 9adddbf..72176e7 100644 --- a/main.star +++ b/main.star @@ -1,11 +1,16 @@ parachain = import_module("./parachain/parachain.star") relay_chain = import_module("./relaychain/relay-chain.star") litentry = import_module("./parachain/litentry.star") +clover = import_module("./parachain/clover.star") def run(plan, args): plan.upload_files(src = "./parachain/static_files/configs", name = "configs") + service_details = {"relaychains": {}, "parachains": {}} if args["chain-type"] == "local": - relay_chain.spawn_multiple_relay(plan, 2) - litentry.run_litentry(plan) + service_details["relaychains"] = relay_chain.start_relay_chains_local(plan, args) + service_details["parachains"] = clover.run_clover(plan) + else: relay_chain.start_relay_chain(plan, args) + + return service_details diff --git a/parachain/clover.star b/parachain/clover.star new file mode 100644 index 0000000..90b8390 --- /dev/null +++ b/parachain/clover.star @@ -0,0 +1,30 @@ +def run_clover(plan): + exec_command = [ + "--chain=dev", + "--rpc-port=9933", + "--rpc-external", + "--rpc-cors=all", + "--rpc-methods=unsafe", + "--execution=wasm", + "--tmp", + "--unsafe-ws-external", + "--", + "--chain=/app/rococo-local.json", + "--execution=wasm" + ] + clover_service_config = ServiceConfig( + image = "cloverio/clover-para:v0.1.24", + files = { + "/app":"configs" + }, + ports = { + "ws": PortSpec(9944, transport_protocol="TCP"), + "tcp": PortSpec(9933, transport_protocol="TCP") + }, + cmd = exec_command, + entrypoint=["/opt/clover/bin/clover"] + ) + + service_details = plan.add_service(name="clover-node", config=clover_service_config) + + return service_details diff --git a/parachain/litentry.star b/parachain/litentry.star index 46fd4fb..9ad16df 100644 --- a/parachain/litentry.star +++ b/parachain/litentry.star @@ -7,6 +7,7 @@ def run_litentry(plan): "--rpc-methods=unsafe", "--execution=wasm", "--tmp", + "--unsafe-ws-external", "--", "--chain=/app/rococo-local.json", "--execution=wasm" @@ -20,11 +21,9 @@ def run_litentry(plan): "9944": PortSpec(9944, transport_protocol="TCP"), "9933": PortSpec(9933, transport_protocol="TCP") }, - public_ports = { - "9944": PortSpec(9432, transport_protocol="TCP"), - "9933": PortSpec(9431, transport_protocol="TCP") - - }, cmd = exec_command, ) - plan.add_service(name="litentry-node", config=litentry_service_config) + + service_details = plan.add_service(name="litentry-node", config=litentry_service_config) + + return service_details diff --git a/relaychain/relay-chain.star b/relaychain/relay-chain.star index fb97e1a..4c825d5 100644 --- a/relaychain/relay-chain.star +++ b/relaychain/relay-chain.star @@ -24,9 +24,17 @@ def spawn_multiple_relay(plan, count): port = port + count start_relay_chain_local(plan, list[i], port) +def start_relay_chains_local(plan, args): + relay_nodes = args["relaychain"]["nodes"] + relay_detail = {} + for node in relay_nodes: + service_details = start_relay_chain_local(plan, node["name"], node["port"]) + relay_detail["relay_service_" + node["name"]] = service_details + return relay_detail + def start_relay_chain_local(plan, name, port): exec_command = ["bin/sh", "-c", "polkadot --base-path=/data --chain=/app/rococo-local.json --validator --ws-external --rpc-external --rpc-cors=all --name=alice --{0} --rpc-methods=unsafe --execution=wasm".format(name)] - plan.add_service( + service_details = plan.add_service( name = "polkadot-{0}".format(name), config = ServiceConfig( image = "parity/polkadot:v0.9.31", @@ -42,3 +50,4 @@ def start_relay_chain_local(plan, name, port): entrypoint = exec_command, ), ) + return service_details From 0c3dc17ebc538591691eef312a91221a3c19635a Mon Sep 17 00:00:00 2001 From: SHANiTH K K <59169878+shanithkk@users.noreply.github.com> Date: Tue, 31 Oct 2023 18:20:17 +0530 Subject: [PATCH 2/2] feat: implement kurtosis package to run litmus parachain local (#28) * feat: implement kurtosis package to run litmus parachain locally * refactor: change port key to ws and rpc --- parachain/acala.star | 8 +++--- parachain/ajuna.star | 4 +-- parachain/altair.star | 31 +++++++++++----------- parachain/bifrost.star | 4 +-- parachain/centriguge.star | 8 +++--- parachain/encointer.star | 2 +- parachain/frequency.star | 2 +- parachain/integritee.star | 8 +++--- parachain/interlay.star | 19 +++++++------- parachain/karura.star | 26 +++++++++---------- parachain/khala.star | 4 +-- parachain/kilt.star | 36 ++++++++++++-------------- parachain/kylin.star | 2 +- parachain/litentry.star | 54 +++++++++++++++++++++++++++++---------- parachain/manta.star | 4 +-- parachain/moonbeam.star | 8 +++--- parachain/nodle.star | 26 +++++++++---------- parachain/parallel.star | 4 +-- parachain/pendulum.star | 26 +++++++++---------- parachain/polkadex.star | 28 ++++++++++---------- parachain/subsocial.star | 2 +- parachain/zeitgeist.star | 31 +++++++++++----------- 22 files changed, 179 insertions(+), 158 deletions(-) diff --git a/parachain/acala.star b/parachain/acala.star index cadfe30..148e362 100644 --- a/parachain/acala.star +++ b/parachain/acala.star @@ -7,12 +7,12 @@ def run_acala(plan): "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol = "TCP"), - "9933": PortSpec(9933, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol = "TCP"), - "9933": PortSpec(9431, transport_protocol = "TCP"), + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) diff --git a/parachain/ajuna.star b/parachain/ajuna.star index c00aeed..804d401 100644 --- a/parachain/ajuna.star +++ b/parachain/ajuna.star @@ -20,7 +20,7 @@ def run_bajun(plan, args): "/app": "configs", }, ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, cmd = exec_command, ), @@ -48,7 +48,7 @@ def run_ajuna(plan, args): "/app": "configs", }, ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, cmd = exec_command, ), diff --git a/parachain/altair.star b/parachain/altair.star index a93fc2b..a88f04f 100644 --- a/parachain/altair.star +++ b/parachain/altair.star @@ -1,30 +1,29 @@ def run_altair(plan): exec_command = [ - "--chain=altair-local", + "--chain=altair-local", "--rpc-port=9933", - "--rpc-external", - "--rpc-cors=all", - "--rpc-methods=unsafe", - "--execution=wasm", - "--tmp", - "--", - "--chain=/app/rococo-local.json", - "--execution=wasm" + "--rpc-external", + "--rpc-cors=all", + "--rpc-methods=unsafe", + "--execution=wasm", + "--tmp", + "--", + "--chain=/app/rococo-local.json", + "--execution=wasm", ] altair_service_config = ServiceConfig( image = "centrifugeio/centrifuge-chain:test-main-latest", files = { - "/app":"configs" + "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol="TCP"), - "9933": PortSpec(9933, transport_protocol="TCP") + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol="TCP"), - "9933": PortSpec(9431, transport_protocol="TCP") - + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) - plan.add_service(name="altair-node", config=altair_service_config) + plan.add_service(name = "altair-node", config = altair_service_config) diff --git a/parachain/bifrost.star b/parachain/bifrost.star index a8d591b..160c9c8 100644 --- a/parachain/bifrost.star +++ b/parachain/bifrost.star @@ -1,14 +1,14 @@ def run_bifrost(plan): exec_command = ["bin/sh", "-c", "/usr/local/bin/bifrost --base-path=/data --chain=/app/bifrost-local-2001.json --ws-external --rpc-external --rpc-cors=all --name=parachain-2001-0 --collator --rpc-methods=unsafe --force-authoring --execution=wasm --alice --node-key=15f888e12fe354ac310399c7126ff43db1a58453784ea1784e26edc0bee3c965 --listen-addr=/ip4/0.0.0.0/tcp/30333 -- --chain=/app/rococo-local.json --execution=wasm"] plan.add_service( - name = "parachain", + name = "bifrost", config = ServiceConfig( image = "bifrostnetwork/bifrost:bifrost-v0.9.66", files = { "/app": "configs", }, ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, entrypoint = exec_command, ), diff --git a/parachain/centriguge.star b/parachain/centriguge.star index e0c430b..9cb8a2c 100644 --- a/parachain/centriguge.star +++ b/parachain/centriguge.star @@ -16,12 +16,12 @@ def run_centriguge(plan, args): "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol = "TCP"), - "9933": PortSpec(9933, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol = "TCP"), - "9933": PortSpec(9431, transport_protocol = "TCP"), + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) diff --git a/parachain/encointer.star b/parachain/encointer.star index f1169f6..cbcaae0 100644 --- a/parachain/encointer.star +++ b/parachain/encointer.star @@ -12,7 +12,7 @@ def run_encointer(plan, args): "/app": "configs", }, ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, entrypoint = exec_command, ), diff --git a/parachain/frequency.star b/parachain/frequency.star index 05f15cd..6ac8931 100644 --- a/parachain/frequency.star +++ b/parachain/frequency.star @@ -8,7 +8,7 @@ def run_frequency(plan): "/app": "configs", }, ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, entrypoint = exec_command, ), diff --git a/parachain/integritee.star b/parachain/integritee.star index b9c4331..9c9c893 100644 --- a/parachain/integritee.star +++ b/parachain/integritee.star @@ -6,12 +6,12 @@ def run_integritee(plan, args): "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol = "TCP"), - "9933": PortSpec(9933, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol = "TCP"), - "9933": PortSpec(9431, transport_protocol = "TCP"), + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) diff --git a/parachain/interlay.star b/parachain/interlay.star index 619de0e..6704f18 100644 --- a/parachain/interlay.star +++ b/parachain/interlay.star @@ -1,16 +1,15 @@ -def interrelay_run(plan,args): - - exec_command = [ "bin/sh","-c","/usr/local/bin/interbtc-parachain --chain=dev --wasm-execution=compiled --force-authoring --port 30333 --rpc-port 9944 --rpc-external --rpc-cors all --rpc-methods=Unsafe -- --wasm-execution=compiled --chain=/app/rococo-local.json"] +def interrelay_run(plan, args): + exec_command = ["bin/sh", "-c", "/usr/local/bin/interbtc-parachain --chain=dev --wasm-execution=compiled --force-authoring --port 30333 --rpc-port 9944 --rpc-external --rpc-cors all --rpc-methods=Unsafe -- --wasm-execution=compiled --chain=/app/rococo-local.json"] parachain = plan.add_service( - name="interrelay", - config= ServiceConfig( + name = "interrelay", + config = ServiceConfig( image = "interlayhq/interbtc:latest", - files={ - "/app":"configs" + files = { + "/app": "configs", }, ports = { - "parachain" : PortSpec(9944, transport_protocol="TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, - entrypoint=exec_command - ) + entrypoint = exec_command, + ), ) diff --git a/parachain/karura.star b/parachain/karura.star index d967809..bd33664 100644 --- a/parachain/karura.star +++ b/parachain/karura.star @@ -1,14 +1,14 @@ def run_karura(plan): exec_command = [ - "--chain=dev", - "--collator", - "--rpc-external", - "--rpc-cors=all", - "--rpc-methods=unsafe", - "--tmp", - "--", - "--chain=/app/rococo-local.json", - "--execution=wasm" + "--chain=dev", + "--collator", + "--rpc-external", + "--rpc-cors=all", + "--rpc-methods=unsafe", + "--tmp", + "--", + "--chain=/app/rococo-local.json", + "--execution=wasm", ] karura_service_config = ServiceConfig( @@ -17,12 +17,12 @@ def run_karura(plan): "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol = "TCP"), - "9933": PortSpec(9933, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol = "TCP"), - "9933": PortSpec(9431, transport_protocol = "TCP"), + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) diff --git a/parachain/khala.star b/parachain/khala.star index 50f28b9..0bb0ccb 100644 --- a/parachain/khala.star +++ b/parachain/khala.star @@ -9,7 +9,7 @@ def run_khala(plan, args): config = ServiceConfig( image = "phalanetwork/khala-node:latest", ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, files = { "/app": "configs", @@ -29,7 +29,7 @@ def run_phala(plan, args): config = ServiceConfig( image = "phalanetwork/phala-node:latest", ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, files = { "/app": "configs", diff --git a/parachain/kilt.star b/parachain/kilt.star index 66f0360..23bcf4b 100644 --- a/parachain/kilt.star +++ b/parachain/kilt.star @@ -1,33 +1,31 @@ def run_kilt(plan): - exec_command = [ - "--chain=dev", - "--alice", - "--rpc-port=9933", - "--rpc-external", - "--rpc-cors=all", - "--rpc-methods=unsafe", - "--execution=wasm", - "--tmp", - "--", - "--chain=/app/rococo-local.json", - "--execution=wasm" + "--chain=dev", + "--alice", + "--rpc-port=9933", + "--rpc-external", + "--rpc-cors=all", + "--rpc-methods=unsafe", + "--execution=wasm", + "--tmp", + "--", + "--chain=/app/rococo-local.json", + "--execution=wasm", ] kilt_service_config = ServiceConfig( image = "kiltprotocol/kilt-node:latest", files = { - "/app":"config" + "/app": "config", }, ports = { - "9944": PortSpec(9944, transport_protocol="TCP"), - "9933": PortSpec(9933, transport_protocol="TCP") + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol="TCP"), - "9933": PortSpec(9431, transport_protocol="TCP") - + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) - plan.add_service(name="kilt-node", config=kilt_service_config) + plan.add_service(name = "kilt-node", config = kilt_service_config) diff --git a/parachain/kylin.star b/parachain/kylin.star index e55b7fe..fd3b898 100644 --- a/parachain/kylin.star +++ b/parachain/kylin.star @@ -24,7 +24,7 @@ def run_kylin(plan, args): "/app": "configs", }, ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, cmd = exec_command, ), diff --git a/parachain/litentry.star b/parachain/litentry.star index 9ad16df..d3a6a9c 100644 --- a/parachain/litentry.star +++ b/parachain/litentry.star @@ -1,29 +1,55 @@ def run_litentry(plan): exec_command = [ - "--chain=litentry-dev", + "--chain=litentry-dev", "--rpc-port=9933", - "--rpc-external", - "--rpc-cors=all", - "--rpc-methods=unsafe", - "--execution=wasm", - "--tmp", + "--rpc-external", + "--rpc-cors=all", + "--rpc-methods=unsafe", + "--execution=wasm", + "--tmp", "--unsafe-ws-external", - "--", - "--chain=/app/rococo-local.json", - "--execution=wasm" + "--", + "--chain=/app/rococo-local.json", + "--execution=wasm", ] litentry_service_config = ServiceConfig( image = "litentry/litentry-parachain:latest", files = { - "/app":"configs" + "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol="TCP"), - "9933": PortSpec(9933, transport_protocol="TCP") + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, cmd = exec_command, ) - service_details = plan.add_service(name="litentry-node", config=litentry_service_config) + service_details = plan.add_service(name = "litentry-node", config = litentry_service_config) - return service_details + return service_details + +def run_litmus(plan, args): + exec_command = [ + "--chain=litmus-dev", + "--rpc-port=9933", + "--rpc-external", + "--rpc-cors=all", + "--rpc-methods=unsafe", + "--execution=wasm", + "--unsafe-ws-external", + "--tmp", + "--", + "--chain=/app/rococo-local.json", + "--execution=wasm", + ] + plan.add_service(name = "litmus-node", config = ServiceConfig( + image = "litentry/litentry-parachain:latest", + files = { + "/app": "configs", + }, + ports = { + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), + }, + cmd = exec_command, + )) diff --git a/parachain/manta.star b/parachain/manta.star index e0194b5..ba3c530 100644 --- a/parachain/manta.star +++ b/parachain/manta.star @@ -12,7 +12,7 @@ def run_manta(plan, args): "/app": "configs", }, ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, entrypoint = exec_command, ), @@ -32,7 +32,7 @@ def run_calamari(plan, args): "/app": "configs", }, ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, entrypoint = exec_command, ), diff --git a/parachain/moonbeam.star b/parachain/moonbeam.star index 3c1aa01..0c4cd6f 100644 --- a/parachain/moonbeam.star +++ b/parachain/moonbeam.star @@ -14,12 +14,12 @@ def run_moonbeam(plan): "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol = "TCP"), - "9933": PortSpec(9933, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol = "TCP"), - "9933": PortSpec(9431, transport_protocol = "TCP"), + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) diff --git a/parachain/nodle.star b/parachain/nodle.star index b63276f..3d0deeb 100644 --- a/parachain/nodle.star +++ b/parachain/nodle.star @@ -1,14 +1,14 @@ def run_nodle(plan): exec_command = [ - "--chain=local", - "--collator", - "--rpc-external", - "--rpc-cors=all", - "--rpc-methods=unsafe", - "--tmp", - "--", - "--chain=/app/rococo-local.json", - "--execution=wasm" + "--chain=local", + "--collator", + "--rpc-external", + "--rpc-cors=all", + "--rpc-methods=unsafe", + "--tmp", + "--", + "--chain=/app/rococo-local.json", + "--execution=wasm", ] nodle_service_config = ServiceConfig( image = "nodlecode/chain:latest", @@ -16,12 +16,12 @@ def run_nodle(plan): "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol = "TCP"), - "9933": PortSpec(9933, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol = "TCP"), - "9933": PortSpec(9431, transport_protocol = "TCP"), + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) diff --git a/parachain/parallel.star b/parachain/parallel.star index 71ca338..f0971f6 100644 --- a/parachain/parallel.star +++ b/parachain/parallel.star @@ -6,7 +6,7 @@ def run_parallel(plan, args): "--port", "30333", "--rpc-port", - "9944", + "ws", "--rpc-external", "--rpc-cors", "all", @@ -23,7 +23,7 @@ def run_parallel(plan, args): "/app": "configs", }, ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, cmd = exec_command, ), diff --git a/parachain/pendulum.star b/parachain/pendulum.star index 71320dd..d1f8979 100644 --- a/parachain/pendulum.star +++ b/parachain/pendulum.star @@ -1,14 +1,14 @@ def run_pendulum(plan): exec_command = [ - "--chain=dev", - "--collator", - "--rpc-external", - "--rpc-cors=all", - "--rpc-methods=unsafe", - "--tmp", - "--", - "--wasm-execution=compiled", - "--chain=/app/rococo-local.json" + "--chain=dev", + "--collator", + "--rpc-external", + "--rpc-cors=all", + "--rpc-methods=unsafe", + "--tmp", + "--", + "--wasm-execution=compiled", + "--chain=/app/rococo-local.json", ] pendulum_service_config = ServiceConfig( image = "pendulumchain/pendulum-collator:latest", @@ -16,12 +16,12 @@ def run_pendulum(plan): "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol = "TCP"), - "9933": PortSpec(9933, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol = "TCP"), - "9933": PortSpec(9431, transport_protocol = "TCP"), + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) diff --git a/parachain/polkadex.star b/parachain/polkadex.star index 864def8..559cd1e 100644 --- a/parachain/polkadex.star +++ b/parachain/polkadex.star @@ -1,16 +1,16 @@ def run_polkadex(plan): exec_command = [ - "--chain=dev", - "--collator", - "--rpc-external", - "--rpc-cors=all", - "--rpc-methods=unsafe", + "--chain=dev", + "--collator", + "--rpc-external", + "--rpc-cors=all", + "--rpc-methods=unsafe", "--tmp", - "--", - "--execution=wasm", - "--chain=/app/rococo-local.json", - "--port=30345", - "--ws-port=9979" + "--", + "--execution=wasm", + "--chain=/app/rococo-local.json", + "--port=30345", + "--ws-port=9979", ] polkadex_service_config = ServiceConfig( @@ -19,12 +19,12 @@ def run_polkadex(plan): "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol = "TCP"), - "9933": PortSpec(9933, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol = "TCP"), - "9933": PortSpec(9431, transport_protocol = "TCP"), + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) diff --git a/parachain/subsocial.star b/parachain/subsocial.star index 424e8a9..aba5223 100644 --- a/parachain/subsocial.star +++ b/parachain/subsocial.star @@ -12,7 +12,7 @@ def run_subsocial(plan, args): "/app": "configs", }, ports = { - "parachain": PortSpec(9944, transport_protocol = "TCP"), + "ws": PortSpec(9944, transport_protocol = "TCP"), }, entrypoint = exec_command, ), diff --git a/parachain/zeitgeist.star b/parachain/zeitgeist.star index 7af3091..b7f9754 100644 --- a/parachain/zeitgeist.star +++ b/parachain/zeitgeist.star @@ -1,30 +1,29 @@ def run_zeitgeist(plan): exec_command = [ - "--chain=dev", + "--chain=dev", "--rpc-port=9933", - "--rpc-external", - "--rpc-cors=all", - "--rpc-methods=unsafe", - "--execution=wasm", - "--tmp", - "--", - "--chain=/app/rococo-local.json", - "--execution=wasm" + "--rpc-external", + "--rpc-cors=all", + "--rpc-methods=unsafe", + "--execution=wasm", + "--tmp", + "--", + "--chain=/app/rococo-local.json", + "--execution=wasm", ] zeitgeist_service_config = ServiceConfig( image = "zeitgeistpm/zeitgeist-node-parachain", files = { - "/app":"configs" + "/app": "configs", }, ports = { - "9944": PortSpec(9944, transport_protocol="TCP"), - "9933": PortSpec(9933, transport_protocol="TCP") + "ws": PortSpec(9944, transport_protocol = "TCP"), + "rpc": PortSpec(9933, transport_protocol = "TCP"), }, public_ports = { - "9944": PortSpec(9432, transport_protocol="TCP"), - "9933": PortSpec(9431, transport_protocol="TCP") - + "ws": PortSpec(9432, transport_protocol = "TCP"), + "rpc": PortSpec(9431, transport_protocol = "TCP"), }, cmd = exec_command, ) - plan.add_service(name="zeitgeist-node", config=zeitgeist_service_config) + plan.add_service(name = "zeitgeist-node", config = zeitgeist_service_config)