use launcher

README.md

@@ -34,7 +34,7 @@ This is the Startosis version of the popular [eth2-merge-kurtosis-module](https:
     - [x] framework
   - [ ] geth
     - [ ] facts and waits + private_ip_address_placeholder
-    - [ ] framework
+    - [x] framework
   - [ ] nethermind
     - [ ] facts and waits + private_ip_address_placeholder
     - [ ] framework

src/participant_network/el/besu/besu_launcher.star

@@ -56,8 +56,7 @@ BESU_LOG_LEVELS = {
 
 
 def launch(
-	network_id,
-	el_genesis_data,
+	launcher,
 	service_id,
 	image,
 	participant_log_level,
@@ -67,7 +66,8 @@ def launch(
 
 	log_level = get_client_log_level_or_default(participant_log_level, global_log_level, BESU_LOG_LEVELS)
 
-	service_config  = get_service_config(network_id, el_genesis_data, image, network_id, existing_el_clients, log_level, extra_params)
+	service_config = get_service_config(launcher.network_id, launcher.el_genesis_data,
+                                    image, network_id, existing_el_clients, log_level, extra_params)
 
 	service = add_service(service_id, service_config)
 
@@ -142,3 +142,9 @@ def get_service_config(network_id, genesis_data, image, existing_el_clients, log
 		# https://github.com/kurtosis-tech/kurtosis/pull/290
 	)
 
+
+def new_besu_launcher(network_id, el_genesis_data):
+	return struct(
+		network_id = network_id,
+		el_genesis_data = el_genesis_data
+	)

src/participant_network/el/erigon/erigon_launcher.star

@@ -53,8 +53,7 @@ ERIGON_LOG_LEVELS = {
 }
 
 def launch(
-	network_id,
-	el_genesis_data,
+	launcher,
 	service_id,
 	image,
 	participant_log_level,
@@ -64,7 +63,8 @@ def launch(
 
 	log_level = get_client_log_level_or_default(participant_log_level, global_log_level, ERIGON_LOG_LEVELS)
 
-	service_config  = get_service_config(network_id, el_genesis_data, image, network_id, existing_el_clients, log_level, extra_params)
+	service_config = get_service_config(launcher.network_id, launcher.el_genesis_data,
+                                    image, network_id, existing_el_clients, log_level, extra_params)
 
 	service = add_service(service_id, service_config)
 
@@ -141,3 +141,10 @@ def get_service_config(network_id, genesis_data, image, existing_el_clients, ver
 		# for now this will work as we use the service config default above
 		# https://github.com/kurtosis-tech/kurtosis/pull/290
 	)
+
+
+def new_erigon_launcher(network_id, el_genesis_data):
+	return struct(
+		network_id = network_id,
+		el_genesis_data = el_genesis_data,
+	)
\ No newline at end of file

src/participant_network/el/geth/geth_launcher.star

@@ -63,10 +63,7 @@ VERBOSITY_LEVELS = {
 }
 
 def launch(
-	network_id,
-	el_genesis_data,
-	prefunded_geth_keys_artifact_uuid,
-	prefunded_account_info,
+	launcher,
 	service_id,
 	image,
 	participant_log_level,
@@ -78,7 +75,8 @@ def launch(
 
 	log_level = get_client_log_level_or_default(participant_log_level, global_log_level, ERIGON_LOG_LEVELS)
 
-	service_config  = get_service_config(network_id, el_genesis_data, prefunded_geth_keys_artifact_uuid, prefunded_account_info, image, network_id, existing_el_clients, log_level, extra_params)
+	service_config = get_service_config(launcher.network_id, launcher.el_genesis_data, launcher.prefunded_geth_keys_artifact_uuid,
+                                    launcher.prefunded_account_info, image, network_id, existing_el_clients, log_level, extra_params)
 
 	service = add_service(service_id, service_config)
 
@@ -191,4 +189,13 @@ def get_service_config(network_id, genesis_data, prefunded_geth_keys_artifact_uu
 		# TODO add private IP address place holder when add servicde supports it
 		# for now this will work as we use the service config default above
 		# https://github.com/kurtosis-tech/kurtosis/pull/290
+	)
+
+
+def new_geth_launcher(network_id, el_genesis_data, prefunded_geth_keys_artifact_uuid, prefunded_account_info):
+	return struct(
+		network_id = network_id,
+		el_genesis_data = el_genesis_data,
+		prefunded_account_info = prefunded_account_info,
+		prefunded_geth_keys_artifact_uuid = prefunded_geth_keys_artifact_uuid,
 	)
\ No newline at end of file