From e99c725a0ff4eef79b9490f27558106c87eba53b Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Mon, 18 Aug 2025 15:23:24 +0200 Subject: [PATCH 1/4] feat: rename eip7732 to gloas --- src/package_io/constants.star | 2 +- .../el_cl_genesis/el_cl_genesis_generator.star | 2 +- static_files/genesis-generation-config/el-cl/values.env.tmpl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package_io/constants.star b/src/package_io/constants.star index 115fb8561..266e2c1b0 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -125,7 +125,7 @@ CAPELLA_FORK_VERSION = "0x40000038" DENEB_FORK_VERSION = "0x50000038" ELECTRA_FORK_VERSION = "0x60000038" FULU_FORK_VERSION = "0x70000038" -EIP7732_FORK_VERSION = "0x80000038" +GLOAS_FORK_VERSION = "0x80000038" EIP7805_FORK_VERSION = "0x90000038" FAR_FUTURE_EPOCH = 18446744073709551615 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 43c7814bf..1c646858f 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 @@ -144,7 +144,7 @@ def new_env_file_for_el_cl_genesis_data( "DenebForkVersion": constants.DENEB_FORK_VERSION, "ElectraForkVersion": constants.ELECTRA_FORK_VERSION, "FuluForkVersion": constants.FULU_FORK_VERSION, - "Eip7732ForkVersion": constants.EIP7732_FORK_VERSION, + "Eip7732ForkVersion": constants.GLOAS_FORK_VERSION, "Eip7805ForkVersion": constants.EIP7805_FORK_VERSION, "ShadowForkFile": shadowfork_file, "MinValidatorWithdrawabilityDelay": network_params.min_validator_withdrawability_delay, diff --git a/static_files/genesis-generation-config/el-cl/values.env.tmpl b/static_files/genesis-generation-config/el-cl/values.env.tmpl index 3e5043a82..4de26f220 100644 --- a/static_files/genesis-generation-config/el-cl/values.env.tmpl +++ b/static_files/genesis-generation-config/el-cl/values.env.tmpl @@ -19,8 +19,8 @@ export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}" export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}" export FULU_FORK_VERSION="{{ .FuluForkVersion }}" export FULU_FORK_EPOCH="{{ .FuluForkEpoch }}" -export EIP7732_FORK_VERSION="{{ .Eip7732ForkVersion }}" -export EIP7732_FORK_EPOCH="{{ .Eip7732ForkEpoch }}" +export GLOAS_FORK_VERSION="{{ .Eip7732ForkVersion }}" +export GLOAS_FORK_EPOCH="{{ .Eip7732ForkEpoch }}" export EIP7805_FORK_VERSION="{{ .Eip7805ForkVersion }}" export EIP7805_FORK_EPOCH="{{ .Eip7805ForkEpoch }}" export WITHDRAWAL_TYPE="{{ .WithdrawalType }}" From d105b453ccfa51a7c6d33518803623cc9c108cd7 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Mon, 18 Aug 2025 15:24:13 +0200 Subject: [PATCH 2/4] fix --- .../el_cl_genesis/el_cl_genesis_generator.star | 2 +- static_files/genesis-generation-config/el-cl/values.env.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 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 1c646858f..55e70c1d7 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 @@ -144,7 +144,7 @@ def new_env_file_for_el_cl_genesis_data( "DenebForkVersion": constants.DENEB_FORK_VERSION, "ElectraForkVersion": constants.ELECTRA_FORK_VERSION, "FuluForkVersion": constants.FULU_FORK_VERSION, - "Eip7732ForkVersion": constants.GLOAS_FORK_VERSION, + "GloasForkVersion": constants.GLOAS_FORK_VERSION, "Eip7805ForkVersion": constants.EIP7805_FORK_VERSION, "ShadowForkFile": shadowfork_file, "MinValidatorWithdrawabilityDelay": network_params.min_validator_withdrawability_delay, diff --git a/static_files/genesis-generation-config/el-cl/values.env.tmpl b/static_files/genesis-generation-config/el-cl/values.env.tmpl index 4de26f220..3ed6ed7de 100644 --- a/static_files/genesis-generation-config/el-cl/values.env.tmpl +++ b/static_files/genesis-generation-config/el-cl/values.env.tmpl @@ -19,7 +19,7 @@ export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}" export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}" export FULU_FORK_VERSION="{{ .FuluForkVersion }}" export FULU_FORK_EPOCH="{{ .FuluForkEpoch }}" -export GLOAS_FORK_VERSION="{{ .Eip7732ForkVersion }}" +export GLOAS_FORK_VERSION="{{ .GloasForkVersion }}" export GLOAS_FORK_EPOCH="{{ .Eip7732ForkEpoch }}" export EIP7805_FORK_VERSION="{{ .Eip7805ForkVersion }}" export EIP7805_FORK_EPOCH="{{ .Eip7805ForkEpoch }}" From 7d7ebc0512e13459c337612857ffb9722e8b17dd Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Mon, 18 Aug 2025 15:27:17 +0200 Subject: [PATCH 3/4] fix --- .github/tests/altair-genesis.yaml | 1 + .github/tests/bellatrix-genesis.yaml | 1 + .github/tests/capella-genesis.yaml | 1 + .github/tests/deneb-genesis.yaml | 1 + .github/tests/deneb.yaml | 1 + .github/tests/electra-genesis.yaml | 1 + .github/tests/fulu-genesis.yaml | 1 + .github/tests/fulu.yaml | 3 +-- README.md | 8 ++++---- src/dora/dora_launcher.star | 2 +- src/package_io/input_parser.star | 6 +++--- src/package_io/sanity_check.star | 2 +- .../el_cl_genesis/el_cl_genesis_generator.star | 2 +- .../genesis-generation-config/el-cl/values.env.tmpl | 2 +- 14 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/tests/altair-genesis.yaml b/.github/tests/altair-genesis.yaml index 6c128e593..2707e88c5 100644 --- a/.github/tests/altair-genesis.yaml +++ b/.github/tests/altair-genesis.yaml @@ -23,5 +23,6 @@ network_params: deneb_fork_epoch: 3 electra_fork_epoch: 4 fulu_fork_epoch: 5 + gloas_fork_epoch: 6 genesis_delay: 120 diff --git a/.github/tests/bellatrix-genesis.yaml b/.github/tests/bellatrix-genesis.yaml index 434bb1b10..9a0ce717c 100644 --- a/.github/tests/bellatrix-genesis.yaml +++ b/.github/tests/bellatrix-genesis.yaml @@ -23,4 +23,5 @@ network_params: deneb_fork_epoch: 2 electra_fork_epoch: 3 fulu_fork_epoch: 4 + gloas_fork_epoch: 5 genesis_delay: 120 diff --git a/.github/tests/capella-genesis.yaml b/.github/tests/capella-genesis.yaml index 2d69824f9..b3b3cac7c 100644 --- a/.github/tests/capella-genesis.yaml +++ b/.github/tests/capella-genesis.yaml @@ -23,4 +23,5 @@ network_params: deneb_fork_epoch: 1 electra_fork_epoch: 2 fulu_fork_epoch: 3 + gloas_fork_epoch: 4 genesis_delay: 120 diff --git a/.github/tests/deneb-genesis.yaml b/.github/tests/deneb-genesis.yaml index a8a7051ff..d4c865861 100644 --- a/.github/tests/deneb-genesis.yaml +++ b/.github/tests/deneb-genesis.yaml @@ -21,4 +21,5 @@ network_params: deneb_fork_epoch: 0 electra_fork_epoch: 1 fulu_fork_epoch: 2 + gloas_fork_epoch: 3 genesis_delay: 120 diff --git a/.github/tests/deneb.yaml b/.github/tests/deneb.yaml index 54fb05eac..2971f5fa4 100644 --- a/.github/tests/deneb.yaml +++ b/.github/tests/deneb.yaml @@ -25,4 +25,5 @@ network_params: deneb_fork_epoch: 1 electra_fork_epoch: 2 fulu_fork_epoch: 3 + gloas_fork_epoch: 4 preset: minimal diff --git a/.github/tests/electra-genesis.yaml b/.github/tests/electra-genesis.yaml index 2da3f11ba..8a62eb09b 100644 --- a/.github/tests/electra-genesis.yaml +++ b/.github/tests/electra-genesis.yaml @@ -21,6 +21,7 @@ network_params: deneb_fork_epoch: 0 electra_fork_epoch: 0 fulu_fork_epoch: 1 + gloas_fork_epoch: 2 genesis_delay: 120 additional_services: - dora diff --git a/.github/tests/fulu-genesis.yaml b/.github/tests/fulu-genesis.yaml index 250eca172..4d82a9ee2 100644 --- a/.github/tests/fulu-genesis.yaml +++ b/.github/tests/fulu-genesis.yaml @@ -42,6 +42,7 @@ network_params: deneb_fork_epoch: 0 electra_fork_epoch: 0 fulu_fork_epoch: 0 + gloas_fork_epoch: 1 genesis_delay: 120 additional_services: - dora diff --git a/.github/tests/fulu.yaml b/.github/tests/fulu.yaml index 8f7fd47cc..9add4c7bd 100644 --- a/.github/tests/fulu.yaml +++ b/.github/tests/fulu.yaml @@ -11,6 +11,5 @@ network_params: deneb_fork_epoch: 0 electra_fork_epoch: 1 fulu_fork_epoch: 2 - eip7732_fork_epoch: 3 - eip7805_fork_epoch: 4 + gloas_fork_epoch: 3 diff --git a/README.md b/README.md index 2ecab0f6e..d09917c86 100644 --- a/README.md +++ b/README.md @@ -587,6 +587,10 @@ network_params: # Defaults to 18446744073709551615 fulu_fork_epoch: 18446744073709551615 + # Gloas fork epoch + # Defaults to 18446744073709551615 + gloas_fork_epoch: 18446744073709551615 + # Network sync base url for syncing public networks from a custom snapshot (mostly useful for shadowforks) # Defaults to "https://snapshots.ethpandaops.io/" # If you have a local snapshot, you can set this to the local url: @@ -621,10 +625,6 @@ network_params: # Base fee update fraction for Electra fork (default 5007716) base_fee_update_fraction_electra: 5007716 - # EIP-7732 fork epoch - # Defaults to 18446744073709551615 - eip7732_fork_epoch: 18446744073709551615 - # EIP-7805 fork epoch # Defaults to 18446744073709551615 eip7805_fork_epoch: 18446744073709551615 diff --git a/src/dora/dora_launcher.star b/src/dora/dora_launcher.star index b82a1a445..61b6a529a 100644 --- a/src/dora/dora_launcher.star +++ b/src/dora/dora_launcher.star @@ -149,7 +149,7 @@ def get_config( + constants.DEFAULT_DORA_IMAGE ) if dora_params.image == default_dora_image: - if network_params.eip7732_fork_epoch < constants.FAR_FUTURE_EPOCH: + if network_params.gloas_fork_epoch < constants.FAR_FUTURE_EPOCH: IMAGE_NAME = ( docker_cache_params.url + ( diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 784db2fbb..376956681 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -417,7 +417,7 @@ def input_parser(plan, input_args): deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"], electra_fork_epoch=result["network_params"]["electra_fork_epoch"], fulu_fork_epoch=result["network_params"]["fulu_fork_epoch"], - eip7732_fork_epoch=result["network_params"]["eip7732_fork_epoch"], + gloas_fork_epoch=result["network_params"]["gloas_fork_epoch"], eip7805_fork_epoch=result["network_params"]["eip7805_fork_epoch"], network=result["network_params"]["network"], min_validator_withdrawability_delay=result["network_params"][ @@ -1118,7 +1118,7 @@ def default_network_params(): "deneb_fork_epoch": 0, "electra_fork_epoch": 0, "fulu_fork_epoch": constants.FAR_FUTURE_EPOCH, - "eip7732_fork_epoch": constants.FAR_FUTURE_EPOCH, + "gloas_fork_epoch": constants.FAR_FUTURE_EPOCH, "eip7805_fork_epoch": constants.FAR_FUTURE_EPOCH, "network_sync_base_url": "https://snapshots.ethpandaops.io/", "force_snapshot_sync": False, @@ -1186,7 +1186,7 @@ def default_minimal_network_params(): "deneb_fork_epoch": 0, "electra_fork_epoch": 0, "fulu_fork_epoch": constants.FAR_FUTURE_EPOCH, - "eip7732_fork_epoch": constants.FAR_FUTURE_EPOCH, + "gloas_fork_epoch": constants.FAR_FUTURE_EPOCH, "eip7805_fork_epoch": constants.FAR_FUTURE_EPOCH, "network_sync_base_url": "https://snapshots.ethpandaops.io/", "force_snapshot_sync": False, diff --git a/src/package_io/sanity_check.star b/src/package_io/sanity_check.star index f13f52aa5..00a5fa2a9 100644 --- a/src/package_io/sanity_check.star +++ b/src/package_io/sanity_check.star @@ -208,7 +208,7 @@ SUBCATEGORY_PARAMS = { "deneb_fork_epoch", "electra_fork_epoch", "fulu_fork_epoch", - "eip7732_fork_epoch", + "gloas_fork_epoch", "eip7805_fork_epoch", "network_sync_base_url", "force_snapshot_sync", 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 55e70c1d7..d2bf4594b 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 @@ -135,7 +135,7 @@ def new_env_file_for_el_cl_genesis_data( "DenebForkEpoch": "{0}".format(network_params.deneb_fork_epoch), "ElectraForkEpoch": "{0}".format(network_params.electra_fork_epoch), "FuluForkEpoch": "{0}".format(network_params.fulu_fork_epoch), - "Eip7732ForkEpoch": "{0}".format(network_params.eip7732_fork_epoch), + "GloasForkEpoch": "{0}".format(network_params.gloas_fork_epoch), "Eip7805ForkEpoch": "{0}".format(network_params.eip7805_fork_epoch), "GenesisForkVersion": constants.GENESIS_FORK_VERSION, "AltairForkVersion": constants.ALTAIR_FORK_VERSION, diff --git a/static_files/genesis-generation-config/el-cl/values.env.tmpl b/static_files/genesis-generation-config/el-cl/values.env.tmpl index 3ed6ed7de..23e21378c 100644 --- a/static_files/genesis-generation-config/el-cl/values.env.tmpl +++ b/static_files/genesis-generation-config/el-cl/values.env.tmpl @@ -20,7 +20,7 @@ export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}" export FULU_FORK_VERSION="{{ .FuluForkVersion }}" export FULU_FORK_EPOCH="{{ .FuluForkEpoch }}" export GLOAS_FORK_VERSION="{{ .GloasForkVersion }}" -export GLOAS_FORK_EPOCH="{{ .Eip7732ForkEpoch }}" +export GLOAS_FORK_EPOCH="{{ .GloasForkEpoch }}" export EIP7805_FORK_VERSION="{{ .Eip7805ForkVersion }}" export EIP7805_FORK_EPOCH="{{ .Eip7805ForkEpoch }}" export WITHDRAWAL_TYPE="{{ .WithdrawalType }}" From 0cea8fa46c68647985db6be56c6712c1d2e216b5 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Mon, 18 Aug 2025 15:28:17 +0200 Subject: [PATCH 4/4] bump egg --- README.md | 2 +- network_params.yaml | 23 ++++++++++++----------- src/package_io/constants.star | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index d09917c86..3e91fea01 100644 --- a/README.md +++ b/README.md @@ -1077,7 +1077,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.1 + image: ethpandaops/ethereum-genesis-generator:5.0.2 # Configuration for public ports and NAT exit IP addresses port_publisher: diff --git a/network_params.yaml b/network_params.yaml index 245db7bfe..2af24fd51 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -91,6 +91,7 @@ network_params: deneb_fork_epoch: 0 electra_fork_epoch: 0 fulu_fork_epoch: 18446744073709551615 + gloas_fork_epoch: 18446744073709551615 network_sync_base_url: https://snapshots.ethpandaops.io/ force_snapshot_sync: false data_column_sidecar_subnet_count: 128 @@ -103,24 +104,24 @@ network_params: devnet_repo: ethpandaops prefunded_accounts: {} bpo_1_epoch: 18446744073709551615 - bpo_1_max_blobs: 12 - bpo_1_target_blobs: 9 + bpo_1_max_blobs: 0 + bpo_1_target_blobs: 0 bpo_1_base_fee_update_fraction: 0 bpo_2_epoch: 18446744073709551615 - bpo_2_max_blobs: 12 - bpo_2_target_blobs: 9 + bpo_2_max_blobs: 0 + bpo_2_target_blobs: 0 bpo_2_base_fee_update_fraction: 0 bpo_3_epoch: 18446744073709551615 - bpo_3_max_blobs: 12 - bpo_3_target_blobs: 9 + bpo_3_max_blobs: 0 + bpo_3_target_blobs: 0 bpo_3_base_fee_update_fraction: 0 bpo_4_epoch: 18446744073709551615 - bpo_4_max_blobs: 12 - bpo_4_target_blobs: 9 + bpo_4_max_blobs: 0 + bpo_4_target_blobs: 0 bpo_4_base_fee_update_fraction: 0 bpo_5_epoch: 18446744073709551615 - bpo_5_max_blobs: 12 - bpo_5_target_blobs: 9 + bpo_5_max_blobs: 0 + bpo_5_target_blobs: 0 bpo_5_base_fee_update_fraction: 0 withdrawal_type: "0x00" withdrawal_address: "0x8943545177806ED17B9F23F0a21ee5948eCaa776" @@ -209,7 +210,7 @@ keymanager_enabled: false checkpoint_sync_enabled: false checkpoint_sync_url: "" ethereum_genesis_generator_params: - image: ethpandaops/ethereum-genesis-generator:5.0.1 + image: ethpandaops/ethereum-genesis-generator:5.0.2 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 266e2c1b0..381aa8c58 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.1" + "ethpandaops/ethereum-genesis-generator:5.0.2" ) DEFAULT_YQ_IMAGE = "linuxserver/yq" DEFAULT_FLASHBOTS_RELAY_IMAGE = "ethpandaops/mev-boost-relay:main"