From 9a844aceff7c4d2b8943ec74efe3d7aed9b96ad1 Mon Sep 17 00:00:00 2001 From: Bharath Vedartham Date: Wed, 30 Aug 2023 22:56:07 +0530 Subject: [PATCH 1/2] parameterize mev_boost and mev_builder images --- main.star | 2 +- src/mev_boost/mev_boost_launcher.star | 9 ++++----- src/package_io/parse_input.star | 11 ++++++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/main.star b/main.star index b698a2dcf..f3d338b44 100644 --- a/main.star +++ b/main.star @@ -92,7 +92,7 @@ def run(plan, args): for index, participant in enumerate(args_with_right_defaults.participants): mev_boost_launcher = mev_boost_launcher_module.new_mev_boost_launcher(MEV_BOOST_SHOULD_CHECK_RELAY, mev_endpoints) mev_boost_service_name = "{0}{1}".format(parse_input.MEV_BOOST_SERVICE_NAME_PREFIX, index) - mev_boost_context = mev_boost_launcher_module.launch(plan, mev_boost_launcher, mev_boost_service_name, network_params.network_id) + mev_boost_context = mev_boost_launcher_module.launch(plan, mev_boost_launcher, mev_boost_service_name, network_params.network_id, mev_params.mev_boost_image) all_mevboost_contexts.append(mev_boost_context) if not args_with_right_defaults.launch_additional_services: diff --git a/src/mev_boost/mev_boost_launcher.star b/src/mev_boost/mev_boost_launcher.star index de9d19d02..394d49321 100644 --- a/src/mev_boost/mev_boost_launcher.star +++ b/src/mev_boost/mev_boost_launcher.star @@ -2,7 +2,6 @@ shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_u mev_boost_context_module = import_module("github.com/kurtosis-tech/eth2-package/src/mev_boost/mev_boost_context.star") parse_input = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/parse_input.star") -FLASHBOTS_MEV_BOOST_IMAGE = "flashbots/mev-boost" FLASHBOTS_MEV_BOOST_PROTOCOL = "TCP" USED_PORTS = { @@ -15,22 +14,22 @@ NETWORK_ID_TO_NAME = { "3": "ropsten", } -def launch(plan, mev_boost_launcher, service_name, network_id): - config = get_config(mev_boost_launcher, network_id) +def launch(plan, mev_boost_launcher, service_name, network_id, mev_boost_image): + config = get_config(mev_boost_launcher, network_id, mev_boost_image) mev_boost_service = plan.add_service(service_name, config) return mev_boost_context_module.new_mev_boost_context(mev_boost_service.ip_address, parse_input.FLASHBOTS_MEV_BOOST_PORT) -def get_config(mev_boost_launcher, network_id): +def get_config(mev_boost_launcher, network_id, mev_boost_image): command = ["mev-boost"] if mev_boost_launcher.should_check_relay: command.append("-relay-check") return ServiceConfig( - image = FLASHBOTS_MEV_BOOST_IMAGE, + image = mev_boost_image, ports = USED_PORTS, cmd = command, env_vars = { diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 36229f1a2..aecd34c59 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -145,6 +145,8 @@ def parse_input(input_args): ), mev_params = struct( mev_relay_image = result["mev_params"]["mev_relay_image"], + mev_builder_image = result["mev_params"]["mev_builder_image"], + mev_boost_image = result["mev_params"]["mev_boost_image"], 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"], mev_relay_website_extra_args = result["mev_params"]["mev_relay_website_extra_args"], @@ -219,6 +221,9 @@ def default_participant(): def get_default_mev_params(): return { "mev_relay_image": "flashbots/mev-boost-relay", + # TODO replace with actual when flashbots/builder is published + "mev_builder_image": "ethpandaops/flashbots-builder:main", + "mev_boost_image": "flashbots/mev-boost", "mev_relay_api_extra_args": [], "mev_relay_housekeeper_extra_args": [], "mev_relay_website_extra_args": [], @@ -255,10 +260,10 @@ def enrich_mev_extra_params(parsed_arguments_dict, mev_prefix, mev_port): mev_url = "http://{0}{1}:{2}".format(mev_prefix, num_participants, mev_port) + mev_participant = { "el_client_type": "geth", - # TODO replace with actual when flashbots/builder is published - "el_client_image": "h4ck3rk3y/builder", + "el_client_image": parsed_arguments_dict["mev_params"]["mev_builder_image"], "el_client_log_level": "", "cl_client_type": "lighthouse", # THIS overrides the beacon image @@ -266,7 +271,7 @@ def enrich_mev_extra_params(parsed_arguments_dict, mev_prefix, mev_port): "cl_client_log_level": "", "beacon_extra_params": ["--builder={0}".format(mev_url), "--always-prepare-payload", "--prepare-payload-lookahead", "12000"], # TODO(maybe) make parts of this more passable like the mev-relay-endpoint & forks - "el_extra_params": ["--builder", "--builder.remote_relay_endpoint=http://mev-relay-api:9062", "--builder.beacon_endpoints=http://cl-{0}-lighthouse-geth:4000".format(num_participants+1), "--builder.bellatrix_fork_version=0x30000038", "--builder.genesis_fork_version=0x10000038", "--builder.genesis_validators_root={0}".format(package_io.GENESIS_VALIDATORS_ROOT_PLACEHOLDER), "--miner.extradata=\"Illuminate Dmocratize Dstribute\"", "--miner.algotype=greedy"] + parsed_arguments_dict["mev_params"]["mev_builder_extra_args"], + "el_extra_params": ["--builder", "--builder.remote_relay_endpoint=http://mev-relay-api:9062", "--builder.beacon_endpoints=http://cl-{0}-lighthouse-geth:4000".format(num_participants+1), "--builder.bellatrix_fork_version=0x30000038", "--builder.genesis_fork_version=0x10000038", "--builder.genesis_validators_root={0}".format(package_io.GENESIS_VALIDATORS_ROOT_PLACEHOLDER), "--builder.algotype=greedy", "--miner.extradata=\"Illuminate Dmocratize Dstribute\""] + parsed_arguments_dict["mev_params"]["mev_builder_extra_args"], "validator_extra_params": ["--builder-proposals"], "builder_network_params": None } From e00e0fa52d6ae050dcdeb06415469bf91ccafd0f Mon Sep 17 00:00:00 2001 From: Bharath Vedartham Date: Wed, 30 Aug 2023 23:46:08 +0530 Subject: [PATCH 2/2] review comments --- src/package_io/parse_input.star | 56 +++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index aee280993..1c8885572 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -221,7 +221,7 @@ def default_participant(): def get_default_mev_params(): return { "mev_relay_image": "flashbots/mev-boost-relay", - # TODO replace with actual when flashbots/builder is published + # TODO replace with flashbots/builder when they publish an arm64 image as mentioned in flashbots/builder#105 "mev_builder_image": "ethpandaops/flashbots-builder:main", "mev_boost_image": "flashbots/mev-boost", "mev_relay_api_extra_args": [], @@ -258,24 +258,40 @@ def enrich_mev_extra_params(parsed_arguments_dict, mev_prefix, mev_port, mev_typ num_participants = len(parsed_arguments_dict["participants"]) - mev_url = "http://{0}{1}:{2}".format(mev_prefix, num_participants, mev_port) - - - mev_participant = { - "el_client_type": "geth", - "el_client_image": parsed_arguments_dict["mev_params"]["mev_builder_image"], - "el_client_log_level": "", - "cl_client_type": "lighthouse", - # THIS overrides the beacon image - "cl_client_image": "sigp/lighthouse", - "cl_client_log_level": "", - "beacon_extra_params": ["--builder={0}".format(mev_url), "--always-prepare-payload", "--prepare-payload-lookahead", "12000"], - # TODO(maybe) make parts of this more passable like the mev-relay-endpoint & forks - "el_extra_params": ["--builder", "--builder.remote_relay_endpoint=http://mev-relay-api:9062", "--builder.beacon_endpoints=http://cl-{0}-lighthouse-geth:4000".format(num_participants+1), "--builder.bellatrix_fork_version=0x30000038", "--builder.genesis_fork_version=0x10000038", "--builder.genesis_validators_root={0}".format(package_io.GENESIS_VALIDATORS_ROOT_PLACEHOLDER), "--builder.algotype=greedy", "--miner.extradata=\"Illuminate Dmocratize Dstribute\""] + parsed_arguments_dict["mev_params"]["mev_builder_extra_args"], - "validator_extra_params": ["--builder-proposals"], - "builder_network_params": None - } - - parsed_arguments_dict["participants"].append(mev_participant) + if mev_type == "full": + + mev_url = "http://{0}{1}:{2}".format(mev_prefix, num_participants, mev_port) + + mev_participant = { + "el_client_type": "geth", + # TODO replace with actual when flashbots/builder is published + "el_client_image": parsed_arguments_dict["mev_params"]["mev_builder_image"], + "el_client_log_level": "", + "cl_client_type": "lighthouse", + # THIS overrides the beacon image + "cl_client_image": "sigp/lighthouse", + "cl_client_log_level": "", + "beacon_extra_params": [ + "--builder={0}".format(mev_url), + "--always-prepare-payload", + "--prepare-payload-lookahead", + "12000" + ], + # TODO(maybe) make parts of this more passable like the mev-relay-endpoint & forks + "el_extra_params": [ + "--builder", + "--builder.remote_relay_endpoint=http://mev-relay-api:9062", + "--builder.beacon_endpoints=http://cl-{0}-lighthouse-geth:4000".format(num_participants+1), + "--builder.bellatrix_fork_version=0x30000038", + "--builder.genesis_fork_version=0x10000038", + "--builder.genesis_validators_root={0}".format(package_io.GENESIS_VALIDATORS_ROOT_PLACEHOLDER), + "--miner.extradata=\"Illuminate Dmocratize Dstribute\"", + "--builder.algotype=greedy" + ] + parsed_arguments_dict["mev_params"]["mev_builder_extra_args"], + "validator_extra_params": ["--builder-proposals"], + "builder_network_params": None + } + + parsed_arguments_dict["participants"].append(mev_participant) return parsed_arguments_dict