Merge branch 'main' into pk910/support-large-contracts

README.md

@@ -956,6 +956,11 @@ spamoor_params:
   # Defaults to empty
   spamoor_extra_args: []
 
+# Ethereum genesis generator params
+ethereum_genesis_generator_params:
+  # The image to use for ethereum genesis generator
+  image: ethpandaops/ethereum-genesis-generator:3.4.7
+
 # Global parameter to set the exit ip address of services and public ports
 port_publisher:
   # if you have a service that you want to expose on a specific interfact; set that IP here

network_params.yaml

@@ -175,6 +175,8 @@ global_node_selectors: {}
 keymanager_enabled: false
 checkpoint_sync_enabled: false
 checkpoint_sync_url: ""
+ethereum_genesis_generator_params:
+  image: ethpandaops/ethereum-genesis-generator:3.4.7
 port_publisher:
   nat_exit_ip: KURTOSIS_IP_ADDR_PLACEHOLDER
   el:

src/assertoor/assertoor_launcher.star

@@ -121,6 +121,10 @@ def get_config(
 
     IMAGE_NAME = assertoor_params.image
 
+    if assertoor_params.image == constants.DEFAULT_ASSERTOOR_IMAGE:
+        if network_params.fulu_fork_epoch < constants.FULU_FORK_EPOCH:
+            IMAGE_NAME = "ethpandaops/assertoor:fulu-support"
+
     return ServiceConfig(
         image=IMAGE_NAME,
         ports=USED_PORTS,

src/dora/dora_launcher.star

@@ -122,8 +122,9 @@ def get_config(
 
     IMAGE_NAME = dora_params.image
 
-    if network_params.electra_fork_epoch < constants.FAR_FUTURE_EPOCH:
-        IMAGE_NAME = "ethpandaops/dora:master"
+    if dora_params.image == constants.DEFAULT_DORA_IMAGE:
+        if network_params.fulu_fork_epoch < constants.FULU_FORK_EPOCH:
+            IMAGE_NAME = "ethpandaops/dora:fulu-support"
 
     return ServiceConfig(
         image=IMAGE_NAME,

src/network_launcher/kurtosis.star

@@ -59,16 +59,9 @@ def launch(
 
     ethereum_genesis_generator_image = shared_utils.docker_cache_image_calc(
         args_with_right_defaults.docker_cache_params,
-        constants.ETHEREUM_GENESIS_GENERATOR.default_genesis_generator_image,
+        args_with_right_defaults.ethereum_genesis_generator_params.image,
     )
 
-    # TODO: remove this temporary verkle activation condition
-    if network_params.electra_fork_epoch == 0:
-        ethereum_genesis_generator_image = shared_utils.docker_cache_image_calc(
-            args_with_right_defaults.docker_cache_params,
-            constants.ETHEREUM_GENESIS_GENERATOR.verkle_genesis,
-        )
-
     return (
         total_number_of_validator_keys,
         ethereum_genesis_generator_image,

src/package_io/constants.star

@@ -85,8 +85,12 @@ MOCK_MEV_TYPE = "mock"
 FLASHBOTS_MEV_TYPE = "flashbots"
 MEV_RS_MEV_TYPE = "mev-rs"
 COMMIT_BOOST_MEV_TYPE = "commit-boost"
-
+DEFAULT_DORA_IMAGE = "ethpandaops/dora:latest"
+DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest"
 DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest"
+DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE = (
+    "ethpandaops/ethereum-genesis-generator:pk910-bash-el-genesis-generator-99ffaaf"
+)
 DEFAULT_FLASHBOTS_RELAY_IMAGE = "flashbots/mev-boost-relay:0.29.2a3"
 DEFAULT_FLASHBOTS_BUILDER_IMAGE = "ethpandaops/reth-rbuilder:develop"
 DEFAULT_FLASHBOTS_MEV_BOOST_IMAGE = "flashbots/mev-boost"
@@ -120,12 +124,6 @@ CONTAINER_REGISTRY = struct(
     gcr="gcr.io",
 )
 
-
-ETHEREUM_GENESIS_GENERATOR = struct(
-    default_genesis_generator_image="ethpandaops/ethereum-genesis-generator:pk910-bash-el-genesis-generator-99ffaaf",  # Default
-    verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
-)
-
 NETWORK_NAME = struct(
     mainnet="mainnet",
     sepolia="sepolia",

src/package_io/input_parser.star

@@ -190,6 +190,10 @@ def input_parser(plan, input_args):
             for sub_attr in input_args["spamoor_params"]:
                 sub_value = input_args["spamoor_params"][sub_attr]
                 result["spamoor_params"][sub_attr] = sub_value
+        elif attr == "ethereum_genesis_generator_params":
+            for sub_attr in input_args["ethereum_genesis_generator_params"]:
+                sub_value = input_args["ethereum_genesis_generator_params"][sub_attr]
+                result["ethereum_genesis_generator_params"][sub_attr] = sub_value
 
     if result.get("disable_peer_scoring"):
         result = enrich_disable_peer_scoring(result)
@@ -476,6 +480,9 @@ def input_parser(plan, input_args):
         keymanager_enabled=result["keymanager_enabled"],
         checkpoint_sync_enabled=result["checkpoint_sync_enabled"],
         checkpoint_sync_url=result["checkpoint_sync_url"],
+        ethereum_genesis_generator_params=struct(
+            image=result["ethereum_genesis_generator_params"]["image"],
+        ),
         port_publisher=struct(
             nat_exit_ip=result["port_publisher"]["nat_exit_ip"],
             cl_enabled=result["port_publisher"]["cl"]["enabled"],
@@ -864,6 +871,7 @@ def default_input_args(input_args):
         "keymanager_enabled": False,
         "checkpoint_sync_enabled": False,
         "checkpoint_sync_url": "",
+        "ethereum_genesis_generator_params": get_default_ethereum_genesis_generator_params(),
         "port_publisher": {
             "nat_exit_ip": constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
             "public_port_start": None,
@@ -1028,7 +1036,7 @@ def get_default_blockscout_params():
 
 def get_default_dora_params():
     return {
-        "image": "ethpandaops/dora:latest",
+        "image": constants.DEFAULT_DORA_IMAGE,
         "env": {},
     }
 
@@ -1127,7 +1135,7 @@ def get_default_goomy_blob_params():
 
 def get_default_assertoor_params():
     return {
-        "image": "ethpandaops/assertoor:latest",
+        "image": constants.DEFAULT_ASSERTOOR_IMAGE,
         "run_stability_check": False,
         "run_block_proposal_check": False,
         "run_lifecycle_test": False,
@@ -1387,6 +1395,7 @@ def docker_cache_image_override(plan, result):
         "prometheus_params.image",
         "grafana_params.image",
         "spamoor_params.image",
+        "ethereum_genesis_generator_params.image",
     ]
 
     if result["docker_cache_params"]["url"] == "":
@@ -1458,3 +1467,9 @@ def docker_cache_image_override(plan, result):
                     tooling_image_key
                 )
             )
+
+
+def get_default_ethereum_genesis_generator_params():
+    return {
+        "image": "ethpandaops/ethereum-genesis-generator:3.4.7",
+    }

src/package_io/sanity_check.star

@@ -254,6 +254,9 @@ SUBCATEGORY_PARAMS = {
         "max_wallets",
         "spamoor_extra_args",
     ],
+    "ethereum_genesis_generator_params": [
+        "image",
+    ],
     "port_publisher": [
         "nat_exit_ip",
         "el",