Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ethereum-package
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
ethereum-package
Commits
f9243ea8
Unverified
Commit
f9243ea8
authored
Jan 10, 2024
by
Barnabas Busa
Committed by
GitHub
Jan 10, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: dora template fix (#452)
parent
bb5a0c1b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
7 deletions
+26
-7
main.star
main.star
+1
-0
teku_launcher.star
src/cl/teku/teku_launcher.star
+7
-0
dora_launcher.star
src/dora/dora_launcher.star
+13
-4
config.yaml.tmpl
static_files/dora-config/config.yaml.tmpl
+5
-3
No files found.
main.star
View file @
f9243ea8
...
@@ -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":
...
...
src/cl/teku/teku_launcher.star
View file @
f9243ea8
...
@@ -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
...
...
src/dora/dora_launcher.star
View file @
f9243ea8
...
@@ -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,
}
}
...
...
static_files/dora-config/config.yaml.tmpl
View file @
f9243ea8
...
@@ -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: ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment