fix: dora template fix (#452)

ethpandaops · Jan 10, 2024 · f9243ea · f9243ea
1 parent bb5a0c1
commit f9243ea
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/main.star b/main.star
@@ -344,6 +344,7 @@ def run(plan, args={}):
                 all_cl_client_contexts,
                 el_cl_data_files_artifact_uuid,
                 network_params.electra_fork_epoch,
+                network_params.network,
             )
             plan.print("Successfully launched dora")
         elif additional_service == "blobscan":

diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star
@@ -139,6 +139,13 @@ def launch(
         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_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

diff --git a/src/dora/dora_launcher.star b/src/dora/dora_launcher.star
@@ -33,6 +33,7 @@ def launch_dora(
     cl_client_contexts,
     el_cl_data_files_artifact_uuid,
     electra_fork_epoch,
+    network,
 ):
     all_cl_client_info = []
     for index, client in enumerate(cl_client_contexts):
@@ -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(
         config_template, template_data
@@ -58,21 +61,25 @@ def launch_dora(
         config_files_artifact_name,
         el_cl_data_files_artifact_uuid,
         electra_fork_epoch,
+        network,
     )
 
     plan.add_service(SERVICE_NAME, 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(
         DORA_CONFIG_MOUNT_DIRPATH_ON_SERVICE,
         DORA_CONFIG_FILENAME,
     )
 
     # 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"
     else:
         IMAGE_NAME = "ethpandaops/dora:master"
@@ -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 {
+        "Network": network,
         "ListenPortNum": listen_port_num,
         "CLClientInfo": cl_client_info,
+        "PublicNetwork": True if network in constants.PUBLIC_NETWORKS else False,
     }
 
 

diff --git a/static_files/dora-config/config.yaml.tmpl b/static_files/dora-config/config.yaml.tmpl
@@ -4,9 +4,11 @@ logging:
 
 # Chain network configuration
 chain:
-  name: "kurtosis-testnet"
+  name: {{ .Network }}
+{{ if not .PublicNetwork }}
   configPath: "/network-configs/network-configs/config.yaml"
-  displayName: "Kurtosis Testnet"
+{{ end }}
+  displayName: "{{ .Network }}"
 
 # HTTP Server configuration
 server:
@@ -20,7 +22,7 @@ frontend:
 
   # Name of the site, displayed in the title tag
   siteName: "Dora the Explorer"
-  siteSubtitle: "Kurtosis Testnet"
+  siteSubtitle: "{{ .Network }} - Kurtosis"
 
   # link to EL Explorer
   ethExplorerLink: ""