Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: refactor entry-points and commands inside ServiceConfig of parachains and image.star #37

Merged
merged 5 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion local.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

"para": {
"acala": {
"id": 2000,
"nodes": [
{
"name": "alice",
Expand Down
193 changes: 193 additions & 0 deletions logs/divelog.log

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions logs/error.log
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"level":"fatal","msg":"The Kurtosis Engine Error: An error occurred validating the Kurtosis engine API version\n --- at /root/go/pkg/mod/github.com/kurtosis-tech/kurtosis/api/[email protected]/engine/lib/kurtosis_context/kurtosis_context.go:83 (NewKurtosisContextFromLocalEngine) ---\nCaused by: An API version mismatch was detected between the running engine version '0.85.0' and the engine version this Kurtosis SDK library expects, '0.84.8'. You should:\n 1) upgrade your Kurtosis CLI to latest using the instructions at https://docs.kurtosis.com/upgrade\n 2) use the Kurtosis CLI to restart your engine via 'kurtosis engine restart'\n 3) upgrade your Kurtosis SDK library using the instructions at https://github.com/kurtosis-tech/kurtosis-engine-api-lib\n --- at /root/go/pkg/mod/github.com/kurtosis-tech/kurtosis/api/[email protected]/engine/lib/kurtosis_context/kurtosis_context.go:486 (validateEngineApiVersion) ---","time":"2023-11-02 17:22:29"}
Mr-Nobody21 marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion main.star
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ def run(plan, args):
else:
relay_chain.start_relay_chain(plan, args)

return service_details
return service_details
22 changes: 16 additions & 6 deletions parachain/acala.star
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
def run_acala(plan):
exec_command = ["--chain=/app/acala-raw.json", "--collator", "--rpc-external", "--rpc-cors=all", "--rpc-methods=unsafe", "--tmp", "--instant-sealing"]
exec_command = [
"--chain=dev",
"--collator",
"--rpc-cors=all",
"--rpc-port=9933",
"--rpc-methods=unsafe",
"--unsafe-rpc-external",
"--unsafe-ws-external",
"--tmp",
"--execution=wasm",
"--",
"--chain=/app/rococo-local.json",
"--execution=wasm"
]

acala_service_config = ServiceConfig(
image = "acala/acala-node:latest",
image = "acala/mandala-node:latest",
files = {
"/app": "configs",
},
ports = {
"ws": PortSpec(9944, transport_protocol = "TCP"),
"rpc": PortSpec(9933, transport_protocol = "TCP"),
},
public_ports = {
"ws": PortSpec(9432, transport_protocol = "TCP"),
"rpc": PortSpec(9431, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint= ["/usr/local/bin/acala"]
)
plan.add_service(name = "acala-node", config = acala_service_config)
2 changes: 2 additions & 0 deletions parachain/ajuna.star
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def run_bajun(plan, args):
"ws": PortSpec(9944, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint= ["/usr/local/bin/ajuna"]
),
)

Expand Down Expand Up @@ -51,5 +52,6 @@ def run_ajuna(plan, args):
"ws": PortSpec(9944, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint =["/usr/local/bin/ajuna"]
)
)
2 changes: 2 additions & 0 deletions parachain/altair.star
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ def run_altair(plan):
"--rpc-external",
"--rpc-cors=all",
"--rpc-methods=unsafe",
"--unsafe-ws-external",
"--execution=wasm",
"--tmp",
"--",
Expand All @@ -25,5 +26,6 @@ def run_altair(plan):
"rpc": PortSpec(9431, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/centrifuge-chain"]
)
plan.add_service(name = "altair-node", config = altair_service_config)
8 changes: 3 additions & 5 deletions parachain/centriguge.star → parachain/centrifuge.star
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
def run_centriguge(plan, args):
def run_centrifuge(plan):
exec_command = [
"--chain=/app/centrifuge-raw-spec.json",
"--collator",
"--rpc-external",
"--rpc-cors=all",
"--rpc-methods=unsafe",
"--unsafe-ws-external",
"--tmp",
"--",
"--chain=/app/rococo-local.json",
Expand All @@ -19,10 +20,7 @@ def run_centriguge(plan, args):
"ws": PortSpec(9944, transport_protocol = "TCP"),
"rpc": PortSpec(9933, transport_protocol = "TCP"),
},
public_ports = {
"ws": PortSpec(9432, transport_protocol = "TCP"),
"rpc": PortSpec(9431, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/centrifuge-chain"]
)
plan.add_service(name = "centrifuge-node", config = centifuge_service_config)
1 change: 1 addition & 0 deletions parachain/integritee.star
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ def run_integritee(plan, args):
"rpc": PortSpec(9431, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/integritee-collator"]
)
plan.add_service(name = "intigreeti-node", config = integritee_service_config)
9 changes: 3 additions & 6 deletions parachain/karura.star
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@ def run_karura(plan):
"/app": "configs",
},
ports = {
"ws": PortSpec(9944, transport_protocol = "TCP"),
"rpc": PortSpec(9933, transport_protocol = "TCP"),
},
public_ports = {
"ws": PortSpec(9432, transport_protocol = "TCP"),
"rpc": PortSpec(9431, transport_protocol = "TCP"),
"rpc": PortSpec(9944, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/acala"]

)
plan.add_service(name = "karura-node", config = karura_service_config)
11 changes: 4 additions & 7 deletions parachain/kilt.star
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ def run_kilt(plan):
"--rpc-port=9933",
"--rpc-external",
"--rpc-cors=all",
"--unsafe-ws-external",
"--rpc-methods=unsafe",
"--execution=wasm",
"--tmp",
Expand All @@ -16,16 +17,12 @@ def run_kilt(plan):
kilt_service_config = ServiceConfig(
image = "kiltprotocol/kilt-node:latest",
files = {
"/app": "config",
"/app": "configs",
},
ports = {
"ws": PortSpec(9944, transport_protocol = "TCP"),
"rpc": PortSpec(9933, transport_protocol = "TCP"),
},
public_ports = {
"ws": PortSpec(9432, transport_protocol = "TCP"),
"rpc": PortSpec(9431, transport_protocol = "TCP"),
"ws": PortSpec(9944, transport_protocol = "TCP")
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/node-executable"]
)
plan.add_service(name = "kilt-node", config = kilt_service_config)
12 changes: 7 additions & 5 deletions parachain/kintsungi.star
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
def run_kintsungi(plan,args):
def run_kintsungi(plan):

exec_command = [
"--chain=dev",
"--wasm-execution=compiled",
"--force-authoring",
"--port 30333",
"--rpc-port 9944",
"--port=30333",
"--rpc-port=9944",
"--rpc-external",
"--rpc-cors all",
"--rpc-cors=all",
"--rpc-methods=Unsafe",
"--unsafe-ws-external",
"--",
"--wasm-execution=compiled",
"--chain=/app/rococo-local.json"
Expand All @@ -23,7 +24,8 @@ def run_kintsungi(plan,args):
ports = {
"ws" : PortSpec(9944, transport_protocol="TCP"),
},
cmd=exec_command
cmd=exec_command,
entrypoint= ["tini", "--", "/usr/local/bin/interbtc-parachain"]
)
)

Expand Down
4 changes: 3 additions & 1 deletion parachain/kylin.star
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
def run_kylin(plan, args):
def run_kylin(plan):
exec_command = [
"--base-path=/kylin/data",
"--chain=dev",
"--ws-external",
"--rpc-external",
"--rpc-cors=all",
"--unsafe-ws-external",
"--name=parachain-2010-0",
"--collator",
"--rpc-methods=unsafe",
Expand All @@ -27,5 +28,6 @@ def run_kylin(plan, args):
"ws": PortSpec(9944, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/kylin-collator"]
),
)
2 changes: 2 additions & 0 deletions parachain/litentry.star
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def run_litentry(plan):
"rpc": PortSpec(9933, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/litentry-collator"]
)

service_details = plan.add_service(name = "litentry-node", config = litentry_service_config)
Expand Down Expand Up @@ -52,4 +53,5 @@ def run_litmus(plan, args):
"rpc": PortSpec(9933, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/litentry-collator"]
))
1 change: 1 addition & 0 deletions parachain/mangata.star
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ def run_mangata(plan):
"tcp": PortSpec(9933, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/mangata/node"]
)
plan.add_service(name = "mangata-node", config = mangata_service_config)
13 changes: 8 additions & 5 deletions parachain/moonbeam.star
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ def run_moonbeam(plan):
"--rpc-methods=unsafe",
"--tmp",
"--unsafe-rpc-external",
"--",
"--wasm-execution=compiled",
"--chain=/app/rococo-local.json"
]
moonbeam_service_config = ServiceConfig(
image = "moonbeamfoundation/moonbeam:sha-32933811",
Expand All @@ -15,13 +18,9 @@ def run_moonbeam(plan):
},
ports = {
"ws": PortSpec(9944, transport_protocol = "TCP"),
"rpc": PortSpec(9933, transport_protocol = "TCP"),
},
public_ports = {
"ws": PortSpec(9432, transport_protocol = "TCP"),
"rpc": PortSpec(9431, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/moonbeam/moonbeam"]
)
plan.add_service(name = "acala-node", config = moonbeam_service_config)

Expand All @@ -34,6 +33,9 @@ def run_moonriver(plan, args):
"--rpc-methods=unsafe",
"--tmp",
"--unsafe-rpc-external",
"--",
"--wasm-execution=compiled",
"--chain=/app/rococo-local.json"
]
plan.add_service(name = "moonriver-node", config = ServiceConfig(
image = "moonbeamfoundation/moonbeam:sha-519bd694",
Expand All @@ -44,4 +46,5 @@ def run_moonriver(plan, args):
"9944": PortSpec(9944, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/moonbeam/moonbeam"]
))
2 changes: 2 additions & 0 deletions parachain/nodle.star
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ def run_nodle(plan):
"--rpc-external",
"--rpc-cors=all",
"--rpc-methods=unsafe",
"--unsafe-ws-external",
"--tmp",
"--",
"--chain=/app/rococo-local.json",
Expand All @@ -24,5 +25,6 @@ def run_nodle(plan):
"rpc": PortSpec(9431, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["nodle-parachain"]
)
plan.add_service(name = "nodle-node", config = nodle_service_config)
2 changes: 1 addition & 1 deletion parachain/parachain.star
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
def run(plan, args):
plan.print("hello")
plan.print("hello")
2 changes: 2 additions & 0 deletions parachain/parallel.star
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,7 @@ def run_parallel(plan, args):
"ws": PortSpec(9944, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/parallel/.entrypoint.sh"]
),

)
8 changes: 3 additions & 5 deletions parachain/pendulum.star
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ def run_pendulum(plan):
"--rpc-external",
"--rpc-cors=all",
"--rpc-methods=unsafe",
"--tmp",
"--unsafe-ws-external",
"--tmp",
"--",
"--wasm-execution=compiled",
"--chain=/app/rococo-local.json",
Expand All @@ -19,10 +20,7 @@ def run_pendulum(plan):
"ws": PortSpec(9944, transport_protocol = "TCP"),
"rpc": PortSpec(9933, transport_protocol = "TCP"),
},
public_ports = {
"ws": PortSpec(9432, transport_protocol = "TCP"),
"rpc": PortSpec(9431, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/pendulum-collator"]
)
plan.add_service(name = "pendulum-node", config = pendulum_service_config)
2 changes: 2 additions & 0 deletions parachain/polkadex.star
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ def run_polkadex(plan):
"--rpc-external",
"--rpc-cors=all",
"--rpc-methods=unsafe",
"--unsafe-ws-external",
"--tmp",
"--",
"--execution=wasm",
Expand All @@ -27,5 +28,6 @@ def run_polkadex(plan):
"rpc": PortSpec(9431, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/parachain-polkadex-node"]
)
plan.add_service(name = "acala-node", config = polkadex_service_config)
2 changes: 1 addition & 1 deletion parachain/robonomics.star
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
def run_robonomics(plan):
exec_command = [
"robonomics",
"--chain=dev",
"--collator",
"--rpc-external",
Expand All @@ -22,5 +21,6 @@ def run_robonomics(plan):
"tcp": PortSpec(9933, transport_protocol = "TCP"),
},
cmd = exec_command,
entrypoint = ["/usr/local/bin/robonomics"]
)
plan.add_service(name = "robonomics-node", config = robonomics_service_config)
Loading