Merge pull request #162 from HugoByte/refactor-service-config-develop…

…ment

fix: fix issue when the node type is anything which is not valid the still node in getting started as full node

main.star

@@ -4,6 +4,7 @@ package = import_module("./package_io/build-spec.star")
 promethues = import_module("./package_io/promethues.star")
 grafana = import_module("./package_io/grafana.star")
 explorer = import_module("./package_io/polkadot_js_app.star")
+utils = import_module("./package_io/utils.star")
 
 def run(plan, args):
     """
@@ -31,6 +32,9 @@ def run_polkadot_setup(plan, args):
     Returns:
         dict: Service details containing information about relay chains, parachains, and Prometheus.
     """
+
+    utils.check_config_validity(plan, args)
+
     plan.upload_files(src = "./parachain/static_files/configs", name = "configs")
     plan.upload_files(src = "./parachain/static_files/javascript", name = "javascript")
 

package_io/constant.star

@@ -5,7 +5,7 @@ CURL_JQ_IMAGE = "badouralix/curl-jq"
 NODE_IMAGE = "hugobyte/parachain-node-modules"
 PARA_SLOT_REGISTER_SERVICE_NAME = "para-slot-registration"
 BINARY_COMMAND_CHAINS = ["manta", "khala", "phala", "clover", "calamari", "subzero", "robonomics"]
-NO_WS_PORT = ["acala", "frequency", "moonbeam", "karura", "ajuna", "bajun", "centrifuge", "moonsama", "encointer", "moonriver", "altair", "mangata"]
+NO_WS_PORT = ["acala", "frequency", "moonbeam", "karura", "ajuna", "bajun", "centrifuge", "moonsama", "encointer", "moonriver", "altair", "mangata", "khala", "phala", "turing"]
 
 DIFFERENT_IMAGES_FOR_MAINNET = {
     "centrifuge": "centrifugeio/centrifuge-chain:main-latest",

package_io/utils.star

@@ -52,3 +52,22 @@ def get_service_url(protocol ,ip_address, ports):
     url = "{0}://{1}:{2}".format(protocol, ip_address, ports)
     return url
 
+
+def check_config_validity(plan, args):
+    if len(args["relaychain"]) != 0:
+        for node in args["relaychain"]["nodes"]:
+            if len(node) != 0:
+                if node["node-type"] in ["validator",  "full"]:
+                    plan.print("config for relaynodes is valid")
+                else:
+                    return fail("relaychain node-type can be only validator/full")
+
+    if len(args["para"]) != 0:
+        for para in args["para"]:
+            if len(para["nodes"]) != 0:
+                for node in para["nodes"]:
+                    if node["node-type"] in ["validator",  "full", "collator"]:
+                            plan.print("config for parachain is valid")
+                    else:
+                        return fail("parachain node-type can be only validator/full/collator")
+

parachain/parachain.star

@@ -82,7 +82,7 @@ def start_local_parachain_node(plan, args, parachain_config, para_id):
         parachain_detail["prometheus_port"] = parachain_spawn_detail.ports["metrics"].number
         parachain_detail["ip_address"] = parachain_spawn_detail.ip_address
         parachain_detail["prometheus"] = node["prometheus"]
-        parachain_detail["node"] = node["node-type"]
+        parachain_detail["node-type"] = node["node-type"]
         parachain_final[parachain_spawn_detail.name] = parachain_detail
     return parachain_final
 
@@ -202,7 +202,7 @@ def run_testnet_mainnet(plan, parachain, args):
             node_info["ip_address"] = node_details.ip_address
             node_info["prometheus_port"] = node_details.ports["metrics"].number
             node_info["prometheus"] = node["prometheus"]
-            node_info["node"] = node["node-type"]
+            node_info["node-type"] = node["node-type"]
             final_parachain_info[node_details.name] = node_info
 
         else:
@@ -215,6 +215,6 @@ def run_testnet_mainnet(plan, parachain, args):
             node_info["ip_address"] = node_details.ip_address
             node_info["prometheus_port"] = node_details.ports["metrics"].number
             node_info["prometheus"] = node["prometheus"]
-            node_info["node"] = node["node-type"]
+            node_info["node-type"] = node["node-type"]
             final_parachain_info[node_details.name] = node_info
     return final_parachain_info

relaychain/relay-chain.star

@@ -45,6 +45,7 @@ def start_relay_chain(plan, args):
         relay_node_details["prometheus_port"] = service_details.ports["metrics"].number
         relay_node_details["prometheus"] = relay_node["prometheus"]
         relay_node_details["ip_address"] = service_details.ip_address
+        relay_node_details["node-type"] = relay_node["node-type"]
         final_details[service_details.name] = relay_node_details
 
     return final_details
@@ -116,6 +117,7 @@ def start_relay_chains_local(plan, args):
         relay_detail["prometheus_port"] = service_details.ports["metrics"].number
         relay_detail["prometheus"] = node["prometheus"]
         relay_detail["ip_address"] = service_details.ip_address
+        relay_detail["node-type"] = node["node-type"]
         final_details[service_details.name] = relay_detail
         prometheus_port = prometheus_port + 1