diff --git a/.circleci/config.yml b/.circleci/config.yml index c3e94c27d..8267e2c1b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -202,6 +202,7 @@ workflows: - reth-all - teku-all - nimbus_mev + - complex_mev build: when: << pipeline.parameters.should-enable-build-workflow >> @@ -241,9 +242,3 @@ workflows: branches: ignore: - main - - - complex_mev: - filters: - branches: - ignore: - - main diff --git a/.circleci/tests/mev.json b/.circleci/tests/mev.json index 1a0d9e593..e659b3105 100644 --- a/.circleci/tests/mev.json +++ b/.circleci/tests/mev.json @@ -1,9 +1,11 @@ { "mev_type": "full", "mev_params": { - "launch_custom_flood": true + "launch_custom_flood": true, + "mev_relay_image": "flashbots/mev-boost-relay:0.27" }, "network_params": { - "seconds_per_slot": 3 + "seconds_per_slot": 3, + "capella_fork_epoch": 0 } } \ No newline at end of file diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index d80d1d8a6..72f907726 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -15,6 +15,7 @@ DEFAULT_CL_IMAGES = { "lodestar": "chainsafe/lodestar:latest", } +MEV_BOOST_RELAY_DEFAULT_IMAGE = "flashbots/mev-boost-relay:0.26" NETHERMIND_NODE_NAME = "nethermind" NIMBUS_NODE_NAME = "nimbus" @@ -82,6 +83,17 @@ def parse_input(plan, input_args): result.get("mev_type"), ) + if ( + result.get("mev_type") == "full" + and result["network_params"]["capella_fork_epoch"] == 0 + and result["mev_params"]["mev_relay_image"] == MEV_BOOST_RELAY_DEFAULT_IMAGE + ): + fail( + "The default MEV image {0} requires a non-zero value for capella fork epoch set via network_params.capella_fork_epoch".format( + MEV_BOOST_RELAY_DEFAULT_IMAGE + ) + ) + result["tx_spammer_params"] = get_default_tx_spammer_params() return struct( @@ -373,7 +385,7 @@ def default_participant(): def get_default_mev_params(): return { - "mev_relay_image": "flashbots/mev-boost-relay:latest", + "mev_relay_image": MEV_BOOST_RELAY_DEFAULT_IMAGE, # 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",