fix: explicitly set client contexts (#755)

ethpandaops · Aug 29, 2024 · 94dc531 · 94dc531
1 parent f124bbf
commit 94dc531
Show file tree

Hide file tree

Showing 28 changed files with 247 additions and 233 deletions.
diff --git a/.github/tests/ephemery.yaml b/.github/tests/ephemery.yaml
@@ -16,3 +16,4 @@ participants:
     cl_type: grandine
 network_params:
   network: ephemery
+checkpoint_sync_enabled: true
diff --git a/.github/tests/geth-all.yaml b/.github/tests/geth-all.yaml
@@ -11,3 +11,6 @@ participants:
     cl_type: lodestar
   - el_type: geth
     cl_type: grandine
+additional_services:
+  - goomy_blob
+  - dora
diff --git a/.github/tests/pectra-devnet-2.yaml → .github/tests/pectra-devnet-2.yaml.norun b/.github/tests/pectra-devnet-2.yaml → .github/tests/pectra-devnet-2.yaml.norun
diff --git a/.github/tests/pectra.yaml → .github/tests/pectra.yaml.norun b/.github/tests/pectra.yaml → .github/tests/pectra.yaml.norun
diff --git a/.github/tests/peerdas-deneb.yaml b/.github/tests/peerdas-deneb.yaml
diff --git a/.github/tests/peerdas-deneb.yaml.norun b/.github/tests/peerdas-deneb.yaml.norun
@@ -0,0 +1,55 @@
+participants:
+# Supernodes
+  - cl_type: prysm
+    cl_image: ethpandaops/prysm-beacon-chain:peerDAS
+    cl_extra_params: [--subscribe-all-subnets, --pprof]
+    cl_max_mem: 4096
+    count: 2
+  # - cl_type: lighthouse
+  #   cl_image: ethpandaops/lighthouse:unstable
+  #   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:pdsync-minimal
+  #   cl_extra_params: [--subscribe-all-subnets=true, --sync-light-client=no ]
+  #   count: 2
+  # - cl_type: lodestar
+  #   cl_image: ethpandaops/lodestar:peerDAS
+  #   cl_extra_params: [--persistNetworkIdentity, --supernode]
+# # Non supernodes
+  - cl_type: prysm
+    cl_image: ethpandaops/prysm-beacon-chain:peerDAS
+    cl_max_mem: 4096
+  # - cl_type: lighthouse
+  #   cl_image: ethpandaops/lighthouse:unstable
+  #- cl_type: teku
+  #  cl_image: ethpandaops/teku:nashatyrev-das
+  # - cl_type: nimbus
+  #   cl_image: ethpandaops/nimbus-eth2:pdsync-minimal
+  #   cl_extra_params: [--sync-light-client=no]
+  # - cl_type: lodestar
+  #   cl_image: ethpandaops/lodestar:peerDAS
+  #   cl_extra_params: [--persistNetworkIdentity]
+network_params:
+  eip7594_fork_epoch: 0
+  eip7594_fork_version: "0x50000038"
+  #preset: minimal
+snooper_enabled: true
+global_log_level: debug
+additional_services:
+  - dora
+  - goomy_blob
+  - prometheus_grafana
+  - assertoor
+dora_params:
+  image: ethpandaops/dora:peerdas-as-deneb
+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" }
diff --git a/.github/tests/peerdas-devnet-2.yaml → .github/tests/peerdas-devnet-2.yaml.norun b/.github/tests/peerdas-devnet-2.yaml → .github/tests/peerdas-devnet-2.yaml.norun
diff --git a/.github/tests/peerdas-electra.yaml → .github/tests/peerdas-electra.yaml.norun b/.github/tests/peerdas-electra.yaml → .github/tests/peerdas-electra.yaml.norun
diff --git a/.github/tests/verkle-gen-devnet-6.yaml_norun → .github/tests/verkle-gen-devnet-6.yaml.norun b/.github/tests/verkle-gen-devnet-6.yaml_norun → .github/tests/verkle-gen-devnet-6.yaml.norun
diff --git a/.github/tests/verkle.yaml → .github/tests/verkle.yaml.norun b/.github/tests/verkle.yaml → .github/tests/verkle.yaml.norun
@@ -1,6 +1,6 @@
 participants:
   - el_type: geth
-    el_image: ethpandaops/geth:t8n-verkle-exec-rebased
+    el_image: ethpandaops/geth:kaustinen-with-shapella
     el_extra_params:
       - "--override.blockproof=true"
       - "--override.overlay-stride=100"
@@ -9,7 +9,7 @@ participants:
     cl_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9
     count: 2
   - el_type: geth
-    el_image: ethpandaops/geth:t8n-verkle-exec-rebased
+    el_image: ethpandaops/geth:kaustinen-with-shapella
     el_extra_params:
       - "--override.blockproof=true"
       - "--override.overlay-stride=100"

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -54,11 +54,11 @@ jobs:
 
       - name: Notify
         if: (cancelled() || failure()) && env.discord_webhook_set == 'true'
-        uses: Ilshidur/action-discord@master
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: nobrayner/discord-webhook@v1
         with:
-          args: "The nightly test for ${{matrix.file_name}} on ethereum-package has failed find it here ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          description: "The nightly test for ${{matrix.file_name}} on ethereum-package has failed find it here ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          github-token: ${{ secrets.github_token }}
+          discord-webhook: ${{ secrets.DISCORD_WEBHOOK }}
 
   assertoor-mix-assert:
     runs-on: ubuntu-latest

diff --git a/src/cl/cl_context.star b/src/cl/cl_context.star
@@ -4,8 +4,8 @@ def new_cl_context(
     ip_addr,
     http_port,
     beacon_http_url,
-    cl_nodes_metrics_info,
-    beacon_service_name,
+    cl_nodes_metrics_info=None,
+    beacon_service_name="",
     beacon_grpc_url="",
     multiaddr="",
     peer_id="",

diff --git a/src/cl/grandine/grandine_launcher.star b/src/cl/grandine/grandine_launcher.star
@@ -167,13 +167,13 @@ def launch(
     )
     nodes_metrics_info = [beacon_node_metrics_info]
     return cl_context.new_cl_context(
-        "grandine",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
+        client_name="grandine",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
         multiaddr=beacon_multiaddr,
         peer_id=beacon_peer_id,
         snooper_enabled=snooper_enabled,
@@ -306,15 +306,16 @@ def get_beacon_config(
         if checkpoint_sync_url:
             cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
         else:
-            if network in ["mainnet", "ephemery"]:
+            if (
+                network in constants.PUBLIC_NETWORKS
+                or network == constants.NETWORK_NAME.ephemery
+            ):
                 cmd.append(
                     "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
                 )
             else:
-                cmd.append(
-                    "--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format(
-                        network
-                    )
+                fail(
+                    "Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
                 )
 
     if network not in constants.PUBLIC_NETWORKS:

diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star
@@ -184,17 +184,17 @@ def launch(
     )
     nodes_metrics_info = [beacon_node_metrics_info]
     return cl_context.new_cl_context(
-        "lighthouse",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
-        beacon_multiaddr,
-        beacon_peer_id,
-        snooper_enabled,
-        snooper_engine_context,
+        client_name="lighthouse",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
+        multiaddr=beacon_multiaddr,
+        peer_id=beacon_peer_id,
+        snooper_enabled=snooper_enabled,
+        snooper_engine_context=snooper_engine_context,
         validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
         if node_keystore_files
         else "",
@@ -310,15 +310,16 @@ def get_beacon_config(
         if checkpoint_sync_url:
             cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
         else:
-            if network in ["mainnet", "ephemery"]:
+            if (
+                network in constants.PUBLIC_NETWORKS
+                or network == constants.NETWORK_NAME.ephemery
+            ):
                 cmd.append(
                     "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
                 )
             else:
-                cmd.append(
-                    "--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format(
-                        network
-                    )
+                fail(
+                    "Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
                 )
 
     if network not in constants.PUBLIC_NETWORKS:

diff --git a/src/cl/lodestar/lodestar_launcher.star b/src/cl/lodestar/lodestar_launcher.star
@@ -182,17 +182,17 @@ def launch(
     nodes_metrics_info = [beacon_node_metrics_info]
 
     return cl_context.new_cl_context(
-        "lodestar",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
-        beacon_multiaddr,
-        beacon_peer_id,
-        snooper_enabled,
-        snooper_engine_context,
+        client_name="lodestar",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
+        multiaddr=beacon_multiaddr,
+        peer_id=beacon_peer_id,
+        snooper_enabled=snooper_enabled,
+        snooper_engine_context=snooper_engine_context,
         validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
         if node_keystore_files
         else "",
@@ -297,15 +297,16 @@ def get_beacon_config(
         if checkpoint_sync_url:
             cmd.append("--checkpointSyncUrl=" + checkpoint_sync_url)
         else:
-            if network in ["mainnet", "ephemery"]:
+            if (
+                network in constants.PUBLIC_NETWORKS
+                or network == constants.NETWORK_NAME.ephemery
+            ):
                 cmd.append(
                     "--checkpointSyncUrl=" + constants.CHECKPOINT_SYNC_URL[network]
                 )
             else:
-                cmd.append(
-                    "--checkpointSyncUrl=https://checkpoint-sync.{0}.ethpandaops.io".format(
-                        network
-                    )
+                fail(
+                    "Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
                 )
 
     if network not in constants.PUBLIC_NETWORKS:

diff --git a/src/cl/nimbus/nimbus_launcher.star b/src/cl/nimbus/nimbus_launcher.star
@@ -178,17 +178,17 @@ def launch(
     nodes_metrics_info = [nimbus_node_metrics_info]
 
     return cl_context.new_cl_context(
-        "nimbus",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
-        beacon_multiaddr,
-        beacon_peer_id,
-        snooper_enabled,
-        snooper_engine_context,
+        client_name="nimbus",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
+        multiaddr=beacon_multiaddr,
+        peer_id=beacon_peer_id,
+        snooper_enabled=snooper_enabled,
+        snooper_engine_context=snooper_engine_context,
         validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
         if node_keystore_files
         else "",

diff --git a/src/cl/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star
@@ -163,18 +163,18 @@ def launch(
     nodes_metrics_info = [beacon_node_metrics_info]
 
     return cl_context.new_cl_context(
-        "prysm",
-        beacon_node_enr,
-        beacon_service.ip_address,
-        beacon_http_port.number,
-        beacon_http_url,
-        nodes_metrics_info,
-        beacon_service_name,
-        beacon_grpc_url,
-        beacon_multiaddr,
-        beacon_peer_id,
-        snooper_enabled,
-        snooper_engine_context,
+        client_name="prysm",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=nodes_metrics_info,
+        beacon_service_name=beacon_service_name,
+        beacon_grpc_url=beacon_grpc_url,
+        multiaddr=beacon_multiaddr,
+        peer_id=beacon_peer_id,
+        snooper_enabled=snooper_enabled,
+        snooper_engine_context=snooper_engine_context,
         validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
         if node_keystore_files
         else "",
@@ -284,24 +284,23 @@ def get_beacon_config(
     if checkpoint_sync_enabled:
         if checkpoint_sync_url:
             cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
+            cmd.append(
+                "--genesis-beacon-api-url=" + constants.CHECKPOINT_SYNC_URL[network]
+            )
         else:
-            if network in ["mainnet", "ephemery"]:
+            if (
+                network in constants.PUBLIC_NETWORKS
+                or network == constants.NETWORK_NAME.ephemery
+            ):
                 cmd.append(
                     "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
                 )
                 cmd.append(
                     "--genesis-beacon-api-url=" + constants.CHECKPOINT_SYNC_URL[network]
                 )
             else:
-                cmd.append(
-                    "--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format(
-                        network
-                    )
-                )
-                cmd.append(
-                    "--genesis-beacon-api-url=https://checkpoint-sync.{0}.ethpandaops.io".format(
-                        network
-                    )
+                fail(
+                    "Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
                 )
 
     if preset == "minimal":