Skip to content

Commit e60afbe

Browse files
authored
feat: add custom image for egg (ethereum#859)
1 parent d6bec16 commit e60afbe

File tree

6 files changed

+30
-18
lines changed

6 files changed

+30
-18
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,11 @@ spamoor_params:
957957
# Defaults to empty
958958
spamoor_extra_args: []
959959

960+
# Ethereum genesis generator params
961+
ethereum_genesis_generator_params:
962+
# The image to use for ethereum genesis generator
963+
image: ethpandaops/ethereum-genesis-generator:3.4.7
964+
960965
# Global parameter to set the exit ip address of services and public ports
961966
port_publisher:
962967
# if you have a service that you want to expose on a specific interfact; set that IP here

network_params.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ global_node_selectors: {}
175175
keymanager_enabled: false
176176
checkpoint_sync_enabled: false
177177
checkpoint_sync_url: ""
178+
ethereum_genesis_generator_params:
179+
image: ethpandaops/ethereum-genesis-generator:3.4.7
178180
port_publisher:
179181
nat_exit_ip: KURTOSIS_IP_ADDR_PLACEHOLDER
180182
el:

src/network_launcher/kurtosis.star

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,9 @@ def launch(
5959

6060
ethereum_genesis_generator_image = shared_utils.docker_cache_image_calc(
6161
args_with_right_defaults.docker_cache_params,
62-
constants.ETHEREUM_GENESIS_GENERATOR.default_genesis_generator_image,
62+
args_with_right_defaults.ethereum_genesis_generator_params.image,
6363
)
64-
# we are running electra - experimental
65-
if network_params.electra_fork_epoch != None:
66-
if network_params.electra_fork_epoch == 0:
67-
ethereum_genesis_generator_image = shared_utils.docker_cache_image_calc(
68-
args_with_right_defaults.docker_cache_params,
69-
constants.ETHEREUM_GENESIS_GENERATOR.verkle_genesis,
70-
)
71-
else:
72-
fail(
73-
"Unsupported fork epoch configuration, need to define either deneb_fork_epoch or electra_fork_epoch"
74-
)
64+
7565
return (
7666
total_number_of_validator_keys,
7767
ethereum_genesis_generator_image,

src/package_io/constants.star

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ COMMIT_BOOST_MEV_TYPE = "commit-boost"
8888
DEFAULT_DORA_IMAGE = "ethpandaops/dora:latest"
8989
DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest"
9090
DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest"
91+
DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE = (
92+
"ethpandaops/ethereum-genesis-generator:3.4.7"
93+
)
9194
DEFAULT_FLASHBOTS_RELAY_IMAGE = "flashbots/mev-boost-relay:0.29.2a3"
9295
DEFAULT_FLASHBOTS_BUILDER_IMAGE = "ethpandaops/reth-rbuilder:develop"
9396
DEFAULT_FLASHBOTS_MEV_BOOST_IMAGE = "flashbots/mev-boost"
@@ -121,12 +124,6 @@ CONTAINER_REGISTRY = struct(
121124
gcr="gcr.io",
122125
)
123126

124-
125-
ETHEREUM_GENESIS_GENERATOR = struct(
126-
default_genesis_generator_image="ethpandaops/ethereum-genesis-generator:3.4.7", # Default
127-
verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
128-
)
129-
130127
NETWORK_NAME = struct(
131128
mainnet="mainnet",
132129
sepolia="sepolia",

src/package_io/input_parser.star

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,10 @@ def input_parser(plan, input_args):
190190
for sub_attr in input_args["spamoor_params"]:
191191
sub_value = input_args["spamoor_params"][sub_attr]
192192
result["spamoor_params"][sub_attr] = sub_value
193+
elif attr == "ethereum_genesis_generator_params":
194+
for sub_attr in input_args["ethereum_genesis_generator_params"]:
195+
sub_value = input_args["ethereum_genesis_generator_params"][sub_attr]
196+
result["ethereum_genesis_generator_params"][sub_attr] = sub_value
193197

194198
if result.get("disable_peer_scoring"):
195199
result = enrich_disable_peer_scoring(result)
@@ -476,6 +480,9 @@ def input_parser(plan, input_args):
476480
keymanager_enabled=result["keymanager_enabled"],
477481
checkpoint_sync_enabled=result["checkpoint_sync_enabled"],
478482
checkpoint_sync_url=result["checkpoint_sync_url"],
483+
ethereum_genesis_generator_params=struct(
484+
image=result["ethereum_genesis_generator_params"]["image"],
485+
),
479486
port_publisher=struct(
480487
nat_exit_ip=result["port_publisher"]["nat_exit_ip"],
481488
cl_enabled=result["port_publisher"]["cl"]["enabled"],
@@ -864,6 +871,7 @@ def default_input_args(input_args):
864871
"keymanager_enabled": False,
865872
"checkpoint_sync_enabled": False,
866873
"checkpoint_sync_url": "",
874+
"ethereum_genesis_generator_params": get_default_ethereum_genesis_generator_params(),
867875
"port_publisher": {
868876
"nat_exit_ip": constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
869877
"public_port_start": None,
@@ -1387,6 +1395,7 @@ def docker_cache_image_override(plan, result):
13871395
"prometheus_params.image",
13881396
"grafana_params.image",
13891397
"spamoor_params.image",
1398+
"ethereum_genesis_generator_params.image",
13901399
]
13911400

13921401
if result["docker_cache_params"]["url"] == "":
@@ -1458,3 +1467,9 @@ def docker_cache_image_override(plan, result):
14581467
tooling_image_key
14591468
)
14601469
)
1470+
1471+
1472+
def get_default_ethereum_genesis_generator_params():
1473+
return {
1474+
"image": "ethpandaops/ethereum-genesis-generator:3.4.7",
1475+
}

src/package_io/sanity_check.star

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,9 @@ SUBCATEGORY_PARAMS = {
254254
"max_wallets",
255255
"spamoor_extra_args",
256256
],
257+
"ethereum_genesis_generator_params": [
258+
"image",
259+
],
257260
"port_publisher": [
258261
"nat_exit_ip",
259262
"el",

0 commit comments

Comments
 (0)