From 1966e290db24261b20317d098936c681c9bfea01 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Fri, 26 Sep 2025 10:53:35 +0200 Subject: [PATCH 1/7] fix: override bpo1,2 --- src/el/erigon/erigon_launcher.star | 2 - src/el/geth/geth_launcher.star | 14 +++-- src/participant_network.star | 2 +- .../el_cl_genesis/el_cl_genesis_data.star | 6 +- .../el_cl_genesis_generator.star | 60 +++++++++++++------ 5 files changed, 55 insertions(+), 29 deletions(-) diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star index d0de51485..eca414cb4 100644 --- a/src/el/erigon/erigon_launcher.star +++ b/src/el/erigon/erigon_launcher.star @@ -314,6 +314,4 @@ def new_erigon_launcher(el_cl_genesis_data, jwt_file, networkid): el_cl_genesis_data=el_cl_genesis_data, jwt_file=jwt_file, networkid=networkid, - osaka_time=el_cl_genesis_data.osaka_time, - osaka_enabled=el_cl_genesis_data.osaka_enabled, ) diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star index aa37bd4cf..10f237ac9 100644 --- a/src/el/geth/geth_launcher.star +++ b/src/el/geth/geth_launcher.star @@ -235,8 +235,15 @@ def get_config( ) ) if constants.NETWORK_NAME.shadowfork in network_params.network: # shadowfork - if launcher.osaka_enabled: - cmd.append("--override.osaka=" + str(launcher.osaka_time)) + cmd.append( + "--override.osaka=" + str(launcher.shadowfork_times["osaka_time"]) + ) + cmd.append( + "--override.bpo1=" + str(launcher.shadowfork_times["bpo_1_time"]) + ) + cmd.append( + "--override.bpo2=" + str(launcher.shadowfork_times["bpo_2_time"]) + ) elif ( network_params.network not in constants.PUBLIC_NETWORKS @@ -364,6 +371,5 @@ def new_geth_launcher( el_cl_genesis_data=el_cl_genesis_data, jwt_file=jwt_file, networkid=networkid, - osaka_time=el_cl_genesis_data.osaka_time, - osaka_enabled=el_cl_genesis_data.osaka_enabled, + shadowfork_times=el_cl_genesis_data.shadowfork_times, ) diff --git a/src/participant_network.star b/src/participant_network.star index f728b0747..836fe2ca3 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -603,5 +603,5 @@ def launch_participant_network( el_cl_data.genesis_validators_root, el_cl_data.files_artifact_uuid, network_id, - el_cl_data.osaka_time, + el_cl_data.shadowfork_times, ) 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..66923a96c 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 @@ -1,12 +1,10 @@ def new_el_cl_genesis_data( files_artifact_uuid, genesis_validators_root, - osaka_time=0, - osaka_enabled=False, + shadowfork_times={}, ): return struct( files_artifact_uuid=files_artifact_uuid, genesis_validators_root=genesis_validators_root, - osaka_time=osaka_time, - osaka_enabled=osaka_enabled, + shadowfork_times=shadowfork_times, ) 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..18aff4316 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 @@ -92,29 +92,53 @@ def generate_el_cl_genesis_data( tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations), node_selectors=global_node_selectors, ) - osaka_time = plan.run_sh( - name="read-osaka-time", - description="Reading osaka time from genesis", - run="jq '.config.osakaTime' /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, - ) + shadowfork_times = {} + if constants.NETWORK_NAME.shadowfork in network_params.network: + osaka_time = plan.run_sh( + name="read-osaka-time", + description="Reading osaka time from genesis", + run="jq '.config.osakaTime' /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, + ) - osaka_enabled_check = plan.run_sh( - name="check-osaka-enabled", - description="Check if osaka time is enabled (not false)", - run="test \"$(jq '.config.osakaTime // 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, - ) + bpo_1_time = plan.run_sh( + name="read-bpo-1-time", + description="Reading bpo 1 time from genesis", + run="jq '.config.bpo1Time' /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, + ) + + bpo_2_time = plan.run_sh( + name="read-bpo-2-time", + description="Reading bpo 2 time from genesis", + run="jq '.config.bpo2Time' /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, + ) + + shadowfork_times = { + "osaka_time": osaka_time.output, + "bpo_1_time": bpo_1_time.output, + "bpo_2_time": bpo_2_time.output, + } + + plan.print("Shadowfork times: {0}".format(shadowfork_times)) 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", + shadowfork_times, ) return result From 8baad53dfe94a2dcea8ca3fe915e9d319d67989b Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Fri, 26 Sep 2025 11:01:28 +0200 Subject: [PATCH 2/7] set default bpo values --- src/package_io/input_parser.star | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index ddb130e29..3d5730d9d 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -1191,13 +1191,13 @@ def default_network_params(): "perfect_peerdas_enabled": False, "gas_limit": 0, "bpo_1_epoch": 18446744073709551615, - "bpo_1_max_blobs": 0, - "bpo_1_target_blobs": 0, - "bpo_1_base_fee_update_fraction": 0, + "bpo_1_max_blobs": 15, + "bpo_1_target_blobs": 10, + "bpo_1_base_fee_update_fraction": 8346193, "bpo_2_epoch": 18446744073709551615, - "bpo_2_max_blobs": 0, - "bpo_2_target_blobs": 0, - "bpo_2_base_fee_update_fraction": 0, + "bpo_2_max_blobs": 21, + "bpo_2_target_blobs": 14, + "bpo_2_base_fee_update_fraction": 11684671, "bpo_3_epoch": 18446744073709551615, "bpo_3_max_blobs": 0, "bpo_3_target_blobs": 0, From 92774019bb5ce61d7b068cd4d5222d002dc96045 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Fri, 26 Sep 2025 11:11:02 +0200 Subject: [PATCH 3/7] fix spamoor --- src/participant_network.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/participant_network.star b/src/participant_network.star index 836fe2ca3..d0b396eb0 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -603,5 +603,5 @@ def launch_participant_network( el_cl_data.genesis_validators_root, el_cl_data.files_artifact_uuid, network_id, - el_cl_data.shadowfork_times, + el_cl_data.shadowfork_times["osaka_time"], ) From 0dbed090c3f26ae97091eb615814562ec595c4b1 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Mon, 29 Sep 2025 16:42:33 +0200 Subject: [PATCH 4/7] bump --- .../el_cl_genesis_generator.star | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) 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 18aff4316..da60bd486 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 @@ -93,45 +93,45 @@ def generate_el_cl_genesis_data( node_selectors=global_node_selectors, ) shadowfork_times = {} - if constants.NETWORK_NAME.shadowfork in network_params.network: - osaka_time = plan.run_sh( - name="read-osaka-time", - description="Reading osaka time from genesis", - run="jq '.config.osakaTime' /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, - ) - bpo_1_time = plan.run_sh( - name="read-bpo-1-time", - description="Reading bpo 1 time from genesis", - run="jq '.config.bpo1Time' /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, - ) + osaka_time = plan.run_sh( + name="read-osaka-time", + description="Reading osaka time from genesis", + run="jq '.config.osakaTime' /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, + ) - bpo_2_time = plan.run_sh( - name="read-bpo-2-time", - description="Reading bpo 2 time from genesis", - run="jq '.config.bpo2Time' /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, - ) + bpo_1_time = plan.run_sh( + name="read-bpo-1-time", + description="Reading bpo 1 time from genesis", + run="jq '.config.bpo1Time' /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, + ) - shadowfork_times = { - "osaka_time": osaka_time.output, - "bpo_1_time": bpo_1_time.output, - "bpo_2_time": bpo_2_time.output, - } + bpo_2_time = plan.run_sh( + name="read-bpo-2-time", + description="Reading bpo 2 time from genesis", + run="jq '.config.bpo2Time' /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, + ) + + shadowfork_times = { + "osaka_time": osaka_time.output, + "bpo_1_time": bpo_1_time.output, + "bpo_2_time": bpo_2_time.output, + } plan.print("Shadowfork times: {0}".format(shadowfork_times)) From 2a2fcd6f19c7187eb37700276c50c178834788a5 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 2 Oct 2025 12:17:32 +0200 Subject: [PATCH 5/7] bump egg --- README.md | 2 +- network_params.yaml | 2 +- src/package_io/constants.star | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e7c3d7952..06f299870 100644 --- a/README.md +++ b/README.md @@ -1151,7 +1151,7 @@ spamoor_params: # Ethereum genesis generator params ethereum_genesis_generator_params: # The image to use for ethereum genesis generator - image: ethpandaops/ethereum-genesis-generator:5.0.6 + image: ethpandaops/ethereum-genesis-generator:5.0.7 # Configuration for public ports and NAT exit IP addresses port_publisher: diff --git a/network_params.yaml b/network_params.yaml index 612b6fd2f..3321e4b5f 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -221,7 +221,7 @@ keymanager_enabled: false checkpoint_sync_enabled: false checkpoint_sync_url: "" ethereum_genesis_generator_params: - image: ethpandaops/ethereum-genesis-generator:5.0.6 + image: ethpandaops/ethereum-genesis-generator:5.0.7 port_publisher: nat_exit_ip: KURTOSIS_IP_ADDR_PLACEHOLDER el: diff --git a/src/package_io/constants.star b/src/package_io/constants.star index 497ab1104..487cddf88 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -97,7 +97,7 @@ DEFAULT_SPAMOOR_IMAGE = "ethpandaops/spamoor:latest" DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest" DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest" DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE = ( - "ethpandaops/ethereum-genesis-generator:5.0.6" + "ethpandaops/ethereum-genesis-generator:5.0.7" ) DEFAULT_YQ_IMAGE = "linuxserver/yq" DEFAULT_FLASHBOTS_RELAY_IMAGE = "ethpandaops/mev-boost-relay:main" From f3cb1498e0597db1ebd806ec49212b5287410c06 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 2 Oct 2025 12:18:05 +0200 Subject: [PATCH 6/7] lint --- .../el_cl_genesis/el_cl_genesis_generator.star | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) 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 da60bd486..c0c6a581e 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 @@ -99,9 +99,7 @@ def generate_el_cl_genesis_data( description="Reading osaka time from genesis", run="jq '.config.osakaTime' /data/genesis.json | tr -d '\n'", files={"/data": genesis.files_artifacts[0]}, - tolerations=shared_utils.get_tolerations( - global_tolerations=global_tolerations - ), + tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations), node_selectors=global_node_selectors, ) @@ -110,9 +108,7 @@ def generate_el_cl_genesis_data( description="Reading bpo 1 time from genesis", run="jq '.config.bpo1Time' /data/genesis.json | tr -d '\n'", files={"/data": genesis.files_artifacts[0]}, - tolerations=shared_utils.get_tolerations( - global_tolerations=global_tolerations - ), + tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations), node_selectors=global_node_selectors, ) @@ -121,9 +117,7 @@ def generate_el_cl_genesis_data( description="Reading bpo 2 time from genesis", run="jq '.config.bpo2Time' /data/genesis.json | tr -d '\n'", files={"/data": genesis.files_artifacts[0]}, - tolerations=shared_utils.get_tolerations( - global_tolerations=global_tolerations - ), + tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations), node_selectors=global_node_selectors, ) From e193e1ef3d4f1b176f8528aae0d2857b1b7ba381 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 2 Oct 2025 12:20:06 +0200 Subject: [PATCH 7/7] fix hoodi genesis time --- src/package_io/constants.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package_io/constants.star b/src/package_io/constants.star index 487cddf88..d62d76ce0 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -191,7 +191,7 @@ GENESIS_TIME = { "mainnet": 1606824023, "sepolia": 1655733600, "holesky": 1695902400, - "hoodi": 1741971600, + "hoodi": 1742213400, } VOLUME_SIZE = {