Extract wait to custom file

src/participant_network/cl/cl_node_health_checker.star

@@ -6,4 +6,4 @@ def wait_for_healthy(service_id, port_id):
         content_type = "application/json",
         port_id = port_id
     )
-	return wait(recipe, "code", "IN", [200, 206, 503])
+	return wait(recipe, "code", "IN", [200, 206, 503])
\ No newline at end of file

src/participant_network/el/besu/besu_launcher.star

 shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star")
 parse_input = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/parse_input.star")
 el_client_context = import_module("github.com/kurtosis-tech/eth2-package/src/participant_network/el/el_client_context.star")
-
+el_admin_node_info = import_module("github.com/kurtosis-tech/eth2-package/src/participant_network/el/el_admin_node_info.star")
 package_io = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/constants.star")
 
 # The dirpath of the execution data directory on the client container
@@ -60,23 +60,12 @@ def launch(
 
 	service = add_service(service_id, config)
 
-	result_recipe = struct(
-		service_id = service_id,
-		method= "POST",
-		endpoint = "",
-		body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}',
-		content_type = "application/json",
-		port_id = RPC_PORT_ID,
-		extract = {
-			"enode": ".result.enode",
-		}
-	)
-	response = wait(result_recipe, "extract.enode", "!=", "")
+	enode, enr = el_admin_node_info.get_enode_enr_for_node(service_id, RPC_PORT_ID)
 
 	return el_client_context.new_el_client_context(
 		"besu",
 		"", # besu has no ENR
-		response["extract.enode"],
+		enode,
 		service.ip_address,
 		RPC_PORT_NUM,
 		WS_PORT_NUM,

src/participant_network/el/el_admin_node_info.star

+
+def get_enode_enr_for_node(service_id, port_id):
+    recipe = struct(
+        service_id = service_id,
+        method= "POST",
+        endpoint = "",
+        body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}',
+        content_type = "application/json",
+        port_id = port_id,
+        extract = {
+            "enode": ".result.enode",
+			"enr": ".result.enr",
+        }
+    )
+    response = wait(recipe, "extract.enode", "!=", "")
+    return (response["extract.enode"], response["extract.enr"])
\ No newline at end of file

src/participant_network/el/erigon/erigon_launcher.star

 shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star")
 parse_input = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/parse_input.star")
+el_admin_node_info = import_module("github.com/kurtosis-tech/eth2-package/src/participant_network/el/el_admin_node_info.star")
 el_client_context = import_module("github.com/kurtosis-tech/eth2-package/src/participant_network/el/el_client_context.star")
 
 package_io = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/constants.star")
@@ -57,24 +58,12 @@ def launch(
 
 	service = add_service(service_id, config)
 
-	result_recipe = struct(
-		service_id = service_id,
-		method= "POST",
-		endpoint = "",
-		body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}',
-		content_type = "application/json",
-		port_id = RPC_PORT_ID,
-		extract = {
-			"enr": ".result.enr",
-			"enode": ".result.enode",
-		}
-	)
-	response = wait(result_recipe, "extract.enode", "!=", "")
+	enode, enr = el_admin_node_info.get_enode_enr_for_node(service_id, RPC_PORT_ID)
 
 	return el_client_context.new_el_client_context(
 		"erigon",
-		response["extract.enr"],
-		response["extract.enode"],
+		enr,
+		enode,
 		service.ip_address,
 		RPC_PORT_NUM,
 		WS_PORT_NUM,

src/participant_network/el/geth/geth_launcher.star

 shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star")
 parse_input = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/parse_input.star")
 el_client_context = import_module("github.com/kurtosis-tech/eth2-package/src/participant_network/el/el_client_context.star")
+el_admin_node_info = import_module("github.com/kurtosis-tech/eth2-package/src/participant_network/el/el_admin_node_info.star")
 
 package_io = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/constants.star")
 
@@ -70,25 +71,12 @@ def launch(
 
 	service = add_service(service_id, config)
 
-	result_recipe = struct(
-		service_id = service_id,
-		method= "POST",
-		endpoint = "",
-		body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}',
-		content_type = "application/json",
-		port_id = RPC_PORT_ID,
-		extract = {
-			"enr": ".result.enr",
-			"enode": ".result.enode",
-		}
-	)
-	response = wait(result_recipe, "extract.enode", "!=", "")
-
+	enode, enr = el_admin_node_info.get_enode_enr_for_node(service_id, RPC_PORT_ID)
 
 	return el_client_context.new_el_client_context(
 		"geth",
-		response["extract.enr"],
-		response["extract.enode"],
+		enr,
+		enode,
 		service.ip_address,
 		RPC_PORT_NUM,
 		WS_PORT_NUM,

src/participant_network/el/nethermind/nethermind_launcher.star

 shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star")
 parse_input = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/parse_input.star")
 el_client_context = import_module("github.com/kurtosis-tech/eth2-package/src/participant_network/el/el_client_context.star")
+el_admin_node_info = import_module("github.com/kurtosis-tech/eth2-package/src/participant_network/el/el_admin_node_info.star")
 
 package_io = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/constants.star")
 
@@ -54,24 +55,13 @@ def launch(
 
 	service = add_service(service_id, config)
 
-	result_recipe = struct(
-		service_id = service_id,
-		method= "POST",
-		endpoint = "",
-		body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}',
-		content_type = "application/json",
-		port_id = RPC_PORT_ID,
-		extract = {
-			"enode": ".result.enode",
-		}
-	)
-	response = wait(result_recipe, "extract.enode", "!=", "")
+	enode, enr = el_admin_node_info.get_enode_enr_for_node(service_id, RPC_PORT_ID)
 
 	return el_client_context.new_el_client_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
-		response["extract.enode"],
+		enode,
 		service.ip_address,
 		RPC_PORT_NUM,
 		WS_PORT_NUM,