Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: explicitly set client contexts #755

Merged
merged 6 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/tests/ephemery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ participants:
cl_type: grandine
network_params:
network: ephemery
checkpoint_sync_enabled: true
3 changes: 3 additions & 0 deletions .github/tests/geth-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ participants:
cl_type: lodestar
- el_type: geth
cl_type: grandine
additional_services:
- goomy_blob
- dora
File renamed without changes.
47 changes: 0 additions & 47 deletions .github/tests/peerdas-deneb.yaml

This file was deleted.

55 changes: 55 additions & 0 deletions .github/tests/peerdas-deneb.yaml.norun
Original file line number Diff line number Diff line change
@@ -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" }
4 changes: 2 additions & 2 deletions .github/tests/verkle.yaml → .github/tests/verkle.yaml.norun
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/cl/cl_context.star
Original file line number Diff line number Diff line change
Expand Up @@ -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="",
Expand Down
25 changes: 13 additions & 12 deletions src/cl/grandine/grandine_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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:
Expand Down
33 changes: 17 additions & 16 deletions src/cl/lighthouse/lighthouse_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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 "",
Expand Down Expand Up @@ -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:
Expand Down
33 changes: 17 additions & 16 deletions src/cl/lodestar/lodestar_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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 "",
Expand Down Expand Up @@ -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:
Expand Down
22 changes: 11 additions & 11 deletions src/cl/nimbus/nimbus_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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 "",
Expand Down
43 changes: 21 additions & 22 deletions src/cl/prysm/prysm_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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 "",
Expand Down Expand Up @@ -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":
Expand Down
Loading
Loading