Commit 94dc531e authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub

fix: explicitly set client contexts (#755)

parent f124bbf9
...@@ -16,3 +16,4 @@ participants: ...@@ -16,3 +16,4 @@ participants:
cl_type: grandine cl_type: grandine
network_params: network_params:
network: ephemery network: ephemery
checkpoint_sync_enabled: true
...@@ -11,3 +11,6 @@ participants: ...@@ -11,3 +11,6 @@ participants:
cl_type: lodestar cl_type: lodestar
- el_type: geth - el_type: geth
cl_type: grandine cl_type: grandine
additional_services:
- goomy_blob
- dora
participants: participants:
# Supernodes # Supernodes
- cl_type: prysm - cl_type: prysm
cl_image: ethpandaops/prysm-beacon-chain:peerDAS-minimal cl_image: ethpandaops/prysm-beacon-chain:peerDAS
cl_extra_params: [--subscribe-all-subnets, --pprof] cl_extra_params: [--subscribe-all-subnets, --pprof]
vc_image: ethpandaops/prysm-validator:develop cl_max_mem: 4096
- cl_type: lighthouse count: 2
cl_image: ethpandaops/lighthouse:das-devnet-2 # - cl_type: lighthouse
cl_extra_params: [--subscribe-all-data-column-subnets] # cl_image: ethpandaops/lighthouse:unstable
- cl_type: teku # cl_extra_params: [--subscribe-all-data-column-subnets]
cl_image: ethpandaops/teku:nashatyrev-das #- cl_type: teku
cl_extra_params: [--p2p-subscribe-all-custody-subnets-enabled] # cl_image: ethpandaops/teku:nashatyrev-das
- cl_type: nimbus # cl_extra_params: [--p2p-subscribe-all-custody-subnets-enabled]
cl_image: ethpandaops/nimbus-eth2:peerdas-p2p # - cl_type: nimbus
cl_extra_params: [--subscribe-all-subnets=true] # cl_image: ethpandaops/nimbus-eth2:pdsync-minimal
# Non supernodes # 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_type: prysm
cl_image: ethpandaops/prysm-beacon-chain:peerDAS-minimal cl_image: ethpandaops/prysm-beacon-chain:peerDAS
vc_image: ethpandaops/prysm-validator:develop cl_max_mem: 4096
- cl_type: lighthouse # - cl_type: lighthouse
cl_image: ethpandaops/lighthouse:das-devnet-2 # cl_image: ethpandaops/lighthouse:unstable
- cl_type: teku #- cl_type: teku
cl_image: ethpandaops/teku:nashatyrev-das # cl_image: ethpandaops/teku:nashatyrev-das
- cl_type: nimbus # - cl_type: nimbus
cl_image: ethpandaops/nimbus-eth2:peerdas-p2p # cl_image: ethpandaops/nimbus-eth2:pdsync-minimal
- cl_type: lodestar # cl_extra_params: [--sync-light-client=no]
cl_image: ethpandaops/lodestar:peerDAS # - cl_type: lodestar
cl_extra_params: [--persistNetworkIdentity] # cl_image: ethpandaops/lodestar:peerDAS
# cl_extra_params: [--persistNetworkIdentity]
network_params: network_params:
eip7594_fork_epoch: 0 eip7594_fork_epoch: 0
eip7594_fork_version: "0x50000038" eip7594_fork_version: "0x50000038"
preset: minimal #preset: minimal
snooper_enabled: true snooper_enabled: true
global_log_level: debug global_log_level: debug
additional_services: additional_services:
...@@ -37,6 +43,8 @@ additional_services: ...@@ -37,6 +43,8 @@ additional_services:
- goomy_blob - goomy_blob
- prometheus_grafana - prometheus_grafana
- assertoor - assertoor
dora_params:
image: ethpandaops/dora:peerdas-as-deneb
ethereum_metrics_exporter_enabled: true ethereum_metrics_exporter_enabled: true
assertoor_params: assertoor_params:
run_stability_check: false run_stability_check: false
......
participants: participants:
- el_type: geth - el_type: geth
el_image: ethpandaops/geth:t8n-verkle-exec-rebased el_image: ethpandaops/geth:kaustinen-with-shapella
el_extra_params: el_extra_params:
- "--override.blockproof=true" - "--override.blockproof=true"
- "--override.overlay-stride=100" - "--override.overlay-stride=100"
...@@ -9,7 +9,7 @@ participants: ...@@ -9,7 +9,7 @@ participants:
cl_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9 cl_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9
count: 2 count: 2
- el_type: geth - el_type: geth
el_image: ethpandaops/geth:t8n-verkle-exec-rebased el_image: ethpandaops/geth:kaustinen-with-shapella
el_extra_params: el_extra_params:
- "--override.blockproof=true" - "--override.blockproof=true"
- "--override.overlay-stride=100" - "--override.overlay-stride=100"
......
...@@ -54,11 +54,11 @@ jobs: ...@@ -54,11 +54,11 @@ jobs:
- name: Notify - name: Notify
if: (cancelled() || failure()) && env.discord_webhook_set == 'true' if: (cancelled() || failure()) && env.discord_webhook_set == 'true'
uses: Ilshidur/action-discord@master uses: nobrayner/discord-webhook@v1
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
with: 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: assertoor-mix-assert:
runs-on: ubuntu-latest runs-on: ubuntu-latest
......
...@@ -4,8 +4,8 @@ def new_cl_context( ...@@ -4,8 +4,8 @@ def new_cl_context(
ip_addr, ip_addr,
http_port, http_port,
beacon_http_url, beacon_http_url,
cl_nodes_metrics_info, cl_nodes_metrics_info=None,
beacon_service_name, beacon_service_name="",
beacon_grpc_url="", beacon_grpc_url="",
multiaddr="", multiaddr="",
peer_id="", peer_id="",
......
...@@ -167,13 +167,13 @@ def launch( ...@@ -167,13 +167,13 @@ def launch(
) )
nodes_metrics_info = [beacon_node_metrics_info] nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context( return cl_context.new_cl_context(
"grandine", client_name="grandine",
beacon_node_enr, enr=beacon_node_enr,
beacon_service.ip_address, ip_addr=beacon_service.ip_address,
beacon_http_port.number, http_port=beacon_http_port.number,
beacon_http_url, beacon_http_url=beacon_http_url,
nodes_metrics_info, cl_nodes_metrics_info=nodes_metrics_info,
beacon_service_name, beacon_service_name=beacon_service_name,
multiaddr=beacon_multiaddr, multiaddr=beacon_multiaddr,
peer_id=beacon_peer_id, peer_id=beacon_peer_id,
snooper_enabled=snooper_enabled, snooper_enabled=snooper_enabled,
...@@ -306,15 +306,16 @@ def get_beacon_config( ...@@ -306,15 +306,16 @@ def get_beacon_config(
if checkpoint_sync_url: if checkpoint_sync_url:
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url) cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
else: else:
if network in ["mainnet", "ephemery"]: if (
network in constants.PUBLIC_NETWORKS
or network == constants.NETWORK_NAME.ephemery
):
cmd.append( cmd.append(
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
) )
else: else:
cmd.append( fail(
"--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format( "Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
network
)
) )
if network not in constants.PUBLIC_NETWORKS: if network not in constants.PUBLIC_NETWORKS:
......
...@@ -184,17 +184,17 @@ def launch( ...@@ -184,17 +184,17 @@ def launch(
) )
nodes_metrics_info = [beacon_node_metrics_info] nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context( return cl_context.new_cl_context(
"lighthouse", client_name="lighthouse",
beacon_node_enr, enr=beacon_node_enr,
beacon_service.ip_address, ip_addr=beacon_service.ip_address,
beacon_http_port.number, http_port=beacon_http_port.number,
beacon_http_url, beacon_http_url=beacon_http_url,
nodes_metrics_info, cl_nodes_metrics_info=nodes_metrics_info,
beacon_service_name, beacon_service_name=beacon_service_name,
beacon_multiaddr, multiaddr=beacon_multiaddr,
beacon_peer_id, peer_id=beacon_peer_id,
snooper_enabled, snooper_enabled=snooper_enabled,
snooper_engine_context, snooper_engine_context=snooper_engine_context,
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files if node_keystore_files
else "", else "",
...@@ -310,15 +310,16 @@ def get_beacon_config( ...@@ -310,15 +310,16 @@ def get_beacon_config(
if checkpoint_sync_url: if checkpoint_sync_url:
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url) cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
else: else:
if network in ["mainnet", "ephemery"]: if (
network in constants.PUBLIC_NETWORKS
or network == constants.NETWORK_NAME.ephemery
):
cmd.append( cmd.append(
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
) )
else: else:
cmd.append( fail(
"--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format( "Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
network
)
) )
if network not in constants.PUBLIC_NETWORKS: if network not in constants.PUBLIC_NETWORKS:
......
...@@ -182,17 +182,17 @@ def launch( ...@@ -182,17 +182,17 @@ def launch(
nodes_metrics_info = [beacon_node_metrics_info] nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context( return cl_context.new_cl_context(
"lodestar", client_name="lodestar",
beacon_node_enr, enr=beacon_node_enr,
beacon_service.ip_address, ip_addr=beacon_service.ip_address,
beacon_http_port.number, http_port=beacon_http_port.number,
beacon_http_url, beacon_http_url=beacon_http_url,
nodes_metrics_info, cl_nodes_metrics_info=nodes_metrics_info,
beacon_service_name, beacon_service_name=beacon_service_name,
beacon_multiaddr, multiaddr=beacon_multiaddr,
beacon_peer_id, peer_id=beacon_peer_id,
snooper_enabled, snooper_enabled=snooper_enabled,
snooper_engine_context, snooper_engine_context=snooper_engine_context,
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files if node_keystore_files
else "", else "",
...@@ -297,15 +297,16 @@ def get_beacon_config( ...@@ -297,15 +297,16 @@ def get_beacon_config(
if checkpoint_sync_url: if checkpoint_sync_url:
cmd.append("--checkpointSyncUrl=" + checkpoint_sync_url) cmd.append("--checkpointSyncUrl=" + checkpoint_sync_url)
else: else:
if network in ["mainnet", "ephemery"]: if (
network in constants.PUBLIC_NETWORKS
or network == constants.NETWORK_NAME.ephemery
):
cmd.append( cmd.append(
"--checkpointSyncUrl=" + constants.CHECKPOINT_SYNC_URL[network] "--checkpointSyncUrl=" + constants.CHECKPOINT_SYNC_URL[network]
) )
else: else:
cmd.append( fail(
"--checkpointSyncUrl=https://checkpoint-sync.{0}.ethpandaops.io".format( "Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
network
)
) )
if network not in constants.PUBLIC_NETWORKS: if network not in constants.PUBLIC_NETWORKS:
......
...@@ -178,17 +178,17 @@ def launch( ...@@ -178,17 +178,17 @@ def launch(
nodes_metrics_info = [nimbus_node_metrics_info] nodes_metrics_info = [nimbus_node_metrics_info]
return cl_context.new_cl_context( return cl_context.new_cl_context(
"nimbus", client_name="nimbus",
beacon_node_enr, enr=beacon_node_enr,
beacon_service.ip_address, ip_addr=beacon_service.ip_address,
beacon_http_port.number, http_port=beacon_http_port.number,
beacon_http_url, beacon_http_url=beacon_http_url,
nodes_metrics_info, cl_nodes_metrics_info=nodes_metrics_info,
beacon_service_name, beacon_service_name=beacon_service_name,
beacon_multiaddr, multiaddr=beacon_multiaddr,
beacon_peer_id, peer_id=beacon_peer_id,
snooper_enabled, snooper_enabled=snooper_enabled,
snooper_engine_context, snooper_engine_context=snooper_engine_context,
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files if node_keystore_files
else "", else "",
......
...@@ -163,18 +163,18 @@ def launch( ...@@ -163,18 +163,18 @@ def launch(
nodes_metrics_info = [beacon_node_metrics_info] nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context( return cl_context.new_cl_context(
"prysm", client_name="prysm",
beacon_node_enr, enr=beacon_node_enr,
beacon_service.ip_address, ip_addr=beacon_service.ip_address,
beacon_http_port.number, http_port=beacon_http_port.number,
beacon_http_url, beacon_http_url=beacon_http_url,
nodes_metrics_info, cl_nodes_metrics_info=nodes_metrics_info,
beacon_service_name, beacon_service_name=beacon_service_name,
beacon_grpc_url, beacon_grpc_url=beacon_grpc_url,
beacon_multiaddr, multiaddr=beacon_multiaddr,
beacon_peer_id, peer_id=beacon_peer_id,
snooper_enabled, snooper_enabled=snooper_enabled,
snooper_engine_context, snooper_engine_context=snooper_engine_context,
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files if node_keystore_files
else "", else "",
...@@ -284,8 +284,14 @@ def get_beacon_config( ...@@ -284,8 +284,14 @@ def get_beacon_config(
if checkpoint_sync_enabled: if checkpoint_sync_enabled:
if checkpoint_sync_url: if checkpoint_sync_url:
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url) cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
cmd.append(
"--genesis-beacon-api-url=" + constants.CHECKPOINT_SYNC_URL[network]
)
else: else:
if network in ["mainnet", "ephemery"]: if (
network in constants.PUBLIC_NETWORKS
or network == constants.NETWORK_NAME.ephemery
):
cmd.append( cmd.append(
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
) )
...@@ -293,15 +299,8 @@ def get_beacon_config( ...@@ -293,15 +299,8 @@ def get_beacon_config(
"--genesis-beacon-api-url=" + constants.CHECKPOINT_SYNC_URL[network] "--genesis-beacon-api-url=" + constants.CHECKPOINT_SYNC_URL[network]
) )
else: else:
cmd.append( fail(
"--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format( "Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
network
)
)
cmd.append(
"--genesis-beacon-api-url=https://checkpoint-sync.{0}.ethpandaops.io".format(
network
)
) )
if preset == "minimal": if preset == "minimal":
......
...@@ -172,13 +172,13 @@ def launch( ...@@ -172,13 +172,13 @@ def launch(
nodes_metrics_info = [beacon_node_metrics_info] nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context( return cl_context.new_cl_context(
"teku", client_name="teku",
beacon_node_enr, enr=beacon_node_enr,
beacon_service.ip_address, ip_addr=beacon_service.ip_address,
beacon_http_port.number, http_port=beacon_http_port.number,
beacon_http_url, beacon_http_url=beacon_http_url,
nodes_metrics_info, cl_nodes_metrics_info=nodes_metrics_info,
beacon_service_name, beacon_service_name=beacon_service_name,
multiaddr=beacon_multiaddr, multiaddr=beacon_multiaddr,
peer_id=beacon_peer_id, peer_id=beacon_peer_id,
snooper_enabled=snooper_enabled, snooper_enabled=snooper_enabled,
...@@ -327,15 +327,16 @@ def get_beacon_config( ...@@ -327,15 +327,16 @@ def get_beacon_config(
if checkpoint_sync_url: if checkpoint_sync_url:
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url) cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
else: else:
if network in ["mainnet", "ephemery"]: if (
network in constants.PUBLIC_NETWORKS
or network == constants.NETWORK_NAME.ephemery
):
cmd.append( cmd.append(
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
) )
else: else:
cmd.append( fail(
"--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format( "Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
network
)
) )
if network not in constants.PUBLIC_NETWORKS: if network not in constants.PUBLIC_NETWORKS:
......
...@@ -124,17 +124,16 @@ def launch( ...@@ -124,17 +124,16 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM) ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"besu", client_name="besu",
"", # besu has no ENR enode=enode,
enode, ip_addr=service.ip_address,
service.ip_address, rpc_port_num=RPC_PORT_NUM,
RPC_PORT_NUM, ws_port_num=WS_PORT_NUM,
WS_PORT_NUM, engine_rpc_port_num=ENGINE_HTTP_RPC_PORT_NUM,
ENGINE_HTTP_RPC_PORT_NUM, rpc_http_url=http_url,
http_url, ws_url=ws_url,
ws_url, service_name=service_name,
service_name, el_metrics_info=[besu_metrics_info],
[besu_metrics_info],
) )
......
def new_el_context( def new_el_context(
client_name, client_name,
enr,
enode, enode,
ip_addr, ip_addr,
rpc_port_num, rpc_port_num,
ws_port_num, ws_port_num,
engine_rpc_port_num, engine_rpc_port_num,
rpc_http_url, rpc_http_url,
ws_url, ws_url="",
enr="",
service_name="", service_name="",
el_metrics_info=None, el_metrics_info=None,
): ):
return struct( return struct(
service_name=service_name,
client_name=client_name, client_name=client_name,
enr=enr,
enode=enode, enode=enode,
ip_addr=ip_addr, ip_addr=ip_addr,
rpc_port_num=rpc_port_num, rpc_port_num=rpc_port_num,
...@@ -22,5 +20,7 @@ def new_el_context( ...@@ -22,5 +20,7 @@ def new_el_context(
engine_rpc_port_num=engine_rpc_port_num, engine_rpc_port_num=engine_rpc_port_num,
rpc_http_url=rpc_http_url, rpc_http_url=rpc_http_url,
ws_url=ws_url, ws_url=ws_url,
enr=enr,
service_name=service_name,
el_metrics_info=el_metrics_info, el_metrics_info=el_metrics_info,
) )
...@@ -122,17 +122,17 @@ def launch( ...@@ -122,17 +122,17 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM) ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"erigon", client_name="erigon",
enr, enode=enode,
enode, ip_addr=service.ip_address,
service.ip_address, rpc_port_num=WS_RPC_PORT_NUM,
WS_RPC_PORT_NUM, ws_port_num=WS_RPC_PORT_NUM,
WS_RPC_PORT_NUM, engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM, rpc_http_url=http_url,
http_url, ws_url=ws_url,
ws_url, enr=enr,
service_name, service_name=service_name,
[erigon_metrics_info], el_metrics_info=[erigon_metrics_info],
) )
......
...@@ -121,17 +121,16 @@ def launch( ...@@ -121,17 +121,16 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM) ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"ethereumjs", client_name="ethereumjs",
"", # ethereumjs has no enr enode=enode,
enode, ip_addr=service.ip_address,
service.ip_address, rpc_port_num=RPC_PORT_NUM,
RPC_PORT_NUM, ws_port_num=WS_PORT_NUM,
WS_PORT_NUM, engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM, rpc_http_url=http_url,
http_url, ws_url=ws_url,
ws_url, service_name=service_name,
service_name, el_metrics_info=[ethjs_metrics_info],
[ethjs_metrics_info],
) )
......
...@@ -133,17 +133,17 @@ def launch( ...@@ -133,17 +133,17 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM) ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"geth", client_name="geth",
enr, enode=enode,
enode, ip_addr=service.ip_address,
service.ip_address, rpc_port_num=RPC_PORT_NUM,
RPC_PORT_NUM, ws_port_num=WS_PORT_NUM,
WS_PORT_NUM, engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM, rpc_http_url=http_url,
http_url, ws_url=ws_url,
ws_url, enr=enr,
service_name, service_name=service_name,
[geth_metrics_info], el_metrics_info=[geth_metrics_info],
) )
......
...@@ -119,18 +119,16 @@ def launch( ...@@ -119,18 +119,16 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM) ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"nethermind", client_name="nethermind",
"", # nethermind has no ENR in the eth2-merge-kurtosis-module either enode=enode,
# Nethermind node info endpoint doesn't return ENR field https://docs.nethermind.io/nethermind/ethereum-client/json-rpc/admin ip_addr=service.ip_address,
enode, rpc_port_num=RPC_PORT_NUM,
service.ip_address, ws_port_num=WS_PORT_NUM,
RPC_PORT_NUM, engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
WS_PORT_NUM, rpc_http_url=http_url,
ENGINE_RPC_PORT_NUM, ws_url=ws_url,
http_url, service_name=service_name,
ws_url, el_metrics_info=[nethermind_metrics_info],
service_name,
[nethermind_metrics_info],
) )
......
...@@ -120,17 +120,16 @@ def launch( ...@@ -120,17 +120,16 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM) ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"nimbus", client_name="nimbus",
"", # nimbus has no enr enode=enode,
enode, ip_addr=service.ip_address,
service.ip_address, rpc_port_num=WS_RPC_PORT_NUM,
WS_RPC_PORT_NUM, ws_port_num=WS_RPC_PORT_NUM,
WS_RPC_PORT_NUM, engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM, rpc_http_url=http_url,
http_url, ws_url=ws_url,
ws_url, service_name=service_name,
service_name, el_metrics_info=[nimbus_metrics_info],
[nimbus_metrics_info],
) )
......
...@@ -125,17 +125,16 @@ def launch( ...@@ -125,17 +125,16 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM) ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"reth", client_name="reth",
"", # reth has no enr enode=enode,
enode, ip_addr=service.ip_address,
service.ip_address, rpc_port_num=RPC_PORT_NUM,
RPC_PORT_NUM, ws_port_num=WS_PORT_NUM,
WS_PORT_NUM, engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM, rpc_http_url=http_url,
http_url, ws_url=ws_url,
ws_url, service_name=service_name,
service_name, el_metrics_info=[reth_metrics_info],
[reth_metrics_info],
) )
......
...@@ -134,7 +134,9 @@ NETWORK_ID = { ...@@ -134,7 +134,9 @@ NETWORK_ID = {
CHECKPOINT_SYNC_URL = { CHECKPOINT_SYNC_URL = {
"mainnet": "https://beaconstate.info", "mainnet": "https://beaconstate.info",
"ephemery": "https://checkpointz.bordel.wtf/", "ephemery": "https://checkpoint-sync.ephemery.ethpandaops.io/",
"sepolia": "https://checkpoint-sync.sepolia.ethpandaops.io/",
"holesky": "https://checkpoint-sync.holesky.ethpandaops.io/",
} }
GENESIS_VALIDATORS_ROOT = { GENESIS_VALIDATORS_ROOT = {
......
...@@ -96,22 +96,25 @@ def launch_participant_network( ...@@ -96,22 +96,25 @@ def launch_participant_network(
total_number_of_validator_keys, total_number_of_validator_keys,
latest_block.files_artifacts[0] if latest_block != "" else "", latest_block.files_artifacts[0] if latest_block != "" else "",
) )
elif network_params.network in constants.PUBLIC_NETWORKS: elif network_params.network == constants.NETWORK_NAME.ephemery:
# We are running a public network # We are running an ephemery network
( (
el_cl_data, el_cl_data,
final_genesis_timestamp, final_genesis_timestamp,
network_id, network_id,
validator_data, validator_data,
) = launch_public_network.launch(plan, network_params.network, prague_time) ) = launch_ephemery.launch(plan, prague_time)
elif network_params.network == constants.NETWORK_NAME.ephemery: elif (
# We are running an ephemery network network_params.network in constants.PUBLIC_NETWORKS
and network_params.network != constants.NETWORK_NAME.ephemery
):
# We are running a public network
( (
el_cl_data, el_cl_data,
final_genesis_timestamp, final_genesis_timestamp,
network_id, network_id,
validator_data, validator_data,
) = launch_ephemery.launch(plan, prague_time) ) = launch_public_network.launch(plan, network_params.network, prague_time)
else: else:
# We are running a devnet # We are running a devnet
( (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment