Skip to content

feat: support amsterdam time #1187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jihoonsong wants to merge 2 commits into from
Closed

feat: support amsterdam time #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1927ce7
feat: support amsterdam time
jihoonsong Sep 19, 2025
ceed275
Merge branch 'main' into amsterdam-time
barnabasbusa Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/el/erigon/erigon_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,4 +316,6 @@ def new_erigon_launcher(el_cl_genesis_data, jwt_file, networkid):
networkid=networkid,
osaka_time=el_cl_genesis_data.osaka_time,
osaka_enabled=el_cl_genesis_data.osaka_enabled,
amsterdam_time=el_cl_genesis_data.amsterdam_time,
amsterdam_enabled=el_cl_genesis_data.amsterdam_enabled,
)
2 changes: 2 additions & 0 deletions src/el/geth/geth_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,4 +366,6 @@ def new_geth_launcher(
networkid=networkid,
osaka_time=el_cl_genesis_data.osaka_time,
osaka_enabled=el_cl_genesis_data.osaka_enabled,
amsterdam_time=el_cl_genesis_data.amsterdam_time,
amsterdam_enabled=el_cl_genesis_data.amsterdam_enabled,
)
4 changes: 4 additions & 0 deletions src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_data.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@ def new_el_cl_genesis_data(
genesis_validators_root,
osaka_time=0,
osaka_enabled=False,
amsterdam_time=0,
amsterdam_enabled=False,
):
return struct(
files_artifact_uuid=files_artifact_uuid,
genesis_validators_root=genesis_validators_root,
osaka_time=osaka_time,
osaka_enabled=osaka_enabled,
amsterdam_time=amsterdam_time,
amsterdam_enabled=amsterdam_enabled,
)
19 changes: 18 additions & 1 deletion src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ def generate_el_cl_genesis_data(
tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations),
node_selectors=global_node_selectors,
)

osaka_enabled_check = plan.run_sh(
name="check-osaka-enabled",
description="Check if osaka time is enabled (not false)",
Expand All @@ -109,12 +108,30 @@ def generate_el_cl_genesis_data(
tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations),
node_selectors=global_node_selectors,
)
amsterdam_time = plan.run_sh(
name="read-amsterdam-time",
description="Reading amsterdam time from genesis",
run="jq '.config.amsterdamTime' /data/genesis.json | tr -d '\n'",
files={"/data": genesis.files_artifacts[0]},
tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations),
node_selectors=global_node_selectors,
)
amsterdam_enabled_check = plan.run_sh(
name="check-amsterdam-enabled",
description="Check if amsterdam time is enabled (not false)",
run="test \"$(jq '.config.amsterdamTime // false' /data/genesis.json | tr -d '\n')\" != \"false\" && echo true || echo false",
files={"/data": genesis.files_artifacts[0]},
tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations),
node_selectors=global_node_selectors,
)

result = el_cl_genesis_data.new_el_cl_genesis_data(
genesis.files_artifacts[0],
genesis_validators_root.output,
osaka_time.output,
osaka_enabled_check.output == "true",
amsterdam_time.output,
amsterdam_enabled_check.output == "true",
)

return result
Expand Down