feat: add support for fulu/osaka fusaka (#798)

ethpandaops · Oct 15, 2024 · 0a9e445 · 0a9e445
1 parent 853417e
commit 0a9e445
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 29 deletions.
diff --git a/.github/tests/eof.yaml b/.github/tests/eof.yaml
@@ -1,12 +1,13 @@
 participants:
   - el_type: besu
-    el_image: ethpandaops/besu:shemnon-eof-cancunEOF-fork
+    el_image: ethpandaops/besu:main
     count: 3
     cl_type: teku
     cl_image: ethpandaops/teku:master
 network_params:
   electra_fork_epoch: 1
-  eof_activation_epoch: 2
+  fulu_fork_epoch: 2
+  preset: minimal
 additional_services:
   - dora
   - blockscout
diff --git a/README.md b/README.md
@@ -547,15 +547,16 @@ network_params:
   # The epoch at which the deneb/electra/eip7594(peerdas) forks are set to occur. Note: PeerDAS and Electra clients are currently
   # working on forks. So set either one of the below forks.
   deneb_fork_epoch: 0
+
   electra_fork_epoch: 100000000
-  eip7594_fork_epoch: 100000001
+
+  fulu_fork_epoch: 100000001
+
+  eip7594_fork_epoch: 100000002
 
   # The fork version to set if the eip7594 fork is active
   eip7594_fork_version: "0x60000038"
 
-  # EOF activation fork epoch (EL only fork)
-  # Defaults to None
-  eof_activation_epoch: ""
 
   # Network sync base url for syncing public networks from a custom snapshot (mostly useful for shadowforks)
   # Defaults to "https://snapshots.ethpandaops.io/"

diff --git a/main.star b/main.star
@@ -397,7 +397,6 @@ def run(plan, args={}):
                 prefunded_accounts,
                 fuzz_target,
                 tx_spammer_params,
-                network_params.electra_fork_epoch,
                 global_node_selectors,
             )
             plan.print("Successfully launched transaction spammer")

diff --git a/network_params.yaml b/network_params.yaml
@@ -88,10 +88,10 @@ network_params:
   shard_committee_period: 256
   deneb_fork_epoch: 0
   electra_fork_epoch: 100000000
-  eip7594_fork_epoch: 100000001
+  fulu_fork_epoch: 100000001
+  eip7594_fork_epoch: 100000002
   eip7594_fork_version: "0x60000038"
   network_sync_base_url: https://snapshots.ethpandaops.io/
-  eof_activation_epoch: ""
   data_column_sidecar_subnet_count: 128
   samples_per_slot: 8
   custody_requirement: 4

diff --git a/src/assertoor/assertoor_launcher.star b/src/assertoor/assertoor_launcher.star
@@ -121,7 +121,7 @@ def get_config(
 
     if assertoor_params.image != "":
         IMAGE_NAME = assertoor_params.image
-    elif network_params.electra_fork_epoch < 100000000:
+    elif network_params.electra_fork_epoch < constants.ELECTRA_FORK_EPOCH:
         IMAGE_NAME = "ethpandaops/assertoor:electra-support"
     else:
         IMAGE_NAME = "ethpandaops/assertoor:latest"

diff --git a/src/dora/dora_launcher.star b/src/dora/dora_launcher.star
@@ -122,6 +122,8 @@ def get_config(
 
     if dora_params.image != "":
         IMAGE_NAME = dora_params.image
+    elif network_params.electra_fork_epoch < constants.ELECTRA_FORK_EPOCH:
+        IMAGE_NAME = "ethpandaops/dora:master"
     else:
         IMAGE_NAME = "ethpandaops/dora:latest"
 

diff --git a/src/package_io/constants.star b/src/package_io/constants.star
@@ -103,11 +103,15 @@ BELLATRIX_FORK_VERSION = "0x30000038"
 CAPELLA_FORK_VERSION = "0x40000038"
 DENEB_FORK_VERSION = "0x50000038"
 ELECTRA_FORK_VERSION = "0x60000038"
-EIP7594_FORK_VERSION = "0x70000038"
+ELECTRA_FORK_EPOCH = 100000000
+FULU_FORK_VERSION = "0x70000038"
+FULU_FORK_EPOCH = 100000001
+EIP7594_FORK_VERSION = "0x80000038"
+EIP7594_FORK_EPOCH = 100000002
 
 ETHEREUM_GENESIS_GENERATOR = struct(
     capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12",  # Deprecated (no support for minimal config)
-    deneb_genesis="ethpandaops/ethereum-genesis-generator:3.3.7",  # Default
+    deneb_genesis="ethpandaops/ethereum-genesis-generator:3.4.0",  # Default
     verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19",  # soon to be deneb genesis, waiting for rebase
     verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
 )

diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star
@@ -288,9 +288,9 @@ def input_parser(plan, input_args):
             eth1_follow_distance=result["network_params"]["eth1_follow_distance"],
             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"],
             eip7594_fork_epoch=result["network_params"]["eip7594_fork_epoch"],
             eip7594_fork_version=result["network_params"]["eip7594_fork_version"],
-            eof_activation_epoch=result["network_params"]["eof_activation_epoch"],
             network=result["network_params"]["network"],
             min_validator_withdrawability_delay=result["network_params"][
                 "min_validator_withdrawability_delay"
@@ -847,10 +847,10 @@ def default_network_params():
         "min_validator_withdrawability_delay": 256,
         "shard_committee_period": 256,
         "deneb_fork_epoch": 0,
-        "electra_fork_epoch": 100000000,
-        "eip7594_fork_epoch": 100000001,
+        "electra_fork_epoch": constants.ELECTRA_FORK_EPOCH,
+        "fulu_fork_epoch": constants.FULU_FORK_EPOCH,
+        "eip7594_fork_epoch": constants.EIP7594_FORK_EPOCH,
         "eip7594_fork_version": "0x60000038",
-        "eof_activation_epoch": "",
         "network_sync_base_url": "https://snapshots.ethpandaops.io/",
         "data_column_sidecar_subnet_count": 128,
         "samples_per_slot": 8,
@@ -881,10 +881,10 @@ def default_minimal_network_params():
         "min_validator_withdrawability_delay": 256,
         "shard_committee_period": 64,
         "deneb_fork_epoch": 0,
-        "electra_fork_epoch": 100000000,
-        "eip7594_fork_epoch": 100000001,
+        "electra_fork_epoch": constants.ELECTRA_FORK_EPOCH,
+        "fulu_fork_epoch": constants.FULU_FORK_EPOCH,
+        "eip7594_fork_epoch": constants.EIP7594_FORK_EPOCH,
         "eip7594_fork_version": "0x60000038",
-        "eof_activation_epoch": "",
         "network_sync_base_url": "https://snapshots.ethpandaops.io/",
         "data_column_sidecar_subnet_count": 128,
         "samples_per_slot": 8,

diff --git a/src/package_io/sanity_check.star b/src/package_io/sanity_check.star
@@ -155,9 +155,9 @@ SUBCATEGORY_PARAMS = {
         "shard_committee_period",
         "deneb_fork_epoch",
         "electra_fork_epoch",
+        "fulu_fork_epoch",
         "eip7594_fork_epoch",
         "eip7594_fork_version",
-        "eof_activation_epoch",
         "network_sync_base_url",
         "data_column_sidecar_subnet_count",
         "samples_per_slot",

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
@@ -110,14 +110,15 @@ def new_env_file_for_el_cl_genesis_data(
         "Eth1FollowDistance": network_params.eth1_follow_distance,
         "DenebForkEpoch": network_params.deneb_fork_epoch,
         "ElectraForkEpoch": network_params.electra_fork_epoch,
+        "FuluForkEpoch": network_params.fulu_fork_epoch,
         "EIP7594ForkEpoch": network_params.eip7594_fork_epoch,
         "EIP7594ForkVersion": network_params.eip7594_fork_version,
-        "EOFActivationEpoch": network_params.eof_activation_epoch,
         "GenesisForkVersion": constants.GENESIS_FORK_VERSION,
         "BellatrixForkVersion": constants.BELLATRIX_FORK_VERSION,
         "CapellaForkVersion": constants.CAPELLA_FORK_VERSION,
         "DenebForkVersion": constants.DENEB_FORK_VERSION,
         "ElectraForkVersion": constants.ELECTRA_FORK_VERSION,
+        "FuluForkVersion": constants.FULU_FORK_VERSION,
         "ShadowForkFile": shadowfork_file,
         "MinValidatorWithdrawabilityDelay": network_params.min_validator_withdrawability_delay,
         "ShardCommitteePeriod": network_params.shard_committee_period,

diff --git a/src/transaction_spammer/transaction_spammer.star b/src/transaction_spammer/transaction_spammer.star
@@ -13,14 +13,12 @@ def launch_transaction_spammer(
     prefunded_addresses,
     el_uri,
     tx_spammer_params,
-    electra_fork_epoch,
     global_node_selectors,
 ):
     config = get_config(
         prefunded_addresses,
         el_uri,
         tx_spammer_params.tx_spammer_extra_args,
-        electra_fork_epoch,
         global_node_selectors,
     )
     plan.add_service(SERVICE_NAME, config)
@@ -30,7 +28,6 @@ def get_config(
     prefunded_addresses,
     el_uri,
     tx_spammer_extra_args,
-    electra_fork_epoch,
     node_selectors,
 ):
     tx_spammer_image = "ethpandaops/tx-fuzz:master"

diff --git a/src/vc/lighthouse.star b/src/vc/lighthouse.star
@@ -28,8 +28,6 @@ def get_config(
     tolerations,
     node_selectors,
     keymanager_enabled,
-    network,
-    electra_fork_epoch,
     port_publisher,
     vc_index,
 ):

diff --git a/src/vc/vc_launcher.star b/src/vc/vc_launcher.star
@@ -72,8 +72,6 @@ def launch(
             tolerations=tolerations,
             node_selectors=node_selectors,
             keymanager_enabled=keymanager_enabled,
-            network=network,  # TODO: remove when deneb rebase is done
-            electra_fork_epoch=electra_fork_epoch,  # TODO: remove when deneb rebase is done
             port_publisher=port_publisher,
             vc_index=vc_index,
         )

diff --git a/static_files/genesis-generation-config/el-cl/values.env.tmpl b/static_files/genesis-generation-config/el-cl/values.env.tmpl
@@ -14,9 +14,10 @@ export DENEB_FORK_VERSION="{{ .DenebForkVersion }}"
 export DENEB_FORK_EPOCH="{{ .DenebForkEpoch }}"
 export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}"
 export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}"
+export FULU_FORK_VERSION="{{ .FuluForkVersion }}"
+export FULU_FORK_EPOCH="{{ .FuluForkEpoch }}"
 export EIP7594_FORK_EPOCH="{{ .EIP7594ForkEpoch }}"
 export EIP7594_FORK_VERSION="{{ .EIP7594ForkVersion }}"
-export EOF_ACTIVATION_EPOCH="{{ .EOFActivationEpoch }}"
 export WITHDRAWAL_TYPE="0x00"
 export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134
 export GENESIS_TIMESTAMP={{ .UnixTimestamp }}