Commit e48483a1 authored by Bharath Vedartham's avatar Bharath Vedartham Committed by GitHub

feat: parameterize mev-boost args (#400)

Adds 2 new fields to the config file under the mev_params field:
mev_boost_image: <The mev-boost image, default is flashbots/mev-boost>
mev_boost_args: <The args of mev-boost. The default params are
["mev-boost", "--relay-check"]>

The behaviour is such that, `mev-boost-args` overrides all the args of
mev-boost. No extra params are added.

Resolves https://github.com/kurtosis-tech/ethereum-package/issues/289

---------
Co-authored-by: default avatarBarnabas Busa <busa.barnabas@gmail.com>
Co-authored-by: default avatarfranjoespejo <franjoespejo@gmail.com>
Co-authored-by: default avatarGyanendra Mishra <anomaly.the@gmail.com>
Co-authored-by: default avatarSam Calder-Mason <sam.calder-mason@ethereum.org>
Co-authored-by: default avatargithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: default avatarpk910 <github@pk910.de>
Co-authored-by: default avatarParithosh Jayanthi <parithosh.jayanthi@ethereum.org>
Co-authored-by: default avatarfranjoespejo <franjosepejo@github.com>
Co-authored-by: default avatarAnton <anton@northernforest.nl>
parent 9ceae9c7
...@@ -543,7 +543,7 @@ mev_type: null ...@@ -543,7 +543,7 @@ mev_type: null
# Parameters if MEV is used # Parameters if MEV is used
mev_params: mev_params:
# The image to use for MEV boot relay # The image to use for MEV boost relay
mev_relay_image: flashbots/mev-boost-relay mev_relay_image: flashbots/mev-boost-relay
# The image to use for the builder # The image to use for the builder
mev_builder_image: ethpandaops/flashbots-builder:main mev_builder_image: ethpandaops/flashbots-builder:main
...@@ -551,6 +551,8 @@ mev_params: ...@@ -551,6 +551,8 @@ mev_params:
mev_builder_cl_image: sigp/lighthouse:latest mev_builder_cl_image: sigp/lighthouse:latest
# The image to use for mev-boost # The image to use for mev-boost
mev_boost_image: flashbots/mev-boost mev_boost_image: flashbots/mev-boost
# Parameters for MEV Boost. This overrides all arguments of the mev-boost container
mev_boost_args: []
# Extra parameters to send to the API # Extra parameters to send to the API
mev_relay_api_extra_args: [] mev_relay_api_extra_args: []
# Extra parameters to send to the housekeeper # Extra parameters to send to the housekeeper
......
...@@ -260,6 +260,7 @@ def run(plan, args={}): ...@@ -260,6 +260,7 @@ def run(plan, args={}):
mev_boost_service_name, mev_boost_service_name,
network_params.network_id, network_params.network_id,
mev_params.mev_boost_image, mev_params.mev_boost_image,
mev_params.mev_boost_args,
global_node_selectors, global_node_selectors,
) )
all_mevboost_contexts.append(mev_boost_context) all_mevboost_contexts.append(mev_boost_context)
......
...@@ -84,6 +84,8 @@ mev_params: ...@@ -84,6 +84,8 @@ mev_params:
mev_flood_image: flashbots/mev-flood mev_flood_image: flashbots/mev-flood
mev_flood_extra_args: [] mev_flood_extra_args: []
mev_flood_seconds_per_bundle: 15 mev_flood_seconds_per_bundle: 15
mev_boost_image: flashbots/mev-boost
mev_boost_args: ["mev-boost", "--relay-check"]
grafana_additional_dashboards: [] grafana_additional_dashboards: []
persistent: false persistent: false
xatu_sentry_enabled: false xatu_sentry_enabled: false
......
...@@ -29,12 +29,14 @@ def launch( ...@@ -29,12 +29,14 @@ def launch(
service_name, service_name,
network_id, network_id,
mev_boost_image, mev_boost_image,
mev_boost_args,
global_node_selectors, global_node_selectors,
): ):
config = get_config( config = get_config(
mev_boost_launcher, mev_boost_launcher,
network_id, network_id,
mev_boost_image, mev_boost_image,
mev_boost_args,
global_node_selectors, global_node_selectors,
) )
...@@ -49,12 +51,10 @@ def get_config( ...@@ -49,12 +51,10 @@ def get_config(
mev_boost_launcher, mev_boost_launcher,
network_id, network_id,
mev_boost_image, mev_boost_image,
mev_boost_args,
node_selectors, node_selectors,
): ):
command = ["mev-boost"] command = mev_boost_args
if mev_boost_launcher.should_check_relay:
command.append("-relay-check")
return ServiceConfig( return ServiceConfig(
image=mev_boost_image, image=mev_boost_image,
......
...@@ -237,6 +237,7 @@ def input_parser(plan, input_args): ...@@ -237,6 +237,7 @@ def input_parser(plan, input_args):
mev_builder_image=result["mev_params"]["mev_builder_image"], mev_builder_image=result["mev_params"]["mev_builder_image"],
mev_builder_cl_image=result["mev_params"]["mev_builder_cl_image"], mev_builder_cl_image=result["mev_params"]["mev_builder_cl_image"],
mev_boost_image=result["mev_params"]["mev_boost_image"], mev_boost_image=result["mev_params"]["mev_boost_image"],
mev_boost_args=result["mev_params"]["mev_boost_args"],
mev_relay_api_extra_args=result["mev_params"]["mev_relay_api_extra_args"], mev_relay_api_extra_args=result["mev_params"]["mev_relay_api_extra_args"],
mev_relay_housekeeper_extra_args=result["mev_params"][ mev_relay_housekeeper_extra_args=result["mev_params"][
"mev_relay_housekeeper_extra_args" "mev_relay_housekeeper_extra_args"
...@@ -634,6 +635,7 @@ def get_default_mev_params(): ...@@ -634,6 +635,7 @@ def get_default_mev_params():
"mev_builder_image": "flashbots/builder:latest", "mev_builder_image": "flashbots/builder:latest",
"mev_builder_cl_image": "sigp/lighthouse:latest", "mev_builder_cl_image": "sigp/lighthouse:latest",
"mev_boost_image": "flashbots/mev-boost", "mev_boost_image": "flashbots/mev-boost",
"mev_boost_args": ["mev-boost", "--relay-check"],
"mev_relay_api_extra_args": [], "mev_relay_api_extra_args": [],
"mev_relay_housekeeper_extra_args": [], "mev_relay_housekeeper_extra_args": [],
"mev_relay_website_extra_args": [], "mev_relay_website_extra_args": [],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment