feat: make genesis electra (#940)

Signed-off-by: Barnabas Busa <[email protected]>

Author: barnabasbusa

.github/tests/eof-fulu.yaml.norun

@@ -15,8 +15,7 @@ participants:
 global_log_level: info
 
 network_params:
-  electra_fork_epoch: 1
-  fulu_fork_epoch: 2
+  fulu_fork_epoch: 1
   seconds_per_slot: 4
 
 additional_services:

.github/tests/eof.yaml.norun

@@ -5,8 +5,7 @@ participants:
     cl_type: teku
     cl_image: ethpandaops/teku:master
 network_params:
-  electra_fork_epoch: 1
-  fulu_fork_epoch: 2
+  fulu_fork_epoch: 1
   preset: minimal
 additional_services:
   - dora

.github/tests/mev-pectra.yaml

@@ -51,7 +51,6 @@ mev_params:
   mev_builder_subsidy: 1
 
 network_params:
-  electra_fork_epoch: 0
   min_validator_withdrawability_delay: 1
   shard_committee_period: 1
   churn_limit_quotient: 16

.github/tests/peerdas-fulu.yaml.norun

@@ -68,8 +68,7 @@ participants:
 global_log_level: debug
 
 network_params:
-  electra_fork_epoch: 1
-  fulu_fork_epoch: 2
+  fulu_fork_epoch: 1
 
 additional_services:
   - dora

README.md

@@ -557,8 +557,8 @@ network_params:
   deneb_fork_epoch: 0
 
   # Electra fork epoch
-  # Defaults to 18446744073709551615
-  electra_fork_epoch: 18446744073709551615
+  # Defaults to 0
+  electra_fork_epoch: 0
 
   # Fulu fork epoch
   # Defaults to 18446744073709551615

main.star

@@ -465,8 +465,6 @@ def run(plan, args={}):
                 global_node_selectors,
             )
             plan.print("Successfully launched tx-fuzz")
-        # We need a way to do time.sleep
-        # TODO add code that waits for CL genesis
         elif additional_service == "forkmon":
             plan.print("Launching el forkmon")
             forkmon_config_template = read_file(

network_params.yaml

@@ -86,7 +86,7 @@ network_params:
   min_validator_withdrawability_delay: 256
   shard_committee_period: 256
   deneb_fork_epoch: 0
-  electra_fork_epoch: 18446744073709551615
+  electra_fork_epoch: 0
   fulu_fork_epoch: 18446744073709551615
   network_sync_base_url: https://snapshots.ethpandaops.io/
   force_snapshot_sync: false

src/el/geth/geth_launcher.star

@@ -124,28 +124,11 @@ def get_config(
         gcmode_archive = True
     else:
         gcmode_archive = False
-    # TODO: Remove this once electra fork has path based storage scheme implemented
-    if (
-        constants.NETWORK_NAME.verkle in network_params.network
-    ) and constants.NETWORK_NAME.shadowfork not in network_params.network:
-        if (
-            constants.NETWORK_NAME.verkle + "-gen" in network_params.network
-        ):  # verkle-gen
-            init_datadir_cmd_str = "geth --datadir={0} --cache.preimages --override.prague={1} init {2}".format(
-                EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
-                launcher.prague_time,
-                constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/genesis.json",
-            )
-        else:  # verkle
-            init_datadir_cmd_str = (
-                "geth --datadir={0} --cache.preimages init {1}".format(
-                    EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
-                    constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/genesis.json",
-                )
-            )
-    elif constants.NETWORK_NAME.shadowfork in network_params.network:  # shadowfork
+
+    if constants.NETWORK_NAME.shadowfork in network_params.network:  # shadowfork
         init_datadir_cmd_str = "echo shadowfork"
 
+    # TODO: Remove once archive mode works with path based storage scheme
     elif gcmode_archive:  # Disable path based storage scheme archive mode
         init_datadir_cmd_str = "geth init --state.scheme=hash --datadir={0} {1}".format(
             EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
@@ -197,15 +180,8 @@ def get_config(
 
     cmd = [
         "geth",
-        # Disable path based storage scheme for electra fork and verkle
         # TODO: REMOVE Once geth default db is path based, and builder rebased
-        "{0}".format(
-            "--state.scheme=hash"
-            if "verkle" in network_params.network or gcmode_archive
-            else ""
-        ),
-        # Override prague fork timestamp for electra fork
-        "{0}".format("--cache.preimages" if "verkle" in network_params.network else ""),
+        "{0}".format("--state.scheme=hash" if gcmode_archive else ""),
         "{0}".format(
             "--{}".format(network_params.network)
             if network_params.network in constants.PUBLIC_NETWORKS
@@ -278,11 +254,8 @@ def get_config(
                 )
             )
         if constants.NETWORK_NAME.shadowfork in network_params.network:  # shadowfork
-            cmd.append("--override.prague=" + str(launcher.prague_time))
-            if "verkle" in network_params.network:  # verkle-shadowfork
-                cmd.append("--override.overlay-stride=10000")
-                cmd.append("--override.blockproof=true")
-                cmd.append("--clear.verkle.costs=true")
+            if launcher.prague_time:
+                cmd.append("--override.prague=" + str(launcher.prague_time))
 
     elif (
         network_params.network not in constants.PUBLIC_NETWORKS

src/package_io/input_parser.star

@@ -58,10 +58,6 @@ DEFAULT_REMOTE_SIGNER_IMAGES = {
     "web3signer": "consensys/web3signer:latest",
 }
 
-# Placeholder value for the deneb fork epoch if electra is being run
-# TODO: This is a hack, and should be removed once we electra is rebased on deneb
-HIGH_DENEB_VALUE_FORK_VERKLE = 2000000000
-
 # MEV Params
 MEV_BOOST_PORT = 18550
 MEV_BOOST_SERVICE_NAME_PREFIX = "mev-boost"
@@ -935,7 +931,7 @@ def default_network_params():
         "bellatrix_fork_epoch": 0,
         "capella_fork_epoch": 0,
         "deneb_fork_epoch": 0,
-        "electra_fork_epoch": constants.FAR_FUTURE_EPOCH,
+        "electra_fork_epoch": 0,
         "fulu_fork_epoch": constants.FAR_FUTURE_EPOCH,
         "eip7732_fork_epoch": constants.FAR_FUTURE_EPOCH,
         "eip7805_fork_epoch": constants.FAR_FUTURE_EPOCH,
@@ -981,7 +977,7 @@ def default_minimal_network_params():
         "bellatrix_fork_epoch": 0,
         "capella_fork_epoch": 0,
         "deneb_fork_epoch": 0,
-        "electra_fork_epoch": constants.FAR_FUTURE_EPOCH,
+        "electra_fork_epoch": 0,
         "fulu_fork_epoch": constants.FAR_FUTURE_EPOCH,
         "eip7732_fork_epoch": constants.FAR_FUTURE_EPOCH,
         "eip7805_fork_epoch": constants.FAR_FUTURE_EPOCH,