From 736257389ba71d908489c31b66a7c1f15cd59c30 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Wed, 4 Oct 2023 16:25:42 +0100 Subject: [PATCH 1/7] force a version and epoch --- src/package_io/parse_input.star | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index d80d1d8a6..cdb592313 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -82,6 +82,9 @@ def parse_input(plan, input_args): result.get("mev_type"), ) + if result.get("mev_type") == "full" and result["network_params"]["capella_fork_epoch"] != 0: + fail("MEV requires a non-zero value for capella fork epoch") + result["tx_spammer_params"] = get_default_tx_spammer_params() return struct( @@ -373,7 +376,7 @@ def default_participant(): def get_default_mev_params(): return { - "mev_relay_image": "flashbots/mev-boost-relay:latest", + "mev_relay_image": "flashbots/mev-boost-relay:0.26.0", # 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", From e0007df083faec2bdd6404ae8b926e44ac07f176 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Wed, 4 Oct 2023 16:27:10 +0100 Subject: [PATCH 2/7] fix bug --- src/package_io/parse_input.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index cdb592313..466995011 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -82,7 +82,7 @@ def parse_input(plan, input_args): result.get("mev_type"), ) - if result.get("mev_type") == "full" and result["network_params"]["capella_fork_epoch"] != 0: + if result.get("mev_type") == "full" and result["network_params"]["capella_fork_epoch"] == 0: fail("MEV requires a non-zero value for capella fork epoch") result["tx_spammer_params"] = get_default_tx_spammer_params() From 071c4a980c507d7fc7c165886a649f26fd5c66c1 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Wed, 4 Oct 2023 16:30:13 +0100 Subject: [PATCH 3/7] fix mev case --- .circleci/tests/mev.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/tests/mev.json b/.circleci/tests/mev.json index 1a0d9e593..7532f1317 100644 --- a/.circleci/tests/mev.json +++ b/.circleci/tests/mev.json @@ -4,6 +4,7 @@ "launch_custom_flood": true }, "network_params": { - "seconds_per_slot": 3 + "seconds_per_slot": 3, + "capella_fork_epoch": 1 } } \ No newline at end of file From 7c008de5d38e678b05d320580dabc2efcdf66295 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Wed, 4 Oct 2023 16:30:42 +0100 Subject: [PATCH 4/7] ran lint --- src/package_io/parse_input.star | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 466995011..e0114a995 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -82,7 +82,10 @@ def parse_input(plan, input_args): result.get("mev_type"), ) - if result.get("mev_type") == "full" and result["network_params"]["capella_fork_epoch"] == 0: + if ( + result.get("mev_type") == "full" + and result["network_params"]["capella_fork_epoch"] == 0 + ): fail("MEV requires a non-zero value for capella fork epoch") result["tx_spammer_params"] = get_default_tx_spammer_params() From dc32be7b8c5d4ae74071da1a857989d0ffd3f664 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Wed, 4 Oct 2023 16:33:33 +0100 Subject: [PATCH 5/7] send 0.26 --- src/package_io/parse_input.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index e0114a995..e468c3c7d 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -379,7 +379,7 @@ def default_participant(): def get_default_mev_params(): return { - "mev_relay_image": "flashbots/mev-boost-relay:0.26.0", + "mev_relay_image": "flashbots/mev-boost-relay:0.26", # 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", From 6b4660da588f7757ff8425d8494267db06c30f1d Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Thu, 5 Oct 2023 12:18:03 +0100 Subject: [PATCH 6/7] modified capella check --- src/package_io/parse_input.star | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index e468c3c7d..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" @@ -85,8 +86,13 @@ def parse_input(plan, input_args): 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("MEV requires a non-zero value for capella fork epoch") + 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() @@ -379,7 +385,7 @@ def default_participant(): def get_default_mev_params(): return { - "mev_relay_image": "flashbots/mev-boost-relay:0.26", + "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", From 8a0294468ed3e6ada2536a6be4e9b473ea7209d6 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Thu, 5 Oct 2023 12:26:44 +0100 Subject: [PATCH 7/7] make complex mev a nightly job --- .circleci/config.yml | 7 +------ .circleci/tests/mev.json | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) 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 7532f1317..e659b3105 100644 --- a/.circleci/tests/mev.json +++ b/.circleci/tests/mev.json @@ -1,10 +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, - "capella_fork_epoch": 1 + "capella_fork_epoch": 0 } } \ No newline at end of file