diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star index d0de51485..4baac27da 100644 --- a/src/el/erigon/erigon_launcher.star +++ b/src/el/erigon/erigon_launcher.star @@ -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, ) diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star index aa37bd4cf..87e23961d 100644 --- a/src/el/geth/geth_launcher.star +++ b/src/el/geth/geth_launcher.star @@ -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, ) diff --git a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_data.star b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_data.star index c750ed114..2e699743d 100644 --- a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_data.star +++ b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_data.star @@ -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, ) diff --git a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star index 382e70584..e40067892 100644 --- a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star +++ b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star @@ -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)", @@ -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