bug fixes

src/participant_network/participant_network.star

@@ -14,9 +14,7 @@ def launch_participant_network(network_params):
 
 	print("Success " + keystore_result)
 
-	# Use actual time instead
-	genesis_timestamp = 1667320256
-	# genesis_timestamp = time.now().unix
+	genesis_timestamp = time.now().unix
 
 	print("Generating EL data")
 	el_genesis_generation_config_template = read_file("github.com/kurtosis-tech/eth2-module/static_files/genesis-generation-config/el/genesis-config.yaml.tmpl")

src/participant_network/prelaunch_data_generator/cl_genesis/cl_genesis_data_generator.star

 load("github.com/kurtosis-tech/eth2-module/src/shared_utils/shared_utils.star", "new_template_and_data", "path_join", "path_base")
 load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/cl_genesis/cl_genesis_data.star", "new_cl_genesis_data")
-load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/prelaunch_data_generator_launcher", "launch_prelaunch_data_generator")
+load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/prelaunch_data_generator_launcher/prelaunch_data_generator_launcher.star", "launch_prelaunch_data_generator")
 
 
 # Needed to copy the JWT secret and the EL genesis.json file

src/participant_network/prelaunch_data_generator/cl_validator_keystores/cl_validator_keystore_generator.star

-load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/prelaunch_data_generator_launcher", "launch_prelaunch_data_generator")
+load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/prelaunch_data_generator_launcher/prelaunch_data_generator_launcher.star", "launch_prelaunch_data_generator")
+
 load("github.com/kurtosis-tech/eth2-module/src/shared_utils/shared_utils.star", "path_join", "path_base")
 load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/cl_validator_keystores/keystore_files.star", "new_keystore_files")
 load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/cl_validator_keystores/generate_keystores_result.star", "new_generate_keystores_result")
@@ -95,13 +96,13 @@ def generate_cl_validator_keystores(
 		"sh",
 		"-c",
 		"echo '{0}' > {1}".format(
-			prysmPassword,
+			PRYSM_PASSWORD,
 			PRYSM_PASSWORD_FILEPATH_ON_GENERATOR,
 		),
 	]
 	exec(service_id, write_prysm_password_file_cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE)
 
-	prysm_password_artifact_uuid = store_files_from_service(service_id, PRYSM_PASSWORD_FILEPATH_ON_GENERATOR)
+	prysm_password_artifact_uuid = store_file_from_service(service_id, PRYSM_PASSWORD_FILEPATH_ON_GENERATOR)
 
 	result = new_generate_keystores_result(
 		prysm_password_artifact_uuid,

src/participant_network/prelaunch_data_generator/el_genesis/el_genesis_data_generator.star

 load("github.com/kurtosis-tech/eth2-module/src/shared_utils/shared_utils.star", "new_template_and_data", "path_join", "path_base")
 load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/el_genesis/el_genesis_data.star", "new_el_genesis_data")
-load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/prelaunch_data_generator_launcher", "launch_prelaunch_data_generator")
+load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/prelaunch_data_generator_launcher/prelaunch_data_generator_launcher.star", "launch_prelaunch_data_generator")
 
 CONFIG_DIRPATH_ON_GENERATOR = "/config"
 GENESIS_CONFIG_FILENAME    = "genesis-config.yaml"

src/participant_network/prelaunch_data_generator/pre_launch_data_generator_launcher/pre_launch_data_generator_launcher.star

-IMAGE = "ethpandaops/ethereum-genesis-generator:latest"
-
-SERVICE_ID_PREFIX = "prelaunch-data-generator-"
-
-# We use Docker exec commands to run the commands we need, so we override the default
-ENTRYPOINT_ARGS = [
-	"sleep",
-	"999999",
-]
-
-# Launches a prelaunch data generator IMAGE, for use in various of the genesis generation
-def launch_prelaunch_data_generator(
-	files_artifact_mountpoints,
-):
-
-	service_config = get_service_config(files_artifact_mountpoints)
-
-	service_id = "%v%v".format(
-		SERVICE_ID_PREFIX,
-		time.unix(),
-	)
-
-	add_service(service_id, service_config)
-
-	return service_id
-
-def get_service_config(
-	files_artifact_mountpoints,
-):
-	return = struct(
-		# TODO used ports is supposed to be empty
-		used_ports = {},
-		container_image_name = IMAGE,
-		entry_point_args = ENTRYPOINT_ARGS,
-		files_artifact_mount_dirpaths = files_artifact_mountpoints,
-	)
\ No newline at end of file