removed old comments

README.md

@@ -10,6 +10,7 @@ This is the Startosis version of the popular [eth2-merge-kurtosis-module](https:
   - [x] launch forkmon, prometheus, grafana, testnet_verifier, transaction_spammer
   - [x] do a wait for epoch finalization
   - [ ] assert that finalization epoch > 0
+  - [ ] wait for CL genesis to occur before adding forkmon
 - [x] Module IO (this is blocked on Startosis Args working)
 - [x] forkmon (this is blocked on CL clients running)
 - [x] prometheus (this is blocked on CL clients running)

src/participant_network/cl/lighthouse/lighthouse_launcher.star

@@ -107,7 +107,6 @@ def launch(
 	beacon_service = add_service(beacon_node_service_id, beacon_service_config)
 
 	# TODO the Golang code checks whether its 200, 206 or 503, maybe add that
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = beacon_node_service_id, fact_name = BEACON_HEALTH_FACT_NAME, fact_recipe = struct(method= "GET", endpoint = "/eth/v1/node/health", content_type = "application/json", port_id = BEACON_HTTP_PORT_ID))
 	wait(service_id = beacon_node_service_id, fact_name = BEACON_HEALTH_FACT_NAME)
 
@@ -128,8 +127,7 @@ def launch(
 
 	validator_service = add_service(validator_node_service_id, validator_service_config)
 
-	# TODO add validator availability using the validator API: https://ethereum.github.io/beacon-APIs/?urls.primaryName=v1#/ValidatorRequiredApi | from eth2-merge-kurtosis-module
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
+	# TODO(old) add validator availability using the validator API: https://ethereum.github.io/beacon-APIs/?urls.primaryName=v1#/ValidatorRequiredApi | from eth2-merge-kurtosis-module
 	define_fact(service_id = beacon_node_service_id, fact_name = BEACON_ENR_FACT_NAME, fact_recipe = struct(method= "GET", endpoint = "/eth/v1/node/identity", field_extractor = ".data.enr", content_type = "application/json", port_id = BEACON_HTTP_PORT_ID))
 	beacon_node_enr = wait(service_id = beacon_node_service_id, fact_name = BEACON_ENR_FACT_NAME)
 

src/participant_network/cl/lodestar/lodestar_launcher.star

@@ -41,7 +41,6 @@ UDP_PROTOCOL = "UDP"
 BEACON_ENR_FACT_NAME = "beacon-enr-fact"
 BEACON_HEALTH_FACT_NAME = "beacon-health-fact"
 
-# TODO verify this - why do we pass the same used ports to both
 USED_PORTS = {
 	TCP_DISCOVERY_PORT_ID: new_port_spec(DISCOVERY_PORT_NUM, TCP_PROTOCOL),
 	UDP_DISCOVERY_PORT_ID: new_port_spec(DISCOVERY_PORT_NUM, UDP_PROTOCOL),
@@ -94,7 +93,6 @@ def launch(
 	beacon_http_port = beacon_service.ports[HTTP_PORT_ID]
 
 	# TODO the Golang code checks whether its 200, 206 or 503, maybe add that
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = beacon_node_service_id, fact_name = BEACON_HEALTH_FACT_NAME, fact_recipe = struct(method= "GET", endpoint = "/eth/v1/node/health", content_type = "application/json", port_id = HTTP_PORT_ID))
 	wait(service_id = beacon_node_service_id, fact_name = BEACON_HEALTH_FACT_NAME)
 
@@ -115,17 +113,14 @@ def launch(
 
 	validator_service = add_service(validator_node_service_id, validator_service_config)
 
-	# TODO add validator availability using the validator API: https://ethereum.github.io/beacon-APIs/?urls.primaryName=v1#/ValidatorRequiredApi | from eth2-merge-kurtosis-module
+	# TODO(old) add validator availability using the validator API: https://ethereum.github.io/beacon-APIs/?urls.primaryName=v1#/ValidatorRequiredApi | from eth2-merge-kurtosis-module
 
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = beacon_node_service_id, fact_name = BEACON_ENR_FACT_NAME, fact_recipe = struct(method= "GET", endpoint = "/eth/v1/node/identity", field_extractor = ".data.enr", content_type = "application/json", port_id = HTTP_PORT_ID))
 	beacon_node_enr = wait(service_id = beacon_node_service_id, fact_name = BEACON_ENR_FACT_NAME)
 
 	beacon_metrics_port = beacon_service.ports[METRICS_PORT_ID]
 	beacon_metrics_url = "{0}:{1}".format(beacon_service.ip_address, beacon_metrics_port.number)
 
-	# TODO verify if this is correct - from eth2-merge-kurtosis-module
-	# why do we pass the "service_id" that isn't used
 	beacon_node_metrics_info = new_cl_node_metrics_info(service_id, METRICS_PATH, beacon_metrics_url)
 	nodes_metrics_info = [beacon_node_metrics_info]
 
@@ -251,7 +246,7 @@ def get_validator_service_config(
 
 	if mev_boost_context != None:
 		cmd_args.append("--builder")
-		# TODO required to work? - from old module
+		# TODO(old) required to work? - from old module
 		# cmdArgs = append(cmdArgs, "--defaultFeeRecipient <your ethereum address>")
 	
 	if len(extra_params) > 0:

src/participant_network/cl/nimbus/nimbus_launcher.star

@@ -91,7 +91,6 @@ def launch(
 	beacon_http_port = beacon_service.ports[HTTP_PORT_ID]
 
 	# TODO the Golang code checks whether its 200, 206 or 503, maybe add that
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = service_id, fact_name = BEACON_HEALTH_FACT_NAME, fact_recipe = struct(method= "GET", endpoint = "/eth/v1/node/health", content_type = "application/json", port_id = HTTP_PORT_ID))
 	wait(service_id = service_id, fact_name = BEACON_HEALTH_FACT_NAME)
 
@@ -101,8 +100,6 @@ def launch(
 	beacon_metrics_port = beacon_service.ports[METRICS_PORT_ID]
 	beacon_metrics_url = "{0}:{1}".format(beacon_service.ip_address, beacon_metrics_port.number)
 
-	# TODO verify if this is correct - from eth2-merge-kurtosis-module
-	# why do we pass the "service_id" that isn't used
 	beacon_node_metrics_info = new_cl_node_metrics_info(service_id, METRICS_PATH, beacon_metrics_url)
 	nodes_metrics_info = [beacon_node_metrics_info]
 

src/participant_network/cl/prysm/prysm_launcher.star

@@ -113,7 +113,6 @@ def launch(
 	beacon_service = add_service(beacon_node_service_id, beacon_service_config)
 
 	# TODO the Golang code checks whether its 200, 206 or 503, maybe add that
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = beacon_node_service_id, fact_name = BEACON_HEALTH_FACT_NAME, fact_recipe = struct(method= "GET", endpoint = "/eth/v1/node/health", content_type = "application/json", port_id = HTTP_PORT_ID))
 	wait(service_id = beacon_node_service_id, fact_name = BEACON_HEALTH_FACT_NAME)
 
@@ -139,8 +138,7 @@ def launch(
 
 	validator_service = add_service(validator_node_service_id, validator_service_config)
 
-	# TODO add validator availability using the validator API: https://ethereum.github.io/beacon-APIs/?urls.primaryName=v1#/ValidatorRequiredApi | from eth2-merge-kurtosis-module
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
+	# TODO(old) add validator availability using the validator API: https://ethereum.github.io/beacon-APIs/?urls.primaryName=v1#/ValidatorRequiredApi | from eth2-merge-kurtosis-module
 	define_fact(service_id = beacon_node_service_id, fact_name = BEACON_ENR_FACT_NAME, fact_recipe = struct(method= "GET", endpoint = "/eth/v1/node/identity", field_extractor = ".data.enr", content_type = "application/json", port_id = HTTP_PORT_ID))
 	beacon_node_enr = wait(service_id = beacon_node_service_id, fact_name = BEACON_ENR_FACT_NAME)
 
@@ -262,7 +260,7 @@ def get_validator_service_config(
 		"--datadir=" + consensus_data_dirpath,
 		"--monitoring-port={0}".format(VALIDATOR_MONITORING_PORT_NUM),
 		"--verbosity=" + log_level,
-		# TODO SOMETHING ABOUT JWT
+		# TODO(old) SOMETHING ABOUT JWT
 		# vvvvvvvvvvvvvvvvvvv METRICS CONFIG vvvvvvvvvvvvvvvvvvvvv
 		"--disable-monitoring=false",
 		"--monitoring-host=0.0.0.0",
@@ -271,7 +269,7 @@ def get_validator_service_config(
 	]
 
 	if mev_boost_context != None:
-		# TODO required to work?
+		# TODO(old) required to work?
 		# cmdArgs = append(cmdArgs, "--suggested-fee-recipient=0x...")
 		cmd_args.append("--enable-builder")
 

src/participant_network/cl/teku/teku_launcher.star

@@ -17,7 +17,7 @@ CONSENSUS_DATA_DIRPATH_ON_SERVICE_CONTAINER = "/opt/teku/consensus-data"
 #  into the Teku user's home directory to get around it
 VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER = "/validator-keys"
 
-# TODO Get rid of this being hardcoded; should be shared
+# TODO(old) Get rid of this being hardcoded; should be shared
 VALIDATING_REWARDS_ACCOUNT = "0x0000000000000000000000000000000000000000"
 
 # Port IDs
@@ -100,7 +100,6 @@ def launch(
 	beacon_http_port = beacon_service.ports[HTTP_PORT_ID]
 
 	# TODO the Golang code checks whether its 200, 206 or 503, maybe add that
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = service_id, fact_name = BEACON_HEALTH_FACT_NAME, fact_recipe = struct(method= "GET", endpoint = "/eth/v1/node/health", content_type = "application/json", port_id = HTTP_PORT_ID))
 	wait(service_id = service_id, fact_name = BEACON_HEALTH_FACT_NAME)
 
@@ -111,8 +110,6 @@ def launch(
 	beacon_metrics_port = beacon_service.ports[METRICS_PORT_ID]
 	beacon_metrics_url = "{0}:{1}".format(beacon_service.ip_address, beacon_metrics_port.number)
 
-	# TODO verify if this is correct - from eth2-merge-kurtosis-module
-	# why do we pass the "service_id" that isn't used
 	beacon_node_metrics_info = new_cl_node_metrics_info(service_id, METRICS_PATH, beacon_metrics_url)
 	nodes_metrics_info = [beacon_node_metrics_info]
 

src/participant_network/el/besu/besu_launcher.star

@@ -71,14 +71,13 @@ def launch(
 
 	service = add_service(service_id, service_config)
 
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = service_id, fact_name = ENODE_FACT_NAME, fact_recipe = struct(method= "POST", endpoint = "", field_extractor = ".result.enode", body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}', content_type = "application/json", port_id = RPC_PORT_ID))
 	enode = wait(service_id = service_id, fact_name = ENODE_FACT_NAME)
 
 	return new_el_client_context(
 		"besu",
 		"", # besu has no ENR
-		"", # TODO add Enode from wait & fact,
+		enode,
 		service.ip_address,
 		RPC_PORT_NUM,
 		WS_PORT_NUM,

src/participant_network/el/erigon/erigon_launcher.star

@@ -71,11 +71,9 @@ def launch(
 
 	service = add_service(service_id, service_config)
 
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = service_id, fact_name = ENR_FACT_NAME, fact_recipe = struct(method= "POST", endpoint = "", field_extractor = ".result.enr", body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}', content_type = "application/json", port_id = RPC_PORT_ID))
 	enr = wait(service_id = service_id, fact_name = ENR_FACT_NAME)
 
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = service_id, fact_name = ENODE_FACT_NAME, fact_recipe = struct(method= "POST", endpoint = "", field_extractor = ".result.enode", body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}', content_type = "application/json", port_id = RPC_PORT_ID))
 	enode = wait(service_id = service_id, fact_name = ENODE_FACT_NAME)
 

src/participant_network/el/geth/geth_launcher.star

@@ -18,7 +18,7 @@ UDP_DISCOVERY_PORT_ID = "udp-discovery"
 ENGINE_RPC_PORT_ID    = "engine-rpc"
 ENGINE_WS_PORT_ID     = "engineWs"
 
-# TODO Scale this dynamically based on CPUs available and Geth nodes mining
+# TODO(old) Scale this dynamically based on CPUs available and Geth nodes mining
 NUM_MINING_THREADS = 1
 
 GENESIS_DATA_MOUNT_DIRPATH = "/genesis"
@@ -83,11 +83,9 @@ def launch(
 
 	service = add_service(service_id, service_config)
 
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = service_id, fact_name = ENR_FACT_NAME, fact_recipe = struct(method= "POST", endpoint = "", field_extractor = ".result.enr", body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}', content_type = "application/json", port_id = RPC_PORT_ID))
 	enr = wait(service_id = service_id, fact_name = ENR_FACT_NAME)
 
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = service_id, fact_name = ENODE_FACT_NAME, fact_recipe = struct(method= "POST", endpoint = "", field_extractor = ".result.enode", body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}', content_type = "application/json", port_id = RPC_PORT_ID))
 	enode = wait(service_id = service_id, fact_name = ENODE_FACT_NAME)
 

src/participant_network/el/nethermind/nethermind_launcher.star

@@ -66,7 +66,6 @@ def launch(
 
 	service = add_service(service_id, service_config)
 
-	# TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
 	define_fact(service_id = service_id, fact_name = ENODE_FACT_NAME, fact_recipe = struct(method= "POST", endpoint = "", field_extractor = ".result.enode", body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}', content_type = "application/json", port_id = RPC_PORT_ID))
 	enode = wait(service_id = service_id, fact_name = ENODE_FACT_NAME)
 
@@ -102,7 +101,7 @@ def get_service_config(genesis_data, image, existing_el_clients, log_level, extr
 		"--JsonRpc.Enabled=true",
 		"--JsonRpc.EnabledModules=net,eth,consensus,subscribe,web3,admin",
 		"--JsonRpc.Host=0.0.0.0",
-		# TODO Set Eth isMining?
+		# TODO(old) Set Eth isMining?
 		"--JsonRpc.Port={0}".format(RPC_PORT_NUM),
 		"--JsonRpc.WebSocketsPort={0}".format(WS_PORT_NUM),
 		"--Network.ExternalIp={0}".format(PRIVATE_IP_ADDRESS_PLACEHOLDER),