Commit f9243ea8 authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub

fix: dora template fix (#452)

parent bb5a0c1b
...@@ -344,6 +344,7 @@ def run(plan, args={}): ...@@ -344,6 +344,7 @@ def run(plan, args={}):
all_cl_client_contexts, all_cl_client_contexts,
el_cl_data_files_artifact_uuid, el_cl_data_files_artifact_uuid,
network_params.electra_fork_epoch, network_params.electra_fork_epoch,
network_params.network,
) )
plan.print("Successfully launched dora") plan.print("Successfully launched dora")
elif additional_service == "blobscan": elif additional_service == "blobscan":
......
...@@ -139,6 +139,13 @@ def launch( ...@@ -139,6 +139,13 @@ def launch(
param for param in extra_validator_params param for param in extra_validator_params
] ]
# Holesky has a bigger memory footprint, so it needs more memory
if launcher.network == "holesky":
holesky_beacon_memory_limit = 4096
bn_max_mem = (
int(bn_max_mem) if int(bn_max_mem) > 0 else holesky_beacon_memory_limit
)
bn_min_cpu = int(bn_min_cpu) if int(bn_min_cpu) > 0 else BEACON_MIN_CPU bn_min_cpu = int(bn_min_cpu) if int(bn_min_cpu) > 0 else BEACON_MIN_CPU
bn_max_cpu = int(bn_max_cpu) if int(bn_max_cpu) > 0 else BEACON_MAX_CPU bn_max_cpu = int(bn_max_cpu) if int(bn_max_cpu) > 0 else BEACON_MAX_CPU
bn_min_mem = int(bn_min_mem) if int(bn_min_mem) > 0 else BEACON_MIN_MEMORY bn_min_mem = int(bn_min_mem) if int(bn_min_mem) > 0 else BEACON_MIN_MEMORY
......
...@@ -33,6 +33,7 @@ def launch_dora( ...@@ -33,6 +33,7 @@ def launch_dora(
cl_client_contexts, cl_client_contexts,
el_cl_data_files_artifact_uuid, el_cl_data_files_artifact_uuid,
electra_fork_epoch, electra_fork_epoch,
network,
): ):
all_cl_client_info = [] all_cl_client_info = []
for index, client in enumerate(cl_client_contexts): for index, client in enumerate(cl_client_contexts):
...@@ -42,7 +43,9 @@ def launch_dora( ...@@ -42,7 +43,9 @@ def launch_dora(
) )
) )
template_data = new_config_template_data(HTTP_PORT_NUMBER, all_cl_client_info) template_data = new_config_template_data(
network, HTTP_PORT_NUMBER, all_cl_client_info
)
template_and_data = shared_utils.new_template_and_data( template_and_data = shared_utils.new_template_and_data(
config_template, template_data config_template, template_data
...@@ -58,13 +61,17 @@ def launch_dora( ...@@ -58,13 +61,17 @@ def launch_dora(
config_files_artifact_name, config_files_artifact_name,
el_cl_data_files_artifact_uuid, el_cl_data_files_artifact_uuid,
electra_fork_epoch, electra_fork_epoch,
network,
) )
plan.add_service(SERVICE_NAME, config) plan.add_service(SERVICE_NAME, config)
def get_config( def get_config(
config_files_artifact_name, el_cl_data_files_artifact_uuid, electra_fork_epoch config_files_artifact_name,
el_cl_data_files_artifact_uuid,
electra_fork_epoch,
network,
): ):
config_file_path = shared_utils.path_join( config_file_path = shared_utils.path_join(
DORA_CONFIG_MOUNT_DIRPATH_ON_SERVICE, DORA_CONFIG_MOUNT_DIRPATH_ON_SERVICE,
...@@ -72,7 +79,7 @@ def get_config( ...@@ -72,7 +79,7 @@ def get_config(
) )
# TODO: This is a hack to get the verkle support image for the electra fork # TODO: This is a hack to get the verkle support image for the electra fork
if electra_fork_epoch != None: if electra_fork_epoch != None or "verkle" in network:
IMAGE_NAME = "ethpandaops/dora:verkle-support" IMAGE_NAME = "ethpandaops/dora:verkle-support"
else: else:
IMAGE_NAME = "ethpandaops/dora:master" IMAGE_NAME = "ethpandaops/dora:master"
...@@ -93,10 +100,12 @@ def get_config( ...@@ -93,10 +100,12 @@ def get_config(
) )
def new_config_template_data(listen_port_num, cl_client_info): def new_config_template_data(network, listen_port_num, cl_client_info):
return { return {
"Network": network,
"ListenPortNum": listen_port_num, "ListenPortNum": listen_port_num,
"CLClientInfo": cl_client_info, "CLClientInfo": cl_client_info,
"PublicNetwork": True if network in constants.PUBLIC_NETWORKS else False,
} }
......
...@@ -4,9 +4,11 @@ logging: ...@@ -4,9 +4,11 @@ logging:
# Chain network configuration # Chain network configuration
chain: chain:
name: "kurtosis-testnet" name: {{ .Network }}
{{ if not .PublicNetwork }}
configPath: "/network-configs/network-configs/config.yaml" configPath: "/network-configs/network-configs/config.yaml"
displayName: "Kurtosis Testnet" {{ end }}
displayName: "{{ .Network }}"
# HTTP Server configuration # HTTP Server configuration
server: server:
...@@ -20,7 +22,7 @@ frontend: ...@@ -20,7 +22,7 @@ frontend:
# Name of the site, displayed in the title tag # Name of the site, displayed in the title tag
siteName: "Dora the Explorer" siteName: "Dora the Explorer"
siteSubtitle: "Kurtosis Testnet" siteSubtitle: "{{ .Network }} - Kurtosis"
# link to EL Explorer # link to EL Explorer
ethExplorerLink: "" ethExplorerLink: ""
......
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