Commit 466f0a84 authored by Gyanendra Mishra's avatar Gyanendra Mishra

marked more comments as old

parent 5c9ee67e
...@@ -146,7 +146,7 @@ def get_service_config( ...@@ -146,7 +146,7 @@ def get_service_config(
"-m", "-m",
CONSENSUS_DATA_DIR_PERMS_STR, CONSENSUS_DATA_DIR_PERMS_STR,
"&&", "&&",
# TODO COMMENT THIS OUT? # TODO(old) COMMENT THIS OUT?
"cp", "cp",
"-R", "-R",
validator_keys_dirpath, validator_keys_dirpath,
......
...@@ -34,7 +34,6 @@ PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER" ...@@ -34,7 +34,6 @@ PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER"
TCP_PROTOCOL = "TCP" TCP_PROTOCOL = "TCP"
UDP_PROTOCOL = "UDP" UDP_PROTOCOL = "UDP"
## Engine port was removed from here
USED_PORTS = { USED_PORTS = {
RPC_PORT_ID: new_port_spec(RPC_PORT_NUM, TCP_PROTOCOL), RPC_PORT_ID: new_port_spec(RPC_PORT_NUM, TCP_PROTOCOL),
WS_PORT_ID: new_port_spec(WS_PORT_NUM, TCP_PROTOCOL), WS_PORT_ID: new_port_spec(WS_PORT_NUM, TCP_PROTOCOL),
...@@ -79,8 +78,8 @@ def launch( ...@@ -79,8 +78,8 @@ def launch(
return new_el_client_context( return new_el_client_context(
"erigon", "erigon",
"", # TODO fetch ENR from wait & fact enr,
"", # TODO add Enode from wait & fact, enode,
service.ip_address, service.ip_address,
RPC_PORT_NUM, RPC_PORT_NUM,
WS_PORT_NUM, WS_PORT_NUM,
...@@ -120,7 +119,6 @@ def get_service_config(network_id, genesis_data, image, existing_el_clients, ver ...@@ -120,7 +119,6 @@ def get_service_config(network_id, genesis_data, image, existing_el_clients, ver
"--allow-insecure-unlock", "--allow-insecure-unlock",
"--nat=extip:" + PRIVATE_IP_ADDRESS_PLACEHOLDER, "--nat=extip:" + PRIVATE_IP_ADDRESS_PLACEHOLDER,
"--authrpc.jwtsecret={0}".format(jwt_secret_json_filepath_on_client), "--authrpc.jwtsecret={0}".format(jwt_secret_json_filepath_on_client),
## TODO engine port was removed from here
"--nodiscover", "--nodiscover",
"--staticpeers={0}".format(boot_node.enode), "--staticpeers={0}".format(boot_node.enode),
] ]
......
...@@ -36,7 +36,7 @@ CL_GENESIS_DATA_GENERATION_TIME = 2 * time.minute ...@@ -36,7 +36,7 @@ CL_GENESIS_DATA_GENERATION_TIME = 2 * time.minute
# Each CL node takes about this time to start up and start processing blocks, so when we create the CL # Each CL node takes about this time to start up and start processing blocks, so when we create the CL
# genesis data we need to set the genesis timestamp in the future so that nodes don't miss important slots # genesis data we need to set the genesis timestamp in the future so that nodes don't miss important slots
# (e.g. Altair fork) # (e.g. Altair fork)
# TODO Make this client-specific (currently this is Nimbus) # TODO(old) Make this client-specific (currently this is Nimbus)
CL_NODE_STARTUP_TIME = 45 * time.second CL_NODE_STARTUP_TIME = 45 * time.second
MEV_BOOST_SHOULD_CHECK_RELAY = True MEV_BOOST_SHOULD_CHECK_RELAY = True
...@@ -129,7 +129,6 @@ def launch_participant_network(participants, network_params, global_log_level): ...@@ -129,7 +129,6 @@ def launch_participant_network(participants, network_params, global_log_level):
print("Launching CL network") print("Launching CL network")
cl_launchers = { cl_launchers = {
# TODO Allow for other types here
module_io.CLClientType.lighthouse : {"launcher": new_lighthouse_launcher(cl_genesis_data), "launch_method": launch_lighthouse}, module_io.CLClientType.lighthouse : {"launcher": new_lighthouse_launcher(cl_genesis_data), "launch_method": launch_lighthouse},
module_io.CLClientType.lodestar: {"launcher": new_lodestar_launcher(cl_genesis_data), "launch_method": launch_lodestar}, module_io.CLClientType.lodestar: {"launcher": new_lodestar_launcher(cl_genesis_data), "launch_method": launch_lodestar},
module_io.CLClientType.nimbus: {"launcher": new_nimbus_launcher(cl_genesis_data), "launch_method": launch_nimbus}, module_io.CLClientType.nimbus: {"launcher": new_nimbus_launcher(cl_genesis_data), "launch_method": launch_nimbus},
......
...@@ -52,7 +52,7 @@ def generate_cl_genesis_data( ...@@ -52,7 +52,7 @@ def generate_cl_genesis_data(
genesis_generation_config_artifact_uuid = render_templates(template_and_data_by_rel_dest_filepath) genesis_generation_config_artifact_uuid = render_templates(template_and_data_by_rel_dest_filepath)
# TODO Make this the actual data generator - comment copied from the original module # TODO(old) Make this the actual data generator - comment copied from the original module
launcher_service_id = launch_prelaunch_data_generator( launcher_service_id = launch_prelaunch_data_generator(
{ {
genesis_generation_config_artifact_uuid: CONFIG_DIRPATH_ON_GENERATOR, genesis_generation_config_artifact_uuid: CONFIG_DIRPATH_ON_GENERATOR,
......
...@@ -45,7 +45,7 @@ def generate_el_genesis_data( ...@@ -45,7 +45,7 @@ def generate_el_genesis_data(
genesis_generation_config_artifact_uuid = render_templates(template_and_data_by_rel_dest_filepath) genesis_generation_config_artifact_uuid = render_templates(template_and_data_by_rel_dest_filepath)
# TODO Make this the actual data generator - comment copied from the original module # TODO(old) Make this the actual data generator - comment copied from the original module
launcher_service_id = launch_prelaunch_data_generator( launcher_service_id = launch_prelaunch_data_generator(
{ {
genesis_generation_config_artifact_uuid: CONFIG_DIRPATH_ON_GENERATOR, genesis_generation_config_artifact_uuid: CONFIG_DIRPATH_ON_GENERATOR,
......
...@@ -2,7 +2,7 @@ load("github.com/kurtosis-tech/eth2-module/src/shared_utils/shared_utils.star", ...@@ -2,7 +2,7 @@ load("github.com/kurtosis-tech/eth2-module/src/shared_utils/shared_utils.star",
SERVICE_ID = "prometheus" SERVICE_ID = "prometheus"
# TODO I'm not sure if we should use latest version or ping an specific version instead # TODO(old) I'm not sure if we should use latest version or ping an specific version instead
IMAGE_NAME = "prom/prometheus:latest" IMAGE_NAME = "prom/prometheus:latest"
HTTP_PORT_ID = "http" HTTP_PORT_ID = "http"
......
apiVersion: 1 apiVersion: 1
# TODO we can improve this, adding an array that we can use to iterate # TODO(old) we can improve this, adding an array that we can use to iterate
# TODO an get different datasource configurations # TODO(old) an get different datasource configurations
datasources: datasources:
- name: Prometheus - name: Prometheus
type: prometheus type: prometheus
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment