Skip to content

Commit d6bec16

Browse files
authored
fix: add fulu overrides automatically for assertoor and dora if fulu is active (ethereum#858)
Signed-off-by: Barnabas Busa <barnabas.busa@ethereum.org>
1 parent 50ec581 commit d6bec16

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

src/assertoor/assertoor_launcher.star

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ def get_config(
121121

122122
IMAGE_NAME = assertoor_params.image
123123

124+
if assertoor_params.image == constants.DEFAULT_ASSERTOOR_IMAGE:
125+
if network_params.fulu_fork_epoch < constants.FULU_FORK_EPOCH:
126+
IMAGE_NAME = "ethpandaops/assertoor:fulu-support"
127+
124128
return ServiceConfig(
125129
image=IMAGE_NAME,
126130
ports=USED_PORTS,

src/dora/dora_launcher.star

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ def get_config(
122122

123123
IMAGE_NAME = dora_params.image
124124

125+
if dora_params.image == constants.DEFAULT_DORA_IMAGE:
126+
if network_params.fulu_fork_epoch < constants.FULU_FORK_EPOCH:
127+
IMAGE_NAME = "ethpandaops/dora:fulu-support"
128+
125129
return ServiceConfig(
126130
image=IMAGE_NAME,
127131
ports=USED_PORTS,

src/package_io/constants.star

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ MOCK_MEV_TYPE = "mock"
8585
FLASHBOTS_MEV_TYPE = "flashbots"
8686
MEV_RS_MEV_TYPE = "mev-rs"
8787
COMMIT_BOOST_MEV_TYPE = "commit-boost"
88-
88+
DEFAULT_DORA_IMAGE = "ethpandaops/dora:latest"
89+
DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest"
8990
DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest"
9091
DEFAULT_FLASHBOTS_RELAY_IMAGE = "flashbots/mev-boost-relay:0.29.2a3"
9192
DEFAULT_FLASHBOTS_BUILDER_IMAGE = "ethpandaops/reth-rbuilder:develop"

src/package_io/input_parser.star

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ def get_default_blockscout_params():
10281028

10291029
def get_default_dora_params():
10301030
return {
1031-
"image": "ethpandaops/dora:latest",
1031+
"image": constants.DEFAULT_DORA_IMAGE,
10321032
"env": {},
10331033
}
10341034

@@ -1127,7 +1127,7 @@ def get_default_goomy_blob_params():
11271127

11281128
def get_default_assertoor_params():
11291129
return {
1130-
"image": "ethpandaops/assertoor:latest",
1130+
"image": constants.DEFAULT_ASSERTOOR_IMAGE,
11311131
"run_stability_check": False,
11321132
"run_block_proposal_check": False,
11331133
"run_lifecycle_test": False,

0 commit comments

Comments
 (0)