refactor: entry-points, service config commands for parachains and im…

…age.star (#37) * refactor: change entrypoints inside ServiceConfig * refactor: refactor image.star, add entrypoint and base * refactor: refactor run function in main.star * refactor: remove logs folder --------- Co-authored-by: shreyasbhat0 <[email protected]>
HugoByte · Nov 3, 2023 · ec618bc · ec618bc
1 parent 399b7ed
commit ec618bc
Show file tree

Hide file tree

Showing 20 changed files with 236 additions and 79 deletions.
diff --git a/parachain/acala.star b/parachain/acala.star
@@ -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)
diff --git a/parachain/ajuna.star b/parachain/ajuna.star
@@ -23,6 +23,7 @@ def run_bajun(plan, args):
                 "ws": PortSpec(9944, transport_protocol = "TCP"),
             },
             cmd = exec_command,
+            entrypoint= ["/usr/local/bin/ajuna"]
         ),
     )
 
@@ -51,5 +52,6 @@ def run_ajuna(plan, args):
                 "ws": PortSpec(9944, transport_protocol = "TCP"),
             },
             cmd = exec_command,
+            entrypoint =["/usr/local/bin/ajuna"]
         )
     )
diff --git a/parachain/altair.star b/parachain/altair.star
@@ -5,6 +5,7 @@ def run_altair(plan):
         "--rpc-external",
         "--rpc-cors=all",
         "--rpc-methods=unsafe",
+        "--unsafe-ws-external",
         "--execution=wasm",
         "--tmp",
         "--",
@@ -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)
diff --git a/parachain/centriguge.star → parachain/centrifuge.star b/parachain/centriguge.star → parachain/centrifuge.star
@@ -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",
@@ -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)
diff --git a/parachain/integritee.star b/parachain/integritee.star
@@ -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)
diff --git a/parachain/karura.star b/parachain/karura.star
@@ -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)
diff --git a/parachain/kilt.star b/parachain/kilt.star
@@ -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",
@@ -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)
diff --git a/parachain/kintsungi.star b/parachain/kintsungi.star
@@ -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"
@@ -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"]
         )  
     )
 

diff --git a/parachain/kylin.star b/parachain/kylin.star
@@ -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",
@@ -27,5 +28,6 @@ def run_kylin(plan, args):
                 "ws": PortSpec(9944, transport_protocol = "TCP"),
             },
             cmd = exec_command,
+            entrypoint = ["/usr/local/bin/kylin-collator"]
         ),
     )
diff --git a/parachain/litentry.star b/parachain/litentry.star
@@ -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)
@@ -52,4 +53,5 @@ def run_litmus(plan, args):
             "rpc": PortSpec(9933, transport_protocol = "TCP"),
         },
         cmd = exec_command,
+        entrypoint = ["/usr/local/bin/litentry-collator"] 
     ))
diff --git a/parachain/mangata.star b/parachain/mangata.star
@@ -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)
diff --git a/parachain/moonbeam.star b/parachain/moonbeam.star
@@ -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",
@@ -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)
 
@@ -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",
@@ -44,4 +46,5 @@ def run_moonriver(plan, args):
             "9944": PortSpec(9944, transport_protocol = "TCP"),
         },
         cmd = exec_command,
+        entrypoint = ["/moonbeam/moonbeam"]
     ))
diff --git a/parachain/nodle.star b/parachain/nodle.star
@@ -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",
@@ -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)
diff --git a/parachain/parallel.star b/parachain/parallel.star
@@ -26,5 +26,7 @@ def run_parallel(plan, args):
                 "ws": PortSpec(9944, transport_protocol = "TCP"),
             },
             cmd = exec_command,
+            entrypoint = ["/parallel/.entrypoint.sh"]
         ),
+
     )
diff --git a/parachain/pendulum.star b/parachain/pendulum.star
@@ -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",
@@ -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)
diff --git a/parachain/polkadex.star b/parachain/polkadex.star
@@ -5,6 +5,7 @@ def run_polkadex(plan):
         "--rpc-external",
         "--rpc-cors=all",
         "--rpc-methods=unsafe",
+        "--unsafe-ws-external",
         "--tmp",
         "--",
         "--execution=wasm",
@@ -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)
diff --git a/parachain/robonomics.star b/parachain/robonomics.star
@@ -1,6 +1,5 @@
 def run_robonomics(plan):
     exec_command = [
-        "robonomics",
         "--chain=dev",
         "--collator",
         "--rpc-external",
@@ -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)