diff --git a/README.md b/README.md index e7c3d7952..76fd8adea 100644 --- a/README.md +++ b/README.md @@ -786,6 +786,10 @@ network_params: # Default to 4096 min_epochs_for_data_column_sidecars_requests: 4096 + # Minimum number of epochs for block requests + # Default to 33024 + min_epochs_for_block_requests: 33024 + # Global parameters for the network # By default includes @@ -1151,7 +1155,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.8 # Configuration for public ports and NAT exit IP addresses port_publisher: diff --git a/network_params.yaml b/network_params.yaml index d754edc15..52e1585b5 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -138,6 +138,7 @@ network_params: withdrawal_address: "0x8943545177806ED17B9F23F0a21ee5948eCaa776" validator_balance: 32 min_epochs_for_data_column_sidecars_requests: 4096 + min_epochs_for_block_requests: 33024 additional_services: [] dora_params: @@ -221,7 +222,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.8 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 391e693f6..bdb72e7ff 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.8" ) DEFAULT_YQ_IMAGE = "linuxserver/yq" DEFAULT_FLASHBOTS_RELAY_IMAGE = "ethpandaops/mev-boost-relay:main" diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index ddb130e29..f26fcf82f 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -527,6 +527,9 @@ def input_parser(plan, input_args): min_epochs_for_data_column_sidecars_requests=result["network_params"][ "min_epochs_for_data_column_sidecars_requests" ], + min_epochs_for_block_requests=result["network_params"][ + "min_epochs_for_block_requests" + ], ), mev_params=struct( mev_relay_image=result["mev_params"]["mev_relay_image"], @@ -1214,6 +1217,7 @@ def default_network_params(): "withdrawal_address": "0x8943545177806ED17B9F23F0a21ee5948eCaa776", "validator_balance": 32, "min_epochs_for_data_column_sidecars_requests": 4096, + "min_epochs_for_block_requests": 33024, } @@ -1294,6 +1298,7 @@ def default_minimal_network_params(): "withdrawal_address": "0x8943545177806ED17B9F23F0a21ee5948eCaa776", "validator_balance": 32, "min_epochs_for_data_column_sidecars_requests": 4096, + "min_epochs_for_block_requests": 272, } diff --git a/src/package_io/sanity_check.star b/src/package_io/sanity_check.star index 5fd769fe7..1cf25c37f 100644 --- a/src/package_io/sanity_check.star +++ b/src/package_io/sanity_check.star @@ -264,6 +264,7 @@ SUBCATEGORY_PARAMS = { "withdrawal_address", "validator_balance", "min_epochs_for_data_column_sidecars_requests", + "min_epochs_for_block_requests", ], "blockscout_params": [ "image", 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..b4ddafd84 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 @@ -210,6 +210,7 @@ def new_env_file_for_el_cl_genesis_data( "WithdrawalAddress": network_params.withdrawal_address, "ValidatorBalance": int(network_params.validator_balance * 1000000000), "MinEpochsForDataColumnSidecarsRequests": network_params.min_epochs_for_data_column_sidecars_requests, + "MinEpochsForBlockRequests": network_params.min_epochs_for_block_requests, } 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 7994eb152..0e5ac8ede 100644 --- a/static_files/genesis-generation-config/el-cl/values.env.tmpl +++ b/static_files/genesis-generation-config/el-cl/values.env.tmpl @@ -79,3 +79,4 @@ export BPO_5_MAX_BLOBS={{ .Bpo5MaxBlobs }} export BPO_5_TARGET_BLOBS={{ .Bpo5TargetBlobs }} export BPO_5_BASE_FEE_UPDATE_FRACTION={{ .Bpo5BaseFeeUpdateFraction }} export MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS={{ .MinEpochsForDataColumnSidecarsRequests }} +export MIN_EPOCHS_FOR_BLOCK_REQUESTS={{ .MinEpochsForBlockRequests }}