fix: pectra example (#605)

ethpandaops · May 13, 2024 · 67e3da0 · 67e3da0
1 parent cdeab93
commit 67e3da0
Show file tree

Hide file tree

Showing 23 changed files with 59 additions and 46 deletions.
diff --git a/.github/tests/pectra-devnet-0.yaml b/.github/tests/pectra-devnet-0.yaml
@@ -1,14 +1,18 @@
 participants:
-   - el_type: geth
-     el_image: ethpandaops/geth:lightclient-prague-devnet-0
-     cl_type: grandine
-     cl_image: ethpandaops/grandine:feature-electra
-   - el_type: nethermind
-     el_image: nethermindeth/nethermind:pectra
-     cl_type: lodestar
-     cl_image: ethpandaops/lodestar:electra-fork
- network_params:
-   electra_fork_epoch: 1
- additional_services:
-   - dora
- snooper_enabled: true
+  - el_type: geth
+    el_image: ethpandaops/geth:lightclient-prague-devnet-0
+    cl_type: grandine
+    cl_image: ethpandaops/grandine:feature-electra
+  - el_type: nethermind
+    el_image: nethermindeth/nethermind:pectra
+    cl_type: lodestar
+    cl_image: ethpandaops/lodestar:electra-fork
+  - el_type: ethereumjs
+    el_image: ethpandaops/ethereumjs:master
+    cl_type: lodestar
+    cl_image: ethpandaops/lodestar:electra-fork
+network_params:
+  electra_fork_epoch: 1
+additional_services:
+  - dora
+snooper_enabled: true
diff --git a/.github/tests/peerdas-fork.yaml b/.github/tests/peerdas-fork.yaml
@@ -2,6 +2,13 @@ participants:
   - el_type: geth
     cl_type: prysm
     cl_image: ethpandaops/prysm-beacon-chain:peerDASE2E
+    cl_max_mem: 2048
+  - el_type: geth
+    cl_type: lighthouse
+    cl_extra_args: [
+        --subscribe-all-data-column-subnets,
+    ]
+    cl_image: ethpandaops/lighthouse:das
   - el_type: geth
     cl_type: lighthouse
     cl_image: ethpandaops/lighthouse:das

diff --git a/.github/tests/verkle-gen-devnet-4.yaml b/.github/tests/verkle-gen-devnet-4.yaml
diff --git a/.github/tests/verkle-gen-devnet-6.yaml b/.github/tests/verkle-gen-devnet-6.yaml
@@ -0,0 +1,13 @@
+participants:
+  - el_type: geth
+    el_image: ethpandaops/geth:kaustinen-with-shapella
+    cl_type: lighthouse
+    cl_image: ethpandaops/lighthouse:verkle-trees-capella
+    count: 2
+  - el_type: geth
+    el_image: ethpandaops/geth:kaustinen-with-shapella
+    cl_type: lodestar
+    cl_image: ethpandaops/lodestar:g11tech-verge
+network_params:
+  network: verkle-gen-devnet-6
+
diff --git a/src/cl/grandine/grandine_launcher.star b/src/cl/grandine/grandine_launcher.star
@@ -409,7 +409,7 @@ def get_beacon_config(
         labels=shared_utils.label_maker(
             constants.CL_TYPE.grandine,
             constants.CLIENT_TYPES.cl,
-            image,
+            # image,
             el_context.client_name,
             extra_labels,
         ),

diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star
@@ -405,7 +405,7 @@ def get_beacon_config(
         labels=shared_utils.label_maker(
             constants.CL_TYPE.lighthouse,
             constants.CLIENT_TYPES.cl,
-            image,
+            # image,
             el_context.client_name,
             extra_labels,
         ),

diff --git a/src/cl/lodestar/lodestar_launcher.star b/src/cl/lodestar/lodestar_launcher.star
@@ -391,7 +391,7 @@ def get_beacon_config(
         labels=shared_utils.label_maker(
             constants.CL_TYPE.lodestar,
             constants.CLIENT_TYPES.cl,
-            image,
+            # image,
             el_context.client_name,
             extra_labels,
         ),

diff --git a/src/cl/nimbus/nimbus_launcher.star b/src/cl/nimbus/nimbus_launcher.star
@@ -397,7 +397,7 @@ def get_beacon_config(
         labels=shared_utils.label_maker(
             constants.CL_TYPE.nimbus,
             constants.CLIENT_TYPES.cl,
-            image,
+            # image,
             el_context.client_name,
             extra_labels,
         ),

diff --git a/src/cl/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star
@@ -375,7 +375,7 @@ def get_beacon_config(
         labels=shared_utils.label_maker(
             constants.CL_TYPE.prysm,
             constants.CLIENT_TYPES.cl,
-            beacon_image,
+            # beacon_image,
             el_context.client_name,
             extra_labels,
         ),

diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star
@@ -432,7 +432,7 @@ def get_beacon_config(
         labels=shared_utils.label_maker(
             constants.CL_TYPE.teku,
             constants.CLIENT_TYPES.cl,
-            image,
+            # image,
             el_context.client_name,
             extra_labels,
         ),

diff --git a/src/el/besu/besu_launcher.star b/src/el/besu/besu_launcher.star
@@ -291,7 +291,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.EL_TYPE.besu,
             constants.CLIENT_TYPES.el,
-            image,
+            # image,
             cl_client_name,
             extra_labels,
         ),

diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star
@@ -289,7 +289,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.EL_TYPE.erigon,
             constants.CLIENT_TYPES.el,
-            image,
+            # image,
             cl_client_name,
             extra_labels,
         ),

diff --git a/src/el/ethereumjs/ethereumjs_launcher.star b/src/el/ethereumjs/ethereumjs_launcher.star
@@ -277,7 +277,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.EL_TYPE.ethereumjs,
             constants.CLIENT_TYPES.el,
-            image,
+            # image,
             cl_client_name,
             extra_labels,
         ),

diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star
@@ -387,7 +387,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.EL_TYPE.geth,
             constants.CLIENT_TYPES.el,
-            image,
+            # image,
             cl_client_name,
             extra_labels,
         ),

diff --git a/src/el/nethermind/nethermind_launcher.star b/src/el/nethermind/nethermind_launcher.star
@@ -284,7 +284,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.EL_TYPE.nethermind,
             constants.CLIENT_TYPES.el,
-            image,
+            # image,
             cl_client_name,
             extra_labels,
         ),

diff --git a/src/el/nimbus-eth1/nimbus_launcher.star b/src/el/nimbus-eth1/nimbus_launcher.star
@@ -276,7 +276,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.EL_TYPE.nimbus,
             constants.CLIENT_TYPES.el,
-            image,
+            # image,
             cl_client_name,
             extra_labels,
         ),

diff --git a/src/el/reth/reth_launcher.star b/src/el/reth/reth_launcher.star
@@ -288,7 +288,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.EL_TYPE.reth,
             constants.CLIENT_TYPES.el,
-            image,
+            # image,
             cl_client_name,
             extra_labels,
         ),

diff --git a/src/shared_utils/shared_utils.star b/src/shared_utils/shared_utils.star
@@ -65,11 +65,13 @@ def zfill_custom(value, width):
     return ("0" * (width - len(str(value)))) + str(value)
 
 
-def label_maker(client, client_type, image, connected_client, extra_labels):
+def label_maker(
+    client, client_type, connected_client, extra_labels
+):  # add image back later
     labels = {
         "ethereum-package.client": client,
         "ethereum-package.client-type": client_type,
-        "ethereum-package.client-image": image.replace("/", "-").replace(":", "-"),
+        # "ethereum-package.client-image": image.replace("/", "-").replace(":", "-"),
         "ethereum-package.connected-client": connected_client,
     }
     labels.update(extra_labels)  # Add extra_labels to the labels dictionary

diff --git a/src/vc/lighthouse.star b/src/vc/lighthouse.star
@@ -112,7 +112,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.VC_TYPE.lighthouse,
             constants.CLIENT_TYPES.validator,
-            image,
+            # image,
             cl_context.client_name,
             extra_labels,
         ),

diff --git a/src/vc/lodestar.star b/src/vc/lodestar.star
@@ -110,7 +110,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.VC_TYPE.lodestar,
             constants.CLIENT_TYPES.validator,
-            image,
+            # image,
             cl_context.client_name,
             extra_labels,
         ),

diff --git a/src/vc/nimbus.star b/src/vc/nimbus.star
@@ -84,7 +84,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.VC_TYPE.nimbus,
             constants.CLIENT_TYPES.validator,
-            image,
+            # image,
             cl_context.client_name,
             extra_labels,
         ),

diff --git a/src/vc/prysm.star b/src/vc/prysm.star
@@ -99,7 +99,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.VC_TYPE.prysm,
             constants.CLIENT_TYPES.validator,
-            image,
+            # image,
             cl_context.client_name,
             extra_labels,
         ),

diff --git a/src/vc/teku.star b/src/vc/teku.star
@@ -95,7 +95,7 @@ def get_config(
         labels=shared_utils.label_maker(
             constants.VC_TYPE.teku,
             constants.CLIENT_TYPES.validator,
-            image,
+            # image,
             cl_context.client_name,
             extra_labels,
         ),