adjust to new syntactical differences from 0.53.4

src/forkmon/forkmon_launcher.star

@@ -52,7 +52,7 @@ def get_config(config_files_artifact_uuid):
 		files = {
 			config_files_artifact_uuid: FORKMON_CONFIG_MOUNT_DIRPATH_ON_SERVICE,
 		},
-		cmd_args = ["--config-path", config_file_path]
+		cmd = ["--config-path", config_file_path]
 	)
 
 

src/participant_network/cl/lighthouse/lighthouse_launcher.star

@@ -170,7 +170,7 @@ def get_beacon_config(
 	#    "--enr-address=" + externalIpAddress,
 	#    fmt.Sprintf("--enr-udp-port=%v", BEACON_DISCOVERY_PORT_NUM),
 	#    fmt.Sprintf("--enr-tcp-port=%v", beaconDiscoveryPortNum),
-	cmd_args = [
+	cmd = [
 		LIGHTHOUSE_BINARY_COMMAND,
 		"beacon_node",
 		"--debug-level=" + log_level,
@@ -206,22 +206,22 @@ def get_beacon_config(
 	]
 
 	if boot_cl_client_ctx != None:
-		cmd_args.append("--boot-nodes="+boot_cl_client_ctx.enr)
+		cmd.append("--boot-nodes="+boot_cl_client_ctx.enr)
 
 	if mev_boost_context != None:
-		cmd_args.append("--builder")
-		cmd_args.append(mev_boost_endpoint(mev_boost_context))
+		cmd.append("--builder")
+		cmd.append(mev_boost_endpoint(mev_boost_context))
 
 
 	if len(extra_params) > 0:
 		# this is a repeated<proto type>, we convert it into Starlark
-		cmd_args.extend([param for param in extra_params])
+		cmd.extend([param for param in extra_params])
 
 
 	return struct(
 		image = image,
 		ports = BEACON_USED_PORTS,
-		cmd_args = cmd_args,
+		cmd = cmd,
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNTPOINT_ON_CLIENTS
 		},
@@ -246,7 +246,7 @@ def get_validator_config(
 	validator_keys_dirpath = path_join(VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS, node_keystore_files.raw_keys_relative_dirpath)
 	validator_secrets_dirpath = path_join(VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS, node_keystore_files.raw_secrets_relative_dirpath)
 	
-	cmd_args = [
+	cmd = [
 		"lighthouse",
 		"validator_client",
 		"--debug-level=" + log_level,
@@ -273,16 +273,16 @@ def get_validator_config(
 	]
 
 	if mev_boost_context != None:
-		cmd_args.append("--builder-proposals")
+		cmd.append("--builder-proposals")
 
 	if len(extra_params):
-		cmd_args.extend([param for param in extra_params])
+		cmd.extend([param for param in extra_params])
 
 
 	return struct(
 		image = image,
 		ports = VALIDATOR_USED_PORTS,
-		cmd_args = cmd_args,
+		cmd = cmd,
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNTPOINT_ON_CLIENTS,
 			node_keystore_files.files_artifact_uuid: VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS,

src/participant_network/cl/lodestar/lodestar_launcher.star

@@ -150,7 +150,7 @@ def get_beacon_config(
 	genesis_config_filepath = path_join(GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER, genesis_data.config_yml_rel_filepath)
 	genesis_ssz_filepath = path_join(GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER, genesis_data.genesis_ssz_rel_filepath)
 	jwt_secret_filepath = path_join(GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER, genesis_data.jwt_secret_rel_filepath)
-	cmd_args = [
+	cmd = [
 		"beacon",
 		"--logLevel=" + log_level,
 		"--port={0}".format(DISCOVERY_PORT_NUM),
@@ -182,22 +182,22 @@ def get_beacon_config(
 	]
 
 	if boot_cl_client_ctx != None :
-		cmd_args.append("--bootnodes="+boot_cl_client_ctx.enr)
+		cmd.append("--bootnodes="+boot_cl_client_ctx.enr)
 	
 
 	if mev_boost_context != None:
-		cmd_args.append("--builder")
-		cmd_args.append("--builder.urls '{0}'".format(mev_boost_endpoint(mev_boost_context)))
+		cmd.append("--builder")
+		cmd.append("--builder.urls '{0}'".format(mev_boost_endpoint(mev_boost_context)))
 	
 
 	if len(extra_params) > 0:
 		# this is a repeated<proto type>, we convert it into Starlark
-		cmd_args.extend([param for param in extra_params])
+		cmd.extend([param for param in extra_params])
 	
 	return struct(
 		image = image,
 		ports = USED_PORTS,
-		cmd_args = cmd_args,
+		cmd = cmd,
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER
 		},
@@ -221,7 +221,7 @@ def get_validator_config(
 	validator_keys_dirpath = path_join(VALIDATOR_KEYS_MOUNT_DIRPATH_ON_SERVICE_CONTAINER, node_keystore_files.raw_keys_relative_dirpath)
 	validator_secrets_dirpath = path_join(VALIDATOR_KEYS_MOUNT_DIRPATH_ON_SERVICE_CONTAINER, node_keystore_files.raw_secrets_relative_dirpath)
 
-	cmd_args = [
+	cmd = [
 		"validator",
 		"--logLevel=" + log_level,
 		"--dataDir=" + root_dirpath,
@@ -237,19 +237,19 @@ def get_validator_config(
 	]
 
 	if mev_boost_context != None:
-		cmd_args.append("--builder")
+		cmd.append("--builder")
 		# TODO(old) required to work? - from old module
 		# cmdArgs = append(cmdArgs, "--defaultFeeRecipient <your ethereum address>")
 	
 	if len(extra_params) > 0:
 		# this is a repeated<proto type>, we convert it into Starlark
-		cmd_args.extend([param for param in extra_params])
+		cmd.extend([param for param in extra_params])
 
 
 	return struct(
 		image = image,
 		ports = USED_PORTS,
-		cmd_args = cmd_args,
+		cmd = cmd,
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER,
 			node_keystore_files.files_artifact_uuid: VALIDATOR_KEYS_MOUNT_DIRPATH_ON_SERVICE_CONTAINER

src/participant_network/cl/nimbus/nimbus_launcher.star

@@ -132,7 +132,7 @@ def get_config(
 	#  2) https://github.com/status-im/nimbus-eth2/blob/67ab477a27e358d605e99bffeb67f98d18218eca/scripts/launch_local_testnet.sh#L417
 	# WARNING: Do NOT set the --max-peers flag here, as doing so to the exact number of nodes seems to mess things up!
 	# See: https://github.com/kurtosis-tech/eth2-merge-kurtosis-module/issues/26
-	cmd_args = [
+	cmd = [
 		"mkdir",
 		CONSENSUS_DATA_DIRPATH_IN_SERVICE_CONTAINER,
 		"-m",
@@ -186,9 +186,9 @@ def get_config(
 	if boot_cl_client_ctx == None:
 		# Copied from https://.com/status-im/nimbus-eth2/blob/67ab477a27e358d605e99bffeb67f98d18218eca/scripts/launch_local_testnet.sh#L417
 		# See explanation there
-		cmd_args.append("--subscribe-all-subnets")
+		cmd.append("--subscribe-all-subnets")
 	else:
-		cmd_args.append("--bootstrap-node="+boot_cl_client_ctx.enr)
+		cmd.append("--bootstrap-node="+boot_cl_client_ctx.enr)
 
 	if mev_boost_context != None:
 		# TODO(old) add `mev-boost` support once the feature lands on `stable` - from eth2-merge-kurtosis-module
@@ -196,15 +196,15 @@ def get_config(
 
 
 	if len(extra_params) > 0:
-		cmd_args.extend([param for param in extra_params])
+		cmd.extend([param for param in extra_params])
 
-	cmd_str = " ".join(cmd_args)
+	cmd_str = " ".join(cmd)
 
 	return struct(
 		image = image,
 		ports = USED_PORTS,
-		cmd_args = [cmd_str],
-		entry_point_args = ["sh", "-c"],
+		cmd = [cmd_str],
+		entrypoint = ["sh", "-c"],
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNTPOINT_ON_CLIENT,
 			node_keystore_files.files_artifact_uuid: VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENT

src/participant_network/cl/prysm/prysm_launcher.star

@@ -178,7 +178,7 @@ def get_beacon_config(
 	jwt_secret_filepath = path_join(GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER, genesis_data.jwt_secret_rel_filepath)
 
 
-	cmd_args = [
+	cmd = [
 		"--accept-terms-of-use=true", #it's mandatory in order to run the node
 		"--datadir=" + CONSENSUS_DATA_DIRPATH_ON_SERVICE_CONTAINER,
 		"--chain-config-file=" + genesis_config_filepath,
@@ -203,19 +203,19 @@ def get_beacon_config(
 	]
 
 	if bootnode_context != None:
-		cmd_args.append("--bootstrap-node="+bootnode_context.enr)
+		cmd.append("--bootstrap-node="+bootnode_context.enr)
 
 	if mev_boost_context != None:
-		cmd_args.append(("--http-mev-relay{0}".format(mev_boost_endpoint(mev_boost_context))))
+		cmd.append(("--http-mev-relay{0}".format(mev_boost_endpoint(mev_boost_context))))
 
 	if len(extra_params) > 0:
 		# we do the for loop as otherwise its a proto repeated array
-		cmd_args.extend([param for param in extra_params])
+		cmd.extend([param for param in extra_params])
 
 	return struct(
 		image = beacon_image,
 		ports = BEACON_NODE_USED_PORTS,
-		cmd_args = cmd_args,
+		cmd = cmd,
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER,
 		},
@@ -241,7 +241,7 @@ def get_validator_config(
 	prysm_keystore_dirpath = path_join(VALIDATOR_KEYS_MOUNT_DIRPATH_ON_SERVICE_CONTAINER, node_keystore_files.prysm_relative_dirpath)
 	prysm_password_filepath = path_join(PRYSM_PASSWORD_MOUNT_DIRPATH_ON_SERVICE_CONTAINER, prysm_password_relative_filepath)
 
-	cmd_args = [
+	cmd = [
 		"--accept-terms-of-use=true",#it's mandatory in order to run the node
 		"--prater",                  #it's a tesnet setup, it's mandatory to set a network (https://docs.prylabs.network/docs/install/install-with-script#before-you-begin-pick-your-network-1)
 		"--beacon-rpc-gateway-provider=" + beacon_http_endpoint,
@@ -262,18 +262,18 @@ def get_validator_config(
 	if mev_boost_context != None:
 		# TODO(old) required to work?
 		# cmdArgs = append(cmdArgs, "--suggested-fee-recipient=0x...")
-		cmd_args.append("--enable-builder")
+		cmd.append("--enable-builder")
 
 
 	if len(extra_params) > 0:
 		# we do the for loop as otherwise its a proto repeated array
-		cmd_args.extend([param for param in extra_params])
+		cmd.extend([param for param in extra_params])
 
 
 	return struct(
 		image = validator_image,
 		ports = VALIDATOR_NODE_USED_PORTS,
-		cmd_args = cmd_args,
+		cmd = cmd,
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER,
 			node_keystore_files.files_artifact_uuid:             VALIDATOR_KEYS_MOUNT_DIRPATH_ON_SERVICE_CONTAINER,

src/participant_network/cl/teku/teku_launcher.star

@@ -139,7 +139,7 @@ def get_config(
 	validator_keys_dirpath = path_join(VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER, node_keystore_files.teku_keys_relative_dirpath)
 	validator_secrets_dirpath = path_join(VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER, node_keystore_files.teku_secrets_relative_dirpath)
 	
-	cmd_args = [
+	cmd = [
 		# Needed because the generated keys are owned by root and the Teku image runs as the 'teku' user
 		"cp",
 		"-R",
@@ -189,24 +189,24 @@ def get_config(
 	]
 
 	if boot_cl_client_ctx != None:
-		cmd_args.append("--p2p-discovery-bootnodes="+boot_cl_client_ctx.enr)
+		cmd.append("--p2p-discovery-bootnodes="+boot_cl_client_ctx.enr)
 
 	if mev_boost_context != None:
-		cmd_args.append("--validators-builder-registration-default-enabled=true")
-		cmd_args.append("--builder-endpoint='{0}'".format(mev_boost_endpoint(mev_boost_context)))
+		cmd.append("--validators-builder-registration-default-enabled=true")
+		cmd.append("--builder-endpoint='{0}'".format(mev_boost_endpoint(mev_boost_context)))
 
 
 	if len(extra_params) > 0:
 		# we do the list comprehension as the default extra_params is a proto repeated string
-		cmd_args.extend([param for param in extra_params])
+		cmd.extend([param for param in extra_params])
 
-	cmd_str = " ".join(cmd_args)
+	cmd_str = " ".join(cmd)
 
 	return struct(
 		image = image,
 		ports = USED_PORTS,
-		cmd_args = [cmd_str],
-		entry_point_args = ["sh", "-c"],
+		cmd = [cmd_str],
+		entrypoint = ["sh", "-c"],
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER,
 			node_keystore_files.files_artifact_uuid: VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER

src/participant_network/el/besu/besu_launcher.star

@@ -123,11 +123,11 @@ def get_config(network_id, genesis_data, image, existing_el_clients, log_level,
 	return struct(
 		image = image,
 		ports = USED_PORTS,
-		cmd_args = [launch_node_command_str],
+		cmd = [launch_node_command_str],
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_DIRPATH_ON_CLIENT_CONTAINER
 		},
-		entry_point_args = ENTRYPOINT_ARGS,
+		entrypoint = ENTRYPOINT_ARGS,
 		privaite_ip_address_placeholder = PRIVATE_IP_ADDRESS_PLACEHOLDER
 	)
 

src/participant_network/el/erigon/erigon_launcher.star

@@ -94,7 +94,7 @@ def get_config(network_id, genesis_data, image, existing_el_clients, verbosity_l
 
 	boot_node = existing_el_clients[0]
 
-	launch_node_cmd_args = [
+	launch_node_cmd = [
 		"erigon",
 		"--log.console.verbosity=" + verbosity_level,
 		"--datadir=" + EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
@@ -115,11 +115,11 @@ def get_config(network_id, genesis_data, image, existing_el_clients, verbosity_l
 
 	if len(extra_params) > 0:
 		# this is a repeated<proto type>, we convert it into Starlark
-		launch_node_cmd_args.extend([param for param in extra_params])
+		launch_node_cmd.extend([param for param in extra_params])
 
 	command_arg = [
 		init_datadir_cmd_str,
-		" ".join(launch_node_cmd_args)
+		" ".join(launch_node_cmd)
 	]
 
 	command_arg_str = " && ".join(command_arg)
@@ -127,11 +127,11 @@ def get_config(network_id, genesis_data, image, existing_el_clients, verbosity_l
 	return struct(
 		image = image,
 		ports = USED_PORTS,
-		cmd_args = [command_arg_str],
+		cmd = [command_arg_str],
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNT_DIRPATH
 		},
-		entry_point_args = ENTRYPOINT_ARGS,
+		entrypoint = ENTRYPOINT_ARGS,
 		privaite_ip_address_placeholder = PRIVATE_IP_ADDRESS_PLACEHOLDER
 	)
 

src/participant_network/el/geth/geth_launcher.star

@@ -118,7 +118,7 @@ def get_config(network_id, genesis_data, prefunded_geth_keys_artifact_uuid, pref
 		GETH_ACCOUNT_PASSWORDS_FILE,
 	) + '}'
 
-	launch_node_cmd_args = [
+	launch_node_cmd = [
 		"geth",
 		"--verbosity=" + verbosity_level,
 		"--unlock=" + accounts_to_unlock_str,
@@ -152,16 +152,16 @@ def get_config(network_id, genesis_data, prefunded_geth_keys_artifact_uuid, pref
 		bootnode_context = existing_el_clients[0]
 		bootnode_enode = bootnode_context.enode
 
-	launch_node_cmd_args.append(
+	launch_node_cmd.append(
 		'--bootnodes="{0}"'.format(bootnode_enode),
 	)
 
 	if len(extra_params) > 0:
 		# this is a repeated<proto type>, we convert it into Starlark
-		launch_node_cmd_args.extend([param for param in extra_params])
+		launch_node_cmd.extend([param for param in extra_params])
 
 
-	launch_node_cmd_str = " ".join(launch_node_cmd_args)
+	launch_node_cmd_str = " ".join(launch_node_cmd)
 
 	subcommand_strs = [
 		init_datadir_cmd_str,
@@ -174,12 +174,12 @@ def get_config(network_id, genesis_data, prefunded_geth_keys_artifact_uuid, pref
 	return struct(
 		image = image,
 		ports = USED_PORTS,
-		cmd_args = [command_str],
+		cmd = [command_str],
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNT_DIRPATH,
 			prefunded_geth_keys_artifact_uuid: PREFUNDED_KEYS_MOUNT_DIRPATH
 		},
-		entry_point_args = ENTRYPOINT_ARGS,
+		entrypoint = ENTRYPOINT_ARGS,
 		privaite_ip_address_placeholder = PRIVATE_IP_ADDRESS_PLACEHOLDER
 	)
 

src/participant_network/el/nethermind/nethermind_launcher.star

@@ -118,7 +118,7 @@ def get_config(genesis_data, image, existing_el_clients, log_level, extra_params
 	return struct(
 		image = image,
 		ports = USED_PORTS,
-		cmd_args = command_args,
+		cmd = command_args,
 		files = {
 			genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNT_DIRPATH
 		},

src/participant_network/mev_boost/mev_boost_launcher.star

@@ -39,7 +39,7 @@ def get_config(mev_boost_launcher, network_id):
 	return struct(
 		image = FLASHBOTS_MEV_BOOST_IMAGE,
 		ports = USED_PORTS,
-		cmd_args = command
+		cmd = command
 	)
 
 

src/participant_network/prelaunch_data_generator/cl_genesis/cl_genesis_data_generator.star

@@ -112,7 +112,7 @@ def generate_cl_genesis_data(
 		exec(launcher_service_id, cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE)
 		
 
-	cl_genesis_generation_cmd_args = [
+	cl_genesis_generation_cmd = [
 		CL_GENESIS_GENERATION_BINARY_FILEPATH_ON_CONTAINER,
 		"merge",
 		"--config", path_join(OUTPUT_DIRPATH_ON_GENERATOR, GENESIS_CONFIG_YML_FILENAME),
@@ -122,7 +122,7 @@ def generate_cl_genesis_data(
 		"--state-output", path_join(OUTPUT_DIRPATH_ON_GENERATOR, GENESIS_STATE_FILENAME)
 	]
 
-	exec(launcher_service_id, cl_genesis_generation_cmd_args, SUCCESSFUL_EXEC_CMD_EXIT_CODE)
+	exec(launcher_service_id, cl_genesis_generation_cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE)
 
 	cl_genesis_data_artifact_uuid = store_file_from_service(launcher_service_id, OUTPUT_DIRPATH_ON_GENERATOR)
 

src/participant_network/prelaunch_data_generator/el_genesis/el_genesis_data_generator.star

@@ -97,7 +97,7 @@ def generate_el_genesis_data(
 
 
 	jwt_secret_filepath_on_generator = path_join(OUTPUT_DIRPATH_ON_GENERATOR, JWT_SECRET_FILENAME)
-	jwt_secret_generation_cmd_args = [
+	jwt_secret_generation_cmd = [
 		"bash",
 		"-c",
 		"openssl rand -hex 32 | tr -d \"\\n\" | sed 's/^/0x/' > {0}".format(
@@ -105,7 +105,7 @@ def generate_el_genesis_data(
 		)
 	]
 
-	exec(launcher_service_id, jwt_secret_generation_cmd_args, SUCCESSFUL_EXEC_CMD_EXIT_CODE)
+	exec(launcher_service_id, jwt_secret_generation_cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE)
 
 	elGenesisDataArtifactUuid = store_file_from_service(launcher_service_id, OUTPUT_DIRPATH_ON_GENERATOR)
 

src/participant_network/prelaunch_data_generator/prelaunch_data_generator_launcher/prelaunch_data_generator_launcher.star

@@ -29,6 +29,6 @@ def get_config(
 		# TODO remove this when ports is optional to pass
 		ports = {},
 		image = IMAGE,
-		entry_point_args = ENTRYPOINT_ARGS,
+		entrypoint = ENTRYPOINT_ARGS,
 		files = files_artifact_mountpoints,
 	)

src/prometheus/prometheus_launcher.star

@@ -49,7 +49,7 @@ def get_config(config_files_artifact_uuid):
 		files = {
 			config_files_artifact_uuid : CONFIG_DIR_MOUNTPOINT_ON_PROMETHEUS
 		},
-		cmd_args = [
+		cmd = [
 			# You can check all the cli flags starting the container and going to the flags section
 			# in Prometheus admin page "{{prometheusPublicURL}}/flags" section
 			"--config.file=" + config_file_path,

src/testnet_verifier/testnet_verifier.star

@@ -53,7 +53,7 @@ def get_asynchronous_verification_config(params, el_client_contexts, cl_client_c
 	commands = get_cmd(params, el_client_contexts, cl_client_contexts, False)
 	return struct(
 		image = IMAGE_NAME,
-		cmd_args = commands,
+		cmd = commands,
 		# TODO remove this when ports is optional in add_service
 		ports = {},
 	)
@@ -62,7 +62,7 @@ def get_asynchronous_verification_config(params, el_client_contexts, cl_client_c
 def get_synchronous_verification_config():
 	return struct(
 		image = IMAGE_NAME,
-		entry_point_args = SYNCHRONOUS_ENTRYPOINT_ARGS,
+		entrypoint = SYNCHRONOUS_ENTRYPOINT_ARGS,
 		# TODO remove this when ports is optional in add_service
 		ports = {},
 	)

src/transaction_spammer/transaction_spammer.star

@@ -18,7 +18,7 @@ def get_config(prefunded_addresses, el_client_context):
 	comma_separated_addresses = ",".join(address_strs)
 	return struct(
 		image = IMAGE_NAME,
-		cmd_args = [
+		cmd = [
 			"http://{0}:{1}".format(el_client_context.ip_addr, el_client_context.rpc_port_num),
 			"spam",
 			comma_separated_private_keys,