From 8959fc80786c04200aecabcbbd426e47ead24ae4 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Tue, 5 Dec 2023 16:13:53 +0100 Subject: [PATCH] feat: update ethereum-genesis-generator images (#385) --- src/participant_network.star | 8 ++++---- .../el_cl_genesis/el_cl_genesis_generator.star | 10 +++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/participant_network.star b/src/participant_network.star index 4043285de..924ec1ad5 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -89,7 +89,7 @@ def launch_participant_network( and network_params.electra_fork_epoch == None ): ethereum_genesis_generator_image = ( - "ethpandaops/ethereum-genesis-generator:1.3.14" + "ethpandaops/ethereum-genesis-generator:1.3.15" ) # we are running capella genesis - default behavior elif ( @@ -97,17 +97,17 @@ def launch_participant_network( and network_params.electra_fork_epoch == None ): ethereum_genesis_generator_image = ( - "ethpandaops/ethereum-genesis-generator:2.0.4" + "ethpandaops/ethereum-genesis-generator:2.0.6" ) # we are running electra - experimental elif network_params.electra_fork_epoch != None: if network_params.electra_fork_epoch == 0: ethereum_genesis_generator_image = ( - "ethpandaops/ethereum-genesis-generator:3.0.0-rc.14" + "ethpandaops/ethereum-genesis-generator:4.0.0-rc.2" ) else: ethereum_genesis_generator_image = ( - "ethpandaops/ethereum-genesis-generator:3.0.0-rc.16" + "ethpandaops/ethereum-genesis-generator:3.0.0-rc.17" ) else: fail( 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 21b9aa8b1..24e49142f 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 @@ -61,16 +61,12 @@ def generate_el_cl_genesis_data( wait=None, ) - # this is super hacky lmao - genesis_validators_root = plan.run_python( - run=""" -with open("/data/data/custom_config_data/genesis_validators_root.txt") as genesis_root: - print(genesis_root.read().strip(), end="") -""", + genesis_validators_root = plan.run_sh( + run="cat /data/data/custom_config_data/genesis_validators_root.txt", files={"/data": genesis.files_artifacts[0]}, - store=[StoreSpec(src="/tmp", name="genesis-validators-root")], wait=None, ) + result = el_cl_genesis_data.new_el_cl_genesis_data( genesis.files_artifacts[0], genesis_validators_root.output )