fix: explicitly set client contexts

src/cl/cl_context.star

@@ -4,8 +4,8 @@ def new_cl_context(
     ip_addr,
     http_port,
     beacon_http_url,
-    cl_nodes_metrics_info,
-    beacon_service_name,
+    cl_nodes_metrics_info=None,
+    beacon_service_name="",
     beacon_grpc_url="",
     multiaddr="",
     peer_id="",

src/cl/grandine/grandine_launcher.star

@@ -167,13 +167,13 @@ def launch(
     )
     nodes_metrics_info = [beacon_node_metrics_info]
     return cl_context.new_cl_context(
-        "grandine",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
+        client_name="grandine",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
         multiaddr=beacon_multiaddr,
         peer_id=beacon_peer_id,
         snooper_enabled=snooper_enabled,

src/cl/lighthouse/lighthouse_launcher.star

@@ -184,17 +184,17 @@ def launch(
     )
     nodes_metrics_info = [beacon_node_metrics_info]
     return cl_context.new_cl_context(
-        "lighthouse",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
-        beacon_multiaddr,
-        beacon_peer_id,
-        snooper_enabled,
-        snooper_engine_context,
+        client_name="lighthouse",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
+        multiaddr=beacon_multiaddr,
+        peer_id=beacon_peer_id,
+        snooper_enabled=snooper_enabled,
+        snooper_engine_context=snooper_engine_context,
         validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
         if node_keystore_files
         else "",

src/cl/lodestar/lodestar_launcher.star

@@ -182,17 +182,17 @@ def launch(
     nodes_metrics_info = [beacon_node_metrics_info]
 
     return cl_context.new_cl_context(
-        "lodestar",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
-        beacon_multiaddr,
-        beacon_peer_id,
-        snooper_enabled,
-        snooper_engine_context,
+        client_name="lodestar",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
+        multiaddr=beacon_multiaddr,
+        peer_id=beacon_peer_id,
+        snooper_enabled=snooper_enabled,
+        snooper_engine_context=snooper_engine_context,
         validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
         if node_keystore_files
         else "",

src/cl/nimbus/nimbus_launcher.star

@@ -178,17 +178,17 @@ def launch(
     nodes_metrics_info = [nimbus_node_metrics_info]
 
     return cl_context.new_cl_context(
-        "nimbus",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
-        beacon_multiaddr,
-        beacon_peer_id,
-        snooper_enabled,
-        snooper_engine_context,
+        client_name="nimbus",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
+        multiaddr=beacon_multiaddr,
+        peer_id=beacon_peer_id,
+        snooper_enabled=snooper_enabled,
+        snooper_engine_context=snooper_engine_context,
         validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
         if node_keystore_files
         else "",

src/cl/prysm/prysm_launcher.star

@@ -163,18 +163,18 @@ def launch(
     nodes_metrics_info = [beacon_node_metrics_info]
 
     return cl_context.new_cl_context(
-        "prysm",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
-        beacon_grpc_url,
-        beacon_multiaddr,
-        beacon_peer_id,
-        snooper_enabled,
-        snooper_engine_context,
+        client_name="prysm",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
+        beacon_grpc_url=beacon_grpc_url,
+        multiaddr=beacon_multiaddr,
+        peer_id=beacon_peer_id,
+        snooper_enabled=snooper_enabled,
+        snooper_engine_context=snooper_engine_context,
         validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
         if node_keystore_files
         else "",

src/cl/teku/teku_launcher.star

@@ -172,13 +172,13 @@ def launch(
     nodes_metrics_info = [beacon_node_metrics_info]
 
     return cl_context.new_cl_context(
-        "teku",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
+        client_name="teku",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
         multiaddr=beacon_multiaddr,
         peer_id=beacon_peer_id,
         snooper_enabled=snooper_enabled,

src/el/besu/besu_launcher.star

@@ -124,17 +124,16 @@ def launch(
     ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
 
     return el_context.new_el_context(
-        "besu",
-        "",  # besu has no ENR
-        enode,
-        service.ip_address,
-        RPC_PORT_NUM,
-        WS_PORT_NUM,
-        ENGINE_HTTP_RPC_PORT_NUM,
-        http_url,
-        ws_url,
-        service_name,
-        [besu_metrics_info],
+        client_name="besu",
+        enode=enode,
+        ip_addr=service.ip_address,
+        rpc_port_num=RPC_PORT_NUM,
+        ws_port_num=WS_PORT_NUM,
+        engine_rpc_port_num=ENGINE_HTTP_RPC_PORT_NUM,
+        rpc_http_url=http_url,
+        ws_url=ws_url,
+        service_name=service_name,
+        el_metrics_info=[besu_metrics_info],
     )
 
 

src/el/el_context.star

@@ -1,26 +1,27 @@
 def new_el_context(
     client_name,
-    enr,
     enode,
     ip_addr,
     rpc_port_num,
     ws_port_num,
     engine_rpc_port_num,
     rpc_http_url,
-    ws_url,
+    ws_url="",
+    enr="",
     service_name="",
     el_metrics_info=None,
 ):
     return struct(
         service_name=service_name,
         client_name=client_name,
-        enr=enr,
         enode=enode,
         ip_addr=ip_addr,
         rpc_port_num=rpc_port_num,
         ws_port_num=ws_port_num,
         engine_rpc_port_num=engine_rpc_port_num,
         rpc_http_url=rpc_http_url,
         ws_url=ws_url,
+        enr=enr,
+        service_name=service_name,
         el_metrics_info=el_metrics_info,
     )

src/el/erigon/erigon_launcher.star

@@ -122,17 +122,17 @@ def launch(
     ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
 
     return el_context.new_el_context(
-        "erigon",
-        enr,
-        enode,
-        service.ip_address,
-        WS_RPC_PORT_NUM,
-        WS_RPC_PORT_NUM,
-        ENGINE_RPC_PORT_NUM,
-        http_url,
-        ws_url,
-        service_name,
-        [erigon_metrics_info],
+        client_name="erigon",
+        enode=enode,
+        ip_addr=service.ip_address,
+        rpc_port_num=WS_RPC_PORT_NUM,
+        ws_port_num=WS_RPC_PORT_NUM,
+        engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
+        rpc_http_url=http_url,
+        ws_url=ws_url,
+        enr=enr,
+        service_name=service_name,
+        el_metrics_info=[erigon_metrics_info],
     )
 
 

src/el/ethereumjs/ethereumjs_launcher.star

@@ -121,17 +121,16 @@ def launch(
     ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
 
     return el_context.new_el_context(
-        "ethereumjs",
-        "",  # ethereumjs has no enr
-        enode,
-        service.ip_address,
-        RPC_PORT_NUM,
-        WS_PORT_NUM,
-        ENGINE_RPC_PORT_NUM,
-        http_url,
-        ws_url,
-        service_name,
-        [ethjs_metrics_info],
+        client_name="ethereumjs",
+        enode=enode,
+        ip_addr=service.ip_address,
+        rpc_port_num=RPC_PORT_NUM,
+        ws_port_num=WS_PORT_NUM,
+        engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
+        rpc_http_url=http_url,
+        ws_url=ws_url,
+        service_name=service_name,
+        el_metrics_info=[ethjs_metrics_info],
     )
 
 

src/el/geth/geth_launcher.star

@@ -133,17 +133,17 @@ def launch(
     ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
 
     return el_context.new_el_context(
-        "geth",
-        enr,
-        enode,
-        service.ip_address,
-        RPC_PORT_NUM,
-        WS_PORT_NUM,
-        ENGINE_RPC_PORT_NUM,
-        http_url,
-        ws_url,
-        service_name,
-        [geth_metrics_info],
+        client_name="geth",
+        enode=enode,
+        ip_addr=service.ip_address,
+        rpc_port_num=RPC_PORT_NUM,
+        ws_port_num=WS_PORT_NUM,
+        engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
+        rpc_http_url=http_url,
+        ws_url=ws_url,
+        enr=enr,
+        service_name=service_name,
+        el_metrics_info=[geth_metrics_info],
     )
 
 

src/el/nethermind/nethermind_launcher.star

@@ -119,18 +119,16 @@ def launch(
     ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
 
     return el_context.new_el_context(
-        "nethermind",
-        "",  # nethermind has no ENR in the eth2-merge-kurtosis-module either
-        # Nethermind node info endpoint doesn't return ENR field https://docs.nethermind.io/nethermind/ethereum-client/json-rpc/admin
-        enode,
-        service.ip_address,
-        RPC_PORT_NUM,
-        WS_PORT_NUM,
-        ENGINE_RPC_PORT_NUM,
-        http_url,
-        ws_url,
-        service_name,
-        [nethermind_metrics_info],
+        client_name="nethermind",
+        enode=enode,
+        ip_addr=service.ip_address,
+        rpc_port_num=RPC_PORT_NUM,
+        ws_port_num=WS_PORT_NUM,
+        engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
+        rpc_http_url=http_url,
+        ws_url=ws_url,
+        service_name=service_name,
+        el_metrics_info=[nethermind_metrics_info],
     )
 
 

src/el/nimbus-eth1/nimbus_launcher.star

@@ -120,17 +120,16 @@ def launch(
     ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
 
     return el_context.new_el_context(
-        "nimbus",
-        "",  # nimbus has no enr
-        enode,
-        service.ip_address,
-        WS_RPC_PORT_NUM,
-        WS_RPC_PORT_NUM,
-        ENGINE_RPC_PORT_NUM,
-        http_url,
-        ws_url,
-        service_name,
-        [nimbus_metrics_info],
+        client_name="nimbus",
+        enode=enode,
+        ip_addr=service.ip_address,
+        rpc_port_num=constants.RPC_PORT_NUM,
+        ws_port_num=constants.WS_PORT_NUM,
+        engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
+        rpc_http_url=http_url,
+        ws_url=ws_url,
+        service_name=service_name,
+        el_metrics_info=[nimbus_metrics_info],
     )