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.

Sign up for GitHub

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

fix: add fulu overrides automatically for assertoor and dora if fulu is active #858

Merged
merged 6 commits into from
Dec 13, 2024
Merged

fix: add fulu overrides automatically for assertoor and dora if fulu is active #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1215102
fix: dora override
barnabasbusa Dec 13, 2024
7a32011
fix: add fulu overrides automatically for assertoor and dora if fulu …
barnabasbusa Dec 13, 2024
6b58c25
Merge branch 'main' into bbusa/fix-dora-assertoor-override
barnabasbusa Dec 13, 2024
a31d01b
fix image name ordering
barnabasbusa Dec 13, 2024
d6ef241
fix image name ordering
barnabasbusa Dec 13, 2024
90882ce
Merge branch 'bbusa/fix-dora-assertoor-override' of github.com:ethpan…
barnabasbusa Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/assertoor/assertoor_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ def get_config(

IMAGE_NAME = assertoor_params.image

if assertoor_params.image == constants.DEFAULT_ASSERTOOR_IMAGE:
if network_params.fulu_fork_epoch < constants.FULU_FORK_EPOCH:
IMAGE_NAME = "ethpandaops/assertoor:fulu-support"

return ServiceConfig(
image=IMAGE_NAME,
ports=USED_PORTS,
Expand Down
4 changes: 4 additions & 0 deletions src/dora/dora_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ def get_config(

IMAGE_NAME = dora_params.image

if dora_params.image == constants.DEFAULT_DORA_IMAGE:
if network_params.fulu_fork_epoch < constants.FULU_FORK_EPOCH:
IMAGE_NAME = "ethpandaops/dora:fulu-support"

return ServiceConfig(
image=IMAGE_NAME,
ports=USED_PORTS,
Expand Down
3 changes: 2 additions & 1 deletion src/package_io/constants.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ MOCK_MEV_TYPE = "mock"
FLASHBOTS_MEV_TYPE = "flashbots"
MEV_RS_MEV_TYPE = "mev-rs"
COMMIT_BOOST_MEV_TYPE = "commit-boost"

DEFAULT_DORA_IMAGE = "ethpandaops/dora:latest"
DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest"
DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest"
DEFAULT_FLASHBOTS_RELAY_IMAGE = "flashbots/mev-boost-relay:0.29.2a3"
DEFAULT_FLASHBOTS_BUILDER_IMAGE = "ethpandaops/reth-rbuilder:develop"
Expand Down
4 changes: 2 additions & 2 deletions src/package_io/input_parser.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ def get_default_blockscout_params():

def get_default_dora_params():
return {
"image": "ethpandaops/dora:latest",
"image": constants.DEFAULT_DORA_IMAGE,
"env": {},
}

Expand Down Expand Up @@ -1127,7 +1127,7 @@ def get_default_goomy_blob_params():

def get_default_assertoor_params():
return {
"image": "ethpandaops/assertoor:latest",
"image": constants.DEFAULT_ASSERTOOR_IMAGE,
"run_stability_check": False,
"run_block_proposal_check": False,
"run_lifecycle_test": False,
Expand Down
Loading