fix: Update rbuilder flag and add mainnet split example (ethereum#885)

parithosh · web-flow · commit 4bbd0705d807 · 2025-02-03T13:33:58.000+01:00
diff --git a/.github/tests/mainnet-split.yaml.norun b/.github/tests/mainnet-split.yaml.norun
@@ -0,0 +1,55 @@
+participants:
+  # Prysm nodes (33%)
+  - el_type: geth
+    cl_type: prysm
+  - el_type: geth
+    cl_type: prysm
+  - el_type: nethermind
+    cl_type: prysm
+  - el_type: nethermind
+    cl_type: prysm
+  - el_type: besu
+    cl_type: prysm
+  
+  # Lighthouse nodes (32%)
+  - el_type: geth
+    cl_type: lighthouse
+  - el_type: geth
+    cl_type: lighthouse
+  - el_type: nethermind
+    cl_type: lighthouse
+  - el_type: nethermind
+    cl_type: lighthouse
+  - el_type: besu
+    cl_type: lighthouse
+
+  # Teku nodes (27%)
+  - el_type: geth
+    cl_type: teku
+  - el_type: nethermind
+    cl_type: teku
+  - el_type: nethermind
+    cl_type: teku
+  - el_type: besu
+    cl_type: teku
+
+  # Nimbus nodes (4%)
+  - el_type: geth
+    cl_type: nimbus
+
+  # One each of Lodestar and Grandine
+  - el_type: reth
+    cl_type: lodestar
+  - el_type: erigon
+    cl_type: grandine 
+
+# Enable MEV via the flashbots stack
+mev_type: flashbots
+
+additional_services:
+  - dora
+  - spamoor_blob
+  - tx_spammer
+  - assertoor
+
+global_log_level: debug  
diff --git a/.github/tests/mev-pectra.yaml b/.github/tests/mev-pectra.yaml
@@ -1,16 +1,56 @@
 participants:
-  - el_type: reth
+  - el_type: geth
+    el_image: ethpandaops/geth:prague-devnet-6-c070db6
+    el_extra_params: ["--miner.extradata=pawanRocks"]
+    cl_type: lighthouse
+    cl_image: ethpandaops/lighthouse:unstable-95cec45
+  - el_type: geth
+    el_image: ethpandaops/geth:prague-devnet-6-c070db6
+    el_extra_params: ["--miner.extradata=TekuFromLocal"]
     cl_type: teku
+    cl_image: consensys/teku:develop
+  - el_type: geth
+    el_image: ethpandaops/geth:prague-devnet-6-c070db6
+    el_extra_params: ["--miner.extradata=lodestarFromLocal"]
+    cl_type: lodestar
+    cl_image: ethpandaops/lodestar:unstable-7982031
+  - el_type: geth
+    el_image: ethpandaops/geth:prague-devnet-6-c070db6
+    el_extra_params: ["--miner.extradata=prysmFromLocal"]
+    cl_type: prysm
+    cl_image: ethpandaops/prysm-beacon-chain:develop-910609a
+    vc_image: ethpandaops/prysm-validator:develop-910609a
+  - el_type: geth
+    el_image: ethpandaops/geth:prague-devnet-6-c070db6
+    el_extra_params: ["--miner.extradata=nimbusFromLocal"]
+    cl_type: nimbus
+    cl_image: ethpandaops/nimbus-eth2:unstable-dec1cd3
+  - el_type: geth
+    el_image: ethpandaops/geth:prague-devnet-6-c070db6
+    el_extra_params: ["--miner.extradata=grandineFromLocal"]
+    cl_type: grandine
+    cl_image: ethpandaops/grandine:devnet5-7ba51a4
+
 additional_services:
   - dora
   - tx_spammer
+  - spamoor_blob
 mev_type: flashbots
 
 mev_params:
   mev_relay_image: jtraglia/mev-boost-relay:electra
   mev_boost_image: jtraglia/mev-boost:electra
-  mev_builder_image: ethpandaops/rbuilder:develop-1b578f5
-  mev_builder_cl_image: ethpandaops/lighthouse:pawan-electra-alpha7-0dd215c
+  mev_builder_cl_image: ethpandaops/lighthouse:unstable-a1b7d61
+  mev_builder_image: ethpandaops/reth-rbuilder:devnet6-d7b1637
 
 network_params:
   electra_fork_epoch: 1
+  min_validator_withdrawability_delay: 1
+  shard_committee_period: 1
+  churn_limit_quotient: 16
+  genesis_delay: 120
+  
+spamoor_blob_params:
+  throughput: 10 
+  max_blobs: 2  
+  max_pending: 40 
diff --git a/.github/tests/pectra-devnet-6.yaml.norun b/.github/tests/pectra-devnet-6.yaml.norun
@@ -0,0 +1,58 @@
+participants_matrix:
+  el:
+    - el_type: geth
+      el_image: ethpandaops/geth:prague-devnet-6
+    - el_type: reth
+      el_image: ethpandaops/reth:main
+    - el_type: nethermind
+      el_image: ethpandaops/nethermind:master
+    - el_type: erigon
+      el_image: ethpandaops/erigon:pectra6
+    - el_type: besu
+      el_image: ethpandaops/besu:main
+    - el_type: ethereumjs
+      el_image: ethpandaops/ethereumjs:eip7840
+  cl:
+    - cl_type: lighthouse
+      cl_image: ethpandaops/lighthouse:unstable
+    - cl_type: teku
+      cl_image: consensys/teku:develop
+    - cl_type: nimbus
+      cl_image: ethpandaops/nimbus-eth2:unstable
+    - cl_type: lodestar
+      cl_image: ethpandaops/lodestar:unstable
+    - cl_type: grandine
+      cl_image: ethpandaops/grandine:devnet5
+    - cl_type: prysm
+      cl_image: ethpandaops/prysm-beacon-chain:develop
+      vc_image: ethpandaops/prysm-validator:develop
+
+network_params:
+  electra_fork_epoch: 1
+  min_validator_withdrawability_delay: 1
+  shard_committee_period: 1
+  churn_limit_quotient: 16
+  genesis_delay: 240
+additional_services:
+  - dora
+  - spamoor_blob
+  - tx_spammer
+  - assertoor
+dora_params:
+  image: "ethpandaops/dora:master-latest"
+spamoor_blob_params:
+  throughput: 10 
+  max_blobs: 2  
+  max_pending: 40 
+
+global_log_level: debug
+
+assertoor_params:
+  image: "ethpandaops/assertoor:master"
+  tests:
+    - file: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/pectra-dev/execution-spec-tests.yaml
+    - file: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/pectra-dev/blockhash-test-with-rpc-call.yaml
+    - file: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/pectra-dev/eip7002-all.yaml
+    - file: https://raw.githubusercontent.com/ethpandaops/assertoor/blob/master/playbooks/pectra-dev/eip7251-all.yaml
+    - file: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/pectra-dev/validator-lifecycle-test-v3.yaml
+    - file: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/pectra-dev/kurtosis/all.yaml
diff --git a/.github/tests/peerdas-fulu.yaml.norun b/.github/tests/peerdas-fulu.yaml.norun
@@ -1,47 +1,73 @@
 participants:
-# Supernodes
-  - cl_type: prysm
-    cl_image: ethpandaops/prysm-beacon-chain:peerDAS-minimal
-    cl_extra_params: [--subscribe-all-subnets, --pprof]
-    vc_image: ethpandaops/prysm-validator:develop
+  # Super nodes
+  # -----------
+
+  # Lighthouse
   - cl_type: lighthouse
-    cl_image: ethpandaops/lighthouse:das-devnet-2
-    cl_extra_params: [--subscribe-all-data-column-subnets]
-  - cl_type: teku
-    cl_image: ethpandaops/teku:nashatyrev-das
-    cl_extra_params: [--p2p-subscribe-all-custody-subnets-enabled]
-  - cl_type: nimbus
-    cl_image: ethpandaops/nimbus-eth2:peerdas-p2p-minimal
-    cl_extra_params: [--subscribe-all-subnets=true]
-# Non supernodes
+    cl_image: ethpandaops/lighthouse:peerdas-devnet-4
+    cl_max_mem: 4096
+    cl_extra_params:
+      - --subscribe-all-data-column-subnets
+
+  # Prysm
   - cl_type: prysm
-    cl_image: ethpandaops/prysm-beacon-chain:peerDAS-minimal
-    vc_image: ethpandaops/prysm-validator:develop
+    cl_image: ethpandaops/prysm-beacon-chain:peerDAS-ad11036
+    cl_max_mem: 4096
+    cl_extra_params:
+      - --minimum-peers-per-subnet=1
+      - --subscribe-all-subnets
+      - --log-format=json
+      
+  # Teku
+  - cl_type: teku
+    cl_image: ethpandaops/teku:das
+    cl_max_mem: 4096
+    cl_extra_params:
+      - --p2p-subscribe-all-custody-subnets-enabled
+      
+  - cl_type: grandine
+    cl_image: ethpandaops/grandine:peerdas-fulu
+    cl_max_mem: 4096
+    cl_extra_params:
+      - --subscribe-all-subnets
+
+  # Full nodes
+  # -----------
+
+  # Lighthouse
   - cl_type: lighthouse
-    cl_image: ethpandaops/lighthouse:das-devnet-2
+    cl_image: ethpandaops/lighthouse:peerdas-devnet-4
+    cl_max_mem: 4096
+
+  # Prysm
+  - cl_type: prysm
+    cl_image: ethpandaops/prysm-beacon-chain:peerDAS-ad11036
+    cl_max_mem: 4096
+    cl_extra_params:
+      - --minimum-peers-per-subnet=1
+      - --log-format=json
+
+  # Teku
   - cl_type: teku
-    cl_image: ethpandaops/teku:nashatyrev-das
-  - cl_type: nimbus
-    cl_image: ethpandaops/nimbus-eth2:peerdas-p2p-minimal
-  - cl_type: lodestar
-    cl_image: ethpandaops/lodestar:peerDAS
-    cl_extra_params: [--persistNetworkIdentity]
+    cl_image: ethpandaops/teku:das
+
+  # Grandine
+  - cl_type: grandine
+    cl_image: ethpandaops/grandine:peerdas-fulu
+
+global_log_level: debug
+
 network_params:
   electra_fork_epoch: 1
   fulu_fork_epoch: 2
-  preset: minimal
-snooper_enabled: true
-global_log_level: debug
+
 additional_services:
   - dora
   - spamoor_blob
   - prometheus_grafana
-  - assertoor
-ethereum_metrics_exporter_enabled: true
-assertoor_params:
-  run_stability_check: false
-  run_block_proposal_check: false
-  tests:
-    - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/block-proposal-check.yaml" }
-    - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/blob-transactions-test.yaml" }
-    - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/stability-check.yaml" }
+
+snooper_enabled: false
+
+dora_params:
+  image: ethpandaops/dora:fulu-support
+
diff --git a/src/el/reth/reth_launcher.star b/src/el/reth/reth_launcher.star
@@ -236,7 +236,6 @@ def get_config(
     ):
         image = launcher.mev_params.mev_builder_image
         cl_client_name = service_name.split("-")[4]
-        cmd.append("--engine.experimental")
         cmd.append("--rbuilder.config=" + flashbots_rbuilder.MEV_FILE_PATH_ON_CONTAINER)
         files[
             flashbots_rbuilder.MEV_BUILDER_MOUNT_DIRPATH_ON_SERVICE
