Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Remove overrides #357

Merged
merged 15 commits into from
Nov 30, 2023
Merged
14 changes: 14 additions & 0 deletions examples/verkle.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
mev_type: full
participants:
- el_client_type: geth
el_client_image: ethpandaops/geth:transition-post-genesis-21cebf0
cl_client_type: lighthouse
cl_client_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9
network_params:
deneb_fork_epoch: 500
electra_fork_epoch: 1
genesis_delay: 100
launch_additional_services: true
additional_services: ["el_forkmon", "tx_spammer", "dora"]
barnabasbusa marked this conversation as resolved.
Show resolved Hide resolved
snooper_enabled: true

9 changes: 1 addition & 8 deletions src/el/geth/geth_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ def get_config(
):
# TODO: Remove this once electra fork has path based storage scheme implemented
if electra_fork_epoch != None:
init_datadir_cmd_str = "geth init --cache.preimages --override.prague={0} --datadir={1} {2}".format(
final_genesis_timestamp,
init_datadir_cmd_str = "geth init --cache.preimages --datadir={0} {1}".format(
barnabasbusa marked this conversation as resolved.
Show resolved Hide resolved
EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/genesis.json",
)
Expand Down Expand Up @@ -187,12 +186,6 @@ def get_config(
),
# Override prague fork timestamp for electra fork
"{0}".format("--cache.preimages" if electra_fork_epoch != None else ""),
# Override prague fork timestamp for electra fork
"{0}".format(
"--override.prague=" + final_genesis_timestamp
if electra_fork_epoch != None
else ""
),
"--verbosity=" + verbosity_level,
"--datadir=" + EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
"--networkid=" + network_id,
Expand Down
3 changes: 0 additions & 3 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -329,9 +329,6 @@ def parse_network_params(input_args):
if result["network_params"]["electra_fork_epoch"] != None:
# if electra is defined, then deneb needs to be set very high
result["network_params"]["deneb_fork_epoch"] = HIGH_DENEB_VALUE_FORK_VERKLE
# TODO: remove once transition is complete
if result["network_params"]["electra_fork_epoch"] != 0:
fail("electra_fork_epoch can only be 0 or None")

if (
result["network_params"]["capella_fork_epoch"] > 0
Expand Down
2 changes: 1 addition & 1 deletion src/participant_network.star
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def launch_participant_network(
# we are running electra - experimental
elif network_params.electra_fork_epoch != None:
ethereum_genesis_generator_image = (
"ethpandaops/ethereum-genesis-generator:3.0.0-rc.14"
"ethpandaops/ethereum-genesis-generator:3.0.0-rc.16"
barnabasbusa marked this conversation as resolved.
Show resolved Hide resolved
)
else:
fail(
Expand Down