fix: mev-pectra workflow (#963)

Signed-off-by: Barnabas Busa <[email protected]>

Author: barnabasbusa

.github/tests/mev-pectra.yaml

@@ -1,61 +1,61 @@
 participants:
   - el_type: geth
-    el_image: ethereum/client-go:v1.15.7
+    el_image: ethereum/client-go:v1.15.9
     el_extra_params: ["--miner.extradata=pawanRocks"]
     cl_type: lighthouse
-    cl_image: sigp/lighthouse:v7.0.0-beta.5
-    validator_count: 1
-  - el_type: geth
-    el_image: ethereum/client-go:v1.15.7
-    el_extra_params: ["--miner.extradata=TekuFromLocal"]
+    cl_image: sigp/lighthouse:v7.0.0
+
+  - el_type: nethermind
+    el_image: nethermindeth/nethermind:release-1.31.9-genesis-pectra
+    el_extra_params: ["--Blocks.ExtraData=TekuFromLocal"]
     cl_type: teku
     cl_image: consensys/teku:25.4.0
-  - el_type: geth
-    el_image: ethereum/client-go:v1.15.7
-    el_extra_params: ["--miner.extradata=lodestarFromLocal"]
+
+  - el_type: reth
+    el_image: ghcr.io/paradigmxyz/reth:v1.3.12
+    el_extra_params: ["--builder.extradata=lodestarFromLocal"]
     cl_type: lodestar
-    cl_image: chainsafe/lodestar:v1.28.1
-  - el_type: geth
-    el_image: ethereum/client-go:v1.15.7
+    cl_image: chainsafe/lodestar:v1.29.0
+
+  - el_type: erigon
+    el_image: erigontech/erigon:v3.0.2
     el_extra_params: ["--miner.extradata=prysmFromLocal"]
     cl_type: prysm
-    cl_image: prysmaticlabs/prysm-beacon-chain:v5.3.2
-    vc_image: prysmaticlabs/prysm-validator:v5.3.2
-  - el_type: geth
-    el_image: ethereum/client-go:v1.15.7
-    el_extra_params: ["--miner.extradata=nimbusFromLocal"]
+    cl_image: prysmaticlabs/prysm-beacon-chain:v6.0.0
+    vc_image: prysmaticlabs/prysm-validator:v6.0.0
+
+  - el_type: besu
+    el_image: hyperledger/besu:25.4.1
+    el_extra_params: ["--miner-extra-data=0x6E696D62757346726F6D4C6F63616C"]
     cl_type: nimbus
-    cl_image: statusim/nimbus-eth2:multiarch-v25.3.1
-  - el_type: geth
-    el_image: ethereum/client-go:v1.15.7
-    el_extra_params: ["--miner.extradata=grandineFromLocal"]
-    cl_type: grandine
-    cl_image: sifrai/grandine:1.0.1
+    cl_image: statusim/nimbus-eth2:multiarch-v25.4.0
 
 additional_services:
   - dora
   - tx_fuzz
   - spamoor
+  - assertoor
 mev_type: flashbots
 
 mev_params:
-  mev_relay_image: ethpandaops/mev-boost-relay:main-17ed054
-  mev_boost_image: ethpandaops/mev-boost:develop-79c3997
-  mev_builder_cl_image: sigp/lighthouse:v7.0.0-beta.5
-  mev_builder_image: ethpandaops/reth-rbuilder:develop-01c8071
-
+  mev_relay_image: ethpandaops/mev-boost-relay:ssz-91648d3
+  mev_boost_image: ethpandaops/mev-boost:develop-d65d507
+  mev_builder_cl_image: sigp/lighthouse:v7.0.0
+  mev_builder_image: ethpandaops/reth-rbuilder:develop-8cd28c1
+  mev_builder_subsidy: 1
 
 network_params:
-  electra_fork_epoch: 1
+  electra_fork_epoch: 0
   min_validator_withdrawability_delay: 1
   shard_committee_period: 1
   churn_limit_quotient: 16
-  genesis_delay: 120
+  prefunded_accounts: '{"0xb9e79D19f651a941757b35830232E7EFC77E1c79": {"balance": "100000ETH"}}'
 
-spamoor_params:
-  spammers:
-    - scenario: blob-combined
+assertoor_params:
+  tests:
+    - file: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/pectra-dev/kurtosis/fillup-all-el-queues.yaml
       config:
-        throughput: 10
-        sidecars: 2
-        max_pending: 40
+        requestCount: 1000  # total number of requests
+        walletCount: 2  # number of wallets to send from for each request type
+        throughputPerWallet: 2 # number of transactions per slot, type and wallet
+        maxPendingPerWallet: 10 # max number of pending requests per type

README.md

@@ -871,6 +871,8 @@ mev_params:
   mev_builder_image: ethpandaops/flashbots-builder:main
   # The image to use for the CL builder
   mev_builder_cl_image: sigp/lighthouse:latest
+  # The subsidy to use for the builder (in ETH)
+  mev_builder_subsidy: 0
   # The image to use for mev-boost
   mev_boost_image: ethpandaops/mev-boost:develop
   # Parameters for MEV Boost. This overrides all arguments of the mev-boost container

main.star

@@ -173,7 +173,7 @@ def run(plan, args={}):
             network_params,
             constants.VALIDATING_REWARDS_ACCOUNT,
             network_params.preregistered_validator_keys_mnemonic,
-            args_with_right_defaults.mev_params.mev_builder_extra_data,
+            args_with_right_defaults.mev_params,
             enumerate(args_with_right_defaults.participants),
             global_node_selectors,
         )
@@ -299,34 +299,18 @@ def run(plan, args={}):
             all_el_contexts[-1].ip_addr, all_el_contexts[-1].rpc_port_num
         )
         beacon_uri = all_cl_contexts[-1].beacon_http_url
-        beacon_uris = ",".join(
-            ["{0}".format(context.beacon_http_url) for context in all_cl_contexts]
-        )
 
         first_cl_client = all_cl_contexts[0]
         first_client_beacon_name = first_cl_client.beacon_service_name
         contract_owner, normal_user = prefunded_accounts[6:8]
         mev_flood.launch_mev_flood(
             plan,
             mev_params.mev_flood_image,
-            fuzz_target,
+            all_el_contexts[-1].rpc_http_url,  # Only spam builder
             contract_owner.private_key,
             normal_user.private_key,
             global_node_selectors,
         )
-        epoch_recipe = GetHttpRequestRecipe(
-            endpoint="/eth/v2/beacon/blocks/head",
-            port_id=HTTP_PORT_ID_FOR_FACT,
-            extract={"epoch": ".data.message.body.attestations[0].data.target.epoch"},
-        )
-        plan.wait(
-            recipe=epoch_recipe,
-            field="extract.epoch",
-            assertion=">=",
-            target_value=str(network_params.deneb_fork_epoch),
-            timeout="20m",
-            service_name=first_client_beacon_name,
-        )
         if (
             args_with_right_defaults.mev_type == constants.FLASHBOTS_MEV_TYPE
             or args_with_right_defaults.mev_type == constants.COMMIT_BOOST_MEV_TYPE
@@ -335,7 +319,7 @@ def run(plan, args={}):
                 plan,
                 mev_params,
                 network_id,
-                beacon_uris,
+                beacon_uri,
                 genesis_validators_root,
                 blocksim_uri,
                 network_params.seconds_per_slot,
@@ -356,7 +340,7 @@ def run(plan, args={}):
 
         mev_flood.spam_in_background(
             plan,
-            fuzz_target,
+            all_el_contexts[-1].rpc_http_url,  # Only spam builder
             mev_params.mev_flood_extra_args,
             mev_params.mev_flood_seconds_per_bundle,
             contract_owner.private_key,
@@ -399,6 +383,7 @@ def run(plan, args={}):
                         final_genesis_timestamp,
                         mev_params.mev_boost_image,
                         mev_params.mev_boost_args,
+                        args_with_right_defaults.participants[index],
                         global_node_selectors,
                     )
                 elif args_with_right_defaults.mev_type == constants.MEV_RS_MEV_TYPE:

src/el/reth/reth_launcher.star

@@ -17,6 +17,8 @@ DISCOVERY_PORT_NUM = 30303
 ENGINE_RPC_PORT_NUM = 8551
 METRICS_PORT_NUM = 9001
 RBUILDER_PORT_NUM = 8645
+RBUILDER_METRICS_PORT_NUM = 6060
+
 # Paths
 METRICS_PATH = "/metrics"
 
@@ -144,6 +146,9 @@ def get_config(
         or launcher.builder_type == constants.COMMIT_BOOST_MEV_TYPE
     ):
         used_port_assignments[constants.RBUILDER_PORT_ID] = RBUILDER_PORT_NUM
+        used_port_assignments[
+            constants.RBUILDER_METRICS_PORT_ID
+        ] = RBUILDER_METRICS_PORT_NUM
 
     used_ports = shared_utils.get_port_specs(used_port_assignments)
 
@@ -248,6 +253,9 @@ def get_config(
         cmd.append("--rbuilder.config=" + flashbots_rbuilder.MEV_FILE_PATH_ON_CONTAINER)
         cmd.append("--engine.persistence-threshold=0")
         cmd.append("--engine.memory-block-buffer-target=0")
+        cmd.append(
+            "--txpool.no-local-transactions-propagation"
+        )  # disable tx propagation so that builder will have juicy blocks
         files[
             flashbots_rbuilder.MEV_BUILDER_MOUNT_DIRPATH_ON_SERVICE
         ] = flashbots_rbuilder.MEV_BUILDER_FILES_ARTIFACT_NAME

src/mev/flashbots/mev_boost/mev_boost_launcher.star

@@ -32,6 +32,7 @@ def launch(
     genesis_timestamp,
     mev_boost_image,
     mev_boost_args,
+    participant,
     global_node_selectors,
 ):
     config = get_config(
@@ -40,6 +41,7 @@ def launch(
         mev_boost_image,
         mev_boost_args,
         global_node_selectors,
+        participant,
     )
 
     mev_boost_service = plan.add_service(service_name, config)
@@ -55,6 +57,7 @@ def get_config(
     mev_boost_image,
     mev_boost_args,
     node_selectors,
+    participant,
 ):
     command = mev_boost_args
 
@@ -67,7 +70,11 @@ def get_config(
             "GENESIS_TIMESTAMP": "{0}".format(genesis_timestamp),
             "BOOST_LISTEN_ADDR": "0.0.0.0:{0}".format(input_parser.MEV_BOOST_PORT),
             "SKIP_RELAY_SIGNATURE_CHECK": "1",
-            "RELAYS": mev_boost_launcher.relay_end_points[0],
+            "RELAYS": "{0}?id={1}-{2}".format(
+                mev_boost_launcher.relay_end_points[0],
+                participant.cl_type,
+                participant.el_type,
+            ),
         },
         min_cpu=MIN_CPU,
         max_cpu=MAX_CPU,

src/mev/flashbots/mev_builder/mev_builder_launcher.star

@@ -20,7 +20,7 @@ def new_builder_config(
     network_params,
     fee_recipient,
     mnemonic,
-    extra_data,
+    mev_params,
     participants,
     global_node_selectors,
 ):
@@ -33,8 +33,9 @@ def new_builder_config(
         constants.DEFAULT_MEV_SECRET_KEY[2:],  # drop the 0x prefix
         mnemonic,
         fee_recipient,
-        extra_data,
+        mev_params.mev_builder_extra_data,
         num_of_participants,
+        mev_params.mev_builder_subsidy,
     )
     flashbots_builder_config_template = read_file(
         static_files.FLASHBOTS_RBUILDER_CONFIG_FILEPATH
@@ -68,6 +69,7 @@ def new_builder_config_template_data(
     fee_recipient,
     extra_data,
     num_of_participants,
+    subsidy,
 ):
     return {
         "Network": network_params.network
@@ -88,4 +90,5 @@ def new_builder_config_template_data(
         "Mnemonic": mnemonic,
         "FeeRecipient": fee_recipient,
         "ExtraData": extra_data,
+        "Subsidy": subsidy,
     }

src/mev/flashbots/mev_relay/mev_relay_launcher.star

@@ -19,10 +19,10 @@ NETWORK_ID_TO_NAME = {
 LAUNCH_ADMINER = True
 
 # The min/max CPU/memory that mev-relay can use
-RELAY_MIN_CPU = 100
-RELAY_MAX_CPU = 1000
-RELAY_MIN_MEMORY = 128
-RELAY_MAX_MEMORY = 1024
+RELAY_MIN_CPU = 500
+RELAY_MAX_CPU = 3000
+RELAY_MIN_MEMORY = 256
+RELAY_MAX_MEMORY = 2048
 
 # The min/max CPU/memory that postgres can use
 POSTGRES_MIN_CPU = 10
@@ -31,8 +31,8 @@ POSTGRES_MIN_MEMORY = 32
 POSTGRES_MAX_MEMORY = 1024
 
 # The min/max CPU/memory that redis can use
-REDIS_MIN_CPU = 10
-REDIS_MAX_CPU = 1000
+REDIS_MIN_CPU = 500
+REDIS_MAX_CPU = 3000
 REDIS_MIN_MEMORY = 16
 REDIS_MAX_MEMORY = 1024
 
@@ -171,6 +171,15 @@ def launch_mev_relay(
                 "https://{0}@{1}".format(
                     constants.DEFAULT_MEV_PUBKEY, MEV_RELAY_ENDPOINT
                 ),
+                "--show-config-details",
+                "--relay-url",
+                "http://{0}@{1}:{2}".format(
+                    constants.DEFAULT_MEV_PUBKEY,
+                    api.ip_address,
+                    MEV_RELAY_ENDPOINT_PORT,
+                ),
+                "--pubkey-override",
+                constants.DEFAULT_MEV_PUBKEY,
             ]
             + mev_params.mev_relay_website_extra_args,
             ports={

src/package_io/constants.star

@@ -57,6 +57,7 @@ ENGINE_RPC_PORT_ID = "engine-rpc"
 ENGINE_WS_PORT_ID = "engine-ws"
 ADMIN_PORT_ID = "admin"
 RBUILDER_PORT_ID = "rbuilder-rpc"
+RBUILDER_METRICS_PORT_ID = "rbuilder-metric"
 LITTLE_BIGTABLE_PORT_ID = "littlebigtable"
 VALDIATOR_GRPC_PORT_ID = "grpc"
 
@@ -174,7 +175,7 @@ GENESIS_VALIDATORS_ROOT = {
 DEPOSIT_CONTRACT_ADDRESS = {
     "mainnet": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
     "sepolia": "0x7f02C3E3c98b133055B8B348B2Ac625669Ed295D",
-    "holesky": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
+    "holesky": "0x4242424242424242424242424242424242424242",
     "ephemery": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
     "hoodi": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
 }

src/package_io/input_parser.star

@@ -213,6 +213,14 @@ def input_parser(plan, input_args):
             )
         )
 
+    if (
+        result["mev_params"].get("mev_builder_subsidy") != 0
+        and result["network_params"].get("prefunded_accounts") == {}
+    ):
+        fail(
+            'mev_builder_subsidy is not 0 but prefunded_accounts is empty, please provide a prefunded account for the builder. Example: prefunded_accounts: \'{"0xb9e79D19f651a941757b35830232E7EFC77E1c79": {"balance": "100000ETH"}}\''
+        )
+
     if result["docker_cache_params"]["enabled"]:
         docker_cache_image_override(plan, result)
     else:
@@ -369,6 +377,7 @@ def input_parser(plan, input_args):
             mev_builder_image=result["mev_params"]["mev_builder_image"],
             mev_builder_cl_image=result["mev_params"]["mev_builder_cl_image"],
             mev_builder_extra_data=result["mev_params"]["mev_builder_extra_data"],
+            mev_builder_subsidy=result["mev_params"]["mev_builder_subsidy"],
             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"],
@@ -1083,6 +1092,7 @@ def get_default_mev_params(mev_type, preset):
     else:
         mev_builder_cl_image = DEFAULT_CL_IMAGES[constants.CL_TYPE.lighthouse]
     mev_builder_extra_data = None
+    mev_builder_subsidy = 0
     mev_boost_image = constants.DEFAULT_FLASHBOTS_MEV_BOOST_IMAGE
     mev_boost_args = ["mev-boost", "--relay-check"]
     mev_relay_api_extra_args = []
@@ -1138,6 +1148,7 @@ def get_default_mev_params(mev_type, preset):
         "mock_mev_image": mev_builder_image
         if mev_type == constants.MOCK_MEV_TYPE
         else None,
+        "mev_builder_subsidy": mev_builder_subsidy,
         "mev_builder_cl_image": mev_builder_cl_image,
         "mev_builder_extra_data": mev_builder_extra_data,
         "mev_builder_extra_args": mev_builder_extra_args,

src/package_io/sanity_check.star

@@ -231,6 +231,7 @@ SUBCATEGORY_PARAMS = {
         "mev_relay_image",
         "mev_builder_image",
         "mev_builder_cl_image",
+        "mev_builder_subsidy",
         "mev_boost_image",
         "mev_boost_args",
         "mev_relay_api_extra_args",