Skip to content

Commit 46d67fc

Browse files
authored
fix: dont spin up extra el/cl client for mock-mev (ethereum#158)
1 parent 0165ef1 commit 46d67fc

File tree

1 file changed

+37
-21
lines changed

1 file changed

+37
-21
lines changed

src/package_io/parse_input.star

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def parse_input(input_args):
117117

118118

119119
if result.get("mev_type") in ("mock", "full"):
120-
result = enrich_mev_extra_params(result, MEV_BOOST_SERVICE_NAME_PREFIX, FLASHBOTS_MEV_BOOST_PORT)
120+
result = enrich_mev_extra_params(result, MEV_BOOST_SERVICE_NAME_PREFIX, FLASHBOTS_MEV_BOOST_PORT, result.get("mev_type"))
121121

122122
return struct(
123123
participants=[struct(
@@ -230,7 +230,7 @@ def get_default_mev_params():
230230

231231

232232
# TODO perhaps clean this up into a map
233-
def enrich_mev_extra_params(parsed_arguments_dict, mev_prefix, mev_port):
233+
def enrich_mev_extra_params(parsed_arguments_dict, mev_prefix, mev_port, mev_type):
234234
for index, participant in enumerate(parsed_arguments_dict["participants"]):
235235
mev_url = "http://{0}{1}:{2}".format(mev_prefix, index, mev_port)
236236

@@ -253,24 +253,40 @@ def enrich_mev_extra_params(parsed_arguments_dict, mev_prefix, mev_port):
253253

254254
num_participants = len(parsed_arguments_dict["participants"])
255255

256-
mev_url = "http://{0}{1}:{2}".format(mev_prefix, num_participants, mev_port)
257-
258-
mev_participant = {
259-
"el_client_type": "geth",
260-
# TODO replace with actual when flashbots/builder is published
261-
"el_client_image": "h4ck3rk3y/builder",
262-
"el_client_log_level": "",
263-
"cl_client_type": "lighthouse",
264-
# THIS overrides the beacon image
265-
"cl_client_image": "sigp/lighthouse",
266-
"cl_client_log_level": "",
267-
"beacon_extra_params": ["--builder={0}".format(mev_url), "--always-prepare-payload", "--prepare-payload-lookahead", "12000"],
268-
# TODO(maybe) make parts of this more passable like the mev-relay-endpoint & forks
269-
"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"],
270-
"validator_extra_params": ["--builder-proposals"],
271-
"builder_network_params": None
272-
}
273-
274-
parsed_arguments_dict["participants"].append(mev_participant)
256+
if mev_type == "full":
257+
258+
mev_url = "http://{0}{1}:{2}".format(mev_prefix, num_participants, mev_port)
259+
260+
mev_participant = {
261+
"el_client_type": "geth",
262+
# TODO replace with actual when flashbots/builder is published
263+
"el_client_image": "h4ck3rk3y/builder",
264+
"el_client_log_level": "",
265+
"cl_client_type": "lighthouse",
266+
# THIS overrides the beacon image
267+
"cl_client_image": "sigp/lighthouse",
268+
"cl_client_log_level": "",
269+
"beacon_extra_params": [
270+
"--builder={0}".format(mev_url),
271+
"--always-prepare-payload",
272+
"--prepare-payload-lookahead",
273+
"12000"
274+
],
275+
# TODO(maybe) make parts of this more passable like the mev-relay-endpoint & forks
276+
"el_extra_params": [
277+
"--builder",
278+
"--builder.remote_relay_endpoint=http://mev-relay-api:9062",
279+
"--builder.beacon_endpoints=http://cl-{0}-lighthouse-geth:4000".format(num_participants+1),
280+
"--builder.bellatrix_fork_version=0x30000038",
281+
"--builder.genesis_fork_version=0x10000038",
282+
"--builder.genesis_validators_root={0}".format(package_io.GENESIS_VALIDATORS_ROOT_PLACEHOLDER),
283+
"--miner.extradata=\"Illuminate Dmocratize Dstribute\"",
284+
"--miner.algotype=greedy"
285+
] + parsed_arguments_dict["mev_params"]["mev_builder_extra_args"],
286+
"validator_extra_params": ["--builder-proposals"],
287+
"builder_network_params": None
288+
}
289+
290+
parsed_arguments_dict["participants"].append(mev_participant)
275291

276292
return parsed_arguments_dict

0 commit comments

Comments
 (0)