From 150314694b04e25d985e5241ae02f1fcd45cfab9 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 29 Aug 2024 14:11:32 +0200 Subject: [PATCH 1/6] fix: explicitly set client contexts --- src/cl/cl_context.star | 4 ++-- src/cl/grandine/grandine_launcher.star | 14 ++++++------- src/cl/lighthouse/lighthouse_launcher.star | 22 ++++++++++---------- src/cl/lodestar/lodestar_launcher.star | 22 ++++++++++---------- src/cl/nimbus/nimbus_launcher.star | 22 ++++++++++---------- src/cl/prysm/prysm_launcher.star | 24 +++++++++++----------- src/cl/teku/teku_launcher.star | 14 ++++++------- src/el/besu/besu_launcher.star | 21 +++++++++---------- src/el/el_context.star | 7 ++++--- src/el/erigon/erigon_launcher.star | 22 ++++++++++---------- src/el/ethereumjs/ethereumjs_launcher.star | 21 +++++++++---------- src/el/geth/geth_launcher.star | 22 ++++++++++---------- src/el/nethermind/nethermind_launcher.star | 22 +++++++++----------- src/el/nimbus-eth1/nimbus_launcher.star | 21 +++++++++---------- src/el/reth/reth_launcher.star | 21 +++++++++---------- 15 files changed, 137 insertions(+), 142 deletions(-) diff --git a/src/cl/cl_context.star b/src/cl/cl_context.star index 58e983be3..2ebede678 100644 --- 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 index 6eff31372..75e709147 100644 --- 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, diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star index ff98c7d4e..583bfb352 100644 --- 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 "", diff --git a/src/cl/lodestar/lodestar_launcher.star b/src/cl/lodestar/lodestar_launcher.star index 6f1f0636f..a9f294606 100644 --- 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 "", diff --git a/src/cl/nimbus/nimbus_launcher.star b/src/cl/nimbus/nimbus_launcher.star index dec5e908b..72804ef49 100644 --- 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 index ce27dd981..270f69800 100644 --- 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 "", diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index 9362e12d0..69500d7d0 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -172,13 +172,13 @@ def launch( nodes_metrics_info = [beacon_node_metrics_info] return cl_context.new_cl_context( - "teku", - beacon_node_enr, - beacon_service.ip_address, - beacon_http_port.number, - beacon_http_url, - nodes_metrics_info, - beacon_service_name, + client_name="teku", + 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, diff --git a/src/el/besu/besu_launcher.star b/src/el/besu/besu_launcher.star index 91a9543c5..ea82fb69c 100644 --- a/src/el/besu/besu_launcher.star +++ b/src/el/besu/besu_launcher.star @@ -124,17 +124,16 @@ def launch( ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM) return el_context.new_el_context( - "besu", - "", # besu has no ENR - enode, - service.ip_address, - RPC_PORT_NUM, - WS_PORT_NUM, - ENGINE_HTTP_RPC_PORT_NUM, - http_url, - ws_url, - service_name, - [besu_metrics_info], + client_name="besu", + enode=enode, + ip_addr=service.ip_address, + rpc_port_num=RPC_PORT_NUM, + ws_port_num=WS_PORT_NUM, + engine_rpc_port_num=ENGINE_HTTP_RPC_PORT_NUM, + rpc_http_url=http_url, + ws_url=ws_url, + service_name=service_name, + el_metrics_info=[besu_metrics_info], ) diff --git a/src/el/el_context.star b/src/el/el_context.star index 35cf5fe19..7b3a56e56 100644 --- a/src/el/el_context.star +++ b/src/el/el_context.star @@ -1,20 +1,19 @@ def new_el_context( client_name, - enr, enode, ip_addr, rpc_port_num, ws_port_num, engine_rpc_port_num, rpc_http_url, - ws_url, + ws_url="", + enr="", service_name="", el_metrics_info=None, ): return struct( service_name=service_name, client_name=client_name, - enr=enr, enode=enode, ip_addr=ip_addr, rpc_port_num=rpc_port_num, @@ -22,5 +21,7 @@ def new_el_context( engine_rpc_port_num=engine_rpc_port_num, rpc_http_url=rpc_http_url, ws_url=ws_url, + enr=enr, + service_name=service_name, el_metrics_info=el_metrics_info, ) diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star index c0a4bf6e9..b0191a190 100644 --- a/src/el/erigon/erigon_launcher.star +++ b/src/el/erigon/erigon_launcher.star @@ -122,17 +122,17 @@ def launch( ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM) return el_context.new_el_context( - "erigon", - enr, - enode, - service.ip_address, - WS_RPC_PORT_NUM, - WS_RPC_PORT_NUM, - ENGINE_RPC_PORT_NUM, - http_url, - ws_url, - service_name, - [erigon_metrics_info], + client_name="erigon", + enode=enode, + ip_addr=service.ip_address, + rpc_port_num=WS_RPC_PORT_NUM, + ws_port_num=WS_RPC_PORT_NUM, + engine_rpc_port_num=ENGINE_RPC_PORT_NUM, + rpc_http_url=http_url, + ws_url=ws_url, + enr=enr, + service_name=service_name, + el_metrics_info=[erigon_metrics_info], ) diff --git a/src/el/ethereumjs/ethereumjs_launcher.star b/src/el/ethereumjs/ethereumjs_launcher.star index c69069a1c..71854ae96 100644 --- a/src/el/ethereumjs/ethereumjs_launcher.star +++ b/src/el/ethereumjs/ethereumjs_launcher.star @@ -121,17 +121,16 @@ def launch( ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM) return el_context.new_el_context( - "ethereumjs", - "", # ethereumjs has no enr - enode, - service.ip_address, - RPC_PORT_NUM, - WS_PORT_NUM, - ENGINE_RPC_PORT_NUM, - http_url, - ws_url, - service_name, - [ethjs_metrics_info], + client_name="ethereumjs", + enode=enode, + ip_addr=service.ip_address, + rpc_port_num=RPC_PORT_NUM, + ws_port_num=WS_PORT_NUM, + engine_rpc_port_num=ENGINE_RPC_PORT_NUM, + rpc_http_url=http_url, + ws_url=ws_url, + service_name=service_name, + el_metrics_info=[ethjs_metrics_info], ) diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star index 59b8ceb3d..9a739d95b 100644 --- a/src/el/geth/geth_launcher.star +++ b/src/el/geth/geth_launcher.star @@ -133,17 +133,17 @@ def launch( ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM) return el_context.new_el_context( - "geth", - enr, - enode, - service.ip_address, - RPC_PORT_NUM, - WS_PORT_NUM, - ENGINE_RPC_PORT_NUM, - http_url, - ws_url, - service_name, - [geth_metrics_info], + client_name="geth", + enode=enode, + ip_addr=service.ip_address, + rpc_port_num=RPC_PORT_NUM, + ws_port_num=WS_PORT_NUM, + engine_rpc_port_num=ENGINE_RPC_PORT_NUM, + rpc_http_url=http_url, + ws_url=ws_url, + enr=enr, + service_name=service_name, + el_metrics_info=[geth_metrics_info], ) diff --git a/src/el/nethermind/nethermind_launcher.star b/src/el/nethermind/nethermind_launcher.star index 427bfaaca..855057b9c 100644 --- a/src/el/nethermind/nethermind_launcher.star +++ b/src/el/nethermind/nethermind_launcher.star @@ -119,18 +119,16 @@ def launch( ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM) return el_context.new_el_context( - "nethermind", - "", # nethermind has no ENR in the eth2-merge-kurtosis-module either - # Nethermind node info endpoint doesn't return ENR field https://docs.nethermind.io/nethermind/ethereum-client/json-rpc/admin - enode, - service.ip_address, - RPC_PORT_NUM, - WS_PORT_NUM, - ENGINE_RPC_PORT_NUM, - http_url, - ws_url, - service_name, - [nethermind_metrics_info], + client_name="nethermind", + enode=enode, + ip_addr=service.ip_address, + rpc_port_num=RPC_PORT_NUM, + ws_port_num=WS_PORT_NUM, + engine_rpc_port_num=ENGINE_RPC_PORT_NUM, + rpc_http_url=http_url, + ws_url=ws_url, + service_name=service_name, + el_metrics_info=[nethermind_metrics_info], ) diff --git a/src/el/nimbus-eth1/nimbus_launcher.star b/src/el/nimbus-eth1/nimbus_launcher.star index bb219a38a..23e39b1b7 100644 --- a/src/el/nimbus-eth1/nimbus_launcher.star +++ b/src/el/nimbus-eth1/nimbus_launcher.star @@ -120,17 +120,16 @@ def launch( ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM) return el_context.new_el_context( - "nimbus", - "", # nimbus has no enr - enode, - service.ip_address, - WS_RPC_PORT_NUM, - WS_RPC_PORT_NUM, - ENGINE_RPC_PORT_NUM, - http_url, - ws_url, - service_name, - [nimbus_metrics_info], + client_name="nimbus", + enode=enode, + ip_addr=service.ip_address, + rpc_port_num=constants.RPC_PORT_NUM, + ws_port_num=constants.WS_PORT_NUM, + engine_rpc_port_num=ENGINE_RPC_PORT_NUM, + rpc_http_url=http_url, + ws_url=ws_url, + service_name=service_name, + el_metrics_info=[nimbus_metrics_info], ) diff --git a/src/el/reth/reth_launcher.star b/src/el/reth/reth_launcher.star index f90f96542..df45a062e 100644 --- a/src/el/reth/reth_launcher.star +++ b/src/el/reth/reth_launcher.star @@ -125,17 +125,16 @@ def launch( ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM) return el_context.new_el_context( - "reth", - "", # reth has no enr - enode, - service.ip_address, - RPC_PORT_NUM, - WS_PORT_NUM, - ENGINE_RPC_PORT_NUM, - http_url, - ws_url, - service_name, - [reth_metrics_info], + client_name="reth", + enode=enode, + ip_addr=service.ip_address, + rpc_port_num=RPC_PORT_NUM, + ws_port_num=WS_PORT_NUM, + engine_rpc_port_num=ENGINE_RPC_PORT_NUM, + rpc_http_url=http_url, + ws_url=ws_url, + service_name=service_name, + el_metrics_info=[reth_metrics_info], ) From 573e04e2d9f4e8eac8f9ecdf612298f4cfebc173 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 29 Aug 2024 14:20:22 +0200 Subject: [PATCH 2/6] fix ci --- src/el/el_context.star | 1 - 1 file changed, 1 deletion(-) diff --git a/src/el/el_context.star b/src/el/el_context.star index 7b3a56e56..420741352 100644 --- a/src/el/el_context.star +++ b/src/el/el_context.star @@ -12,7 +12,6 @@ def new_el_context( el_metrics_info=None, ): return struct( - service_name=service_name, client_name=client_name, enode=enode, ip_addr=ip_addr, From 90e1cace9a3f26129d3064fbc41f44e43f57e4fa Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 29 Aug 2024 14:34:54 +0200 Subject: [PATCH 3/6] fix nimbus-eth1 --- src/el/nimbus-eth1/nimbus_launcher.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/el/nimbus-eth1/nimbus_launcher.star b/src/el/nimbus-eth1/nimbus_launcher.star index 23e39b1b7..896dc51e6 100644 --- a/src/el/nimbus-eth1/nimbus_launcher.star +++ b/src/el/nimbus-eth1/nimbus_launcher.star @@ -123,8 +123,8 @@ def launch( client_name="nimbus", enode=enode, ip_addr=service.ip_address, - rpc_port_num=constants.RPC_PORT_NUM, - ws_port_num=constants.WS_PORT_NUM, + rpc_port_num=WS_RPC_PORT_NUM, + ws_port_num=WS_RPC_PORT_NUM, engine_rpc_port_num=ENGINE_RPC_PORT_NUM, rpc_http_url=http_url, ws_url=ws_url, From fbf4b60dfcb72c8012cea1f49d8101d186e243dc Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 29 Aug 2024 15:08:02 +0200 Subject: [PATCH 4/6] fix ephemery --- .github/tests/ephemery.yaml | 1 + .github/tests/geth-all.yaml | 3 + ...vnet-2.yaml => pectra-devnet-2.yaml.norun} | 0 .../tests/{pectra.yaml => pectra.yaml.norun} | 0 .github/tests/peerdas-deneb.yaml | 47 ---------------- .github/tests/peerdas-deneb.yaml.norun | 55 +++++++++++++++++++ ...net-2.yaml => peerdas-devnet-2.yaml.norun} | 0 ...lectra.yaml => peerdas-electra.yaml.norun} | 0 ...l_norun => verkle-gen-devnet-6.yaml.norun} | 0 .../tests/{verkle.yaml => verkle.yaml.norun} | 4 +- src/cl/grandine/grandine_launcher.star | 8 +-- src/cl/lighthouse/lighthouse_launcher.star | 8 +-- src/cl/lodestar/lodestar_launcher.star | 10 ++-- src/cl/prysm/prysm_launcher.star | 16 ++---- src/cl/teku/teku_launcher.star | 8 +-- src/package_io/constants.star | 5 +- src/participant_network.star | 15 +++-- 17 files changed, 93 insertions(+), 87 deletions(-) rename .github/tests/{pectra-devnet-2.yaml => pectra-devnet-2.yaml.norun} (100%) rename .github/tests/{pectra.yaml => pectra.yaml.norun} (100%) delete mode 100644 .github/tests/peerdas-deneb.yaml create mode 100644 .github/tests/peerdas-deneb.yaml.norun rename .github/tests/{peerdas-devnet-2.yaml => peerdas-devnet-2.yaml.norun} (100%) rename .github/tests/{peerdas-electra.yaml => peerdas-electra.yaml.norun} (100%) rename .github/tests/{verkle-gen-devnet-6.yaml_norun => verkle-gen-devnet-6.yaml.norun} (100%) rename .github/tests/{verkle.yaml => verkle.yaml.norun} (84%) diff --git a/.github/tests/ephemery.yaml b/.github/tests/ephemery.yaml index b1804b06c..11956b05e 100644 --- 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 index 67299f418..681d221c0 100644 --- 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 b/.github/tests/pectra-devnet-2.yaml.norun similarity index 100% rename from .github/tests/pectra-devnet-2.yaml rename to .github/tests/pectra-devnet-2.yaml.norun diff --git a/.github/tests/pectra.yaml b/.github/tests/pectra.yaml.norun similarity index 100% rename from .github/tests/pectra.yaml rename to .github/tests/pectra.yaml.norun diff --git a/.github/tests/peerdas-deneb.yaml b/.github/tests/peerdas-deneb.yaml deleted file mode 100644 index bcd5223dd..000000000 --- a/.github/tests/peerdas-deneb.yaml +++ /dev/null @@ -1,47 +0,0 @@ -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 - - 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 - cl_extra_params: [--subscribe-all-subnets=true] -# Non supernodes - - cl_type: prysm - cl_image: ethpandaops/prysm-beacon-chain:peerDAS-minimal - vc_image: ethpandaops/prysm-validator:develop - - cl_type: lighthouse - cl_image: ethpandaops/lighthouse:das-devnet-2 - - cl_type: teku - cl_image: ethpandaops/teku:nashatyrev-das - - cl_type: nimbus - cl_image: ethpandaops/nimbus-eth2:peerdas-p2p - - 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 -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-deneb.yaml.norun b/.github/tests/peerdas-deneb.yaml.norun new file mode 100644 index 000000000..3fbaf312f --- /dev/null +++ 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 b/.github/tests/peerdas-devnet-2.yaml.norun similarity index 100% rename from .github/tests/peerdas-devnet-2.yaml rename to .github/tests/peerdas-devnet-2.yaml.norun diff --git a/.github/tests/peerdas-electra.yaml b/.github/tests/peerdas-electra.yaml.norun similarity index 100% rename from .github/tests/peerdas-electra.yaml rename to .github/tests/peerdas-electra.yaml.norun diff --git a/.github/tests/verkle-gen-devnet-6.yaml_norun b/.github/tests/verkle-gen-devnet-6.yaml.norun similarity index 100% rename from .github/tests/verkle-gen-devnet-6.yaml_norun rename to .github/tests/verkle-gen-devnet-6.yaml.norun diff --git a/.github/tests/verkle.yaml b/.github/tests/verkle.yaml.norun similarity index 84% rename from .github/tests/verkle.yaml rename to .github/tests/verkle.yaml.norun index 52c192da4..abbdee15c 100644 --- a/.github/tests/verkle.yaml +++ b/.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/src/cl/grandine/grandine_launcher.star b/src/cl/grandine/grandine_launcher.star index 75e709147..92b9270e0 100644 --- a/src/cl/grandine/grandine_launcher.star +++ b/src/cl/grandine/grandine_launcher.star @@ -306,15 +306,13 @@ 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: 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 index 583bfb352..2799180f3 100644 --- a/src/cl/lighthouse/lighthouse_launcher.star +++ b/src/cl/lighthouse/lighthouse_launcher.star @@ -310,15 +310,13 @@ 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: 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 index a9f294606..3de6b0f74 100644 --- a/src/cl/lodestar/lodestar_launcher.star +++ b/src/cl/lodestar/lodestar_launcher.star @@ -297,15 +297,13 @@ 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: cmd.append( - "--checkpointSyncUrl=" + constants.CHECKPOINT_SYNC_URL[network] + "--ccheckpointSyncUrl=" + 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/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star index 270f69800..fc814ae4a 100644 --- a/src/cl/prysm/prysm_launcher.star +++ b/src/cl/prysm/prysm_launcher.star @@ -284,8 +284,11 @@ 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: cmd.append( "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] ) @@ -293,15 +296,8 @@ def get_beacon_config( "--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": diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index 69500d7d0..1315d3b99 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -327,15 +327,13 @@ 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: 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/package_io/constants.star b/src/package_io/constants.star index b85be11a5..b7d833b3f 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -124,6 +124,7 @@ PUBLIC_NETWORKS = ( "mainnet", "sepolia", "holesky", + "ephemery", ) NETWORK_ID = { @@ -134,7 +135,9 @@ NETWORK_ID = { CHECKPOINT_SYNC_URL = { "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 = { diff --git a/src/participant_network.star b/src/participant_network.star index e4bddea4d..fabfd4b85 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -96,22 +96,25 @@ def launch_participant_network( total_number_of_validator_keys, latest_block.files_artifacts[0] if latest_block != "" else "", ) - elif network_params.network in constants.PUBLIC_NETWORKS: - # We are running a public network + elif network_params.network == constants.NETWORK_NAME.ephemery: + # We are running an ephemery network ( el_cl_data, final_genesis_timestamp, network_id, validator_data, - ) = launch_public_network.launch(plan, network_params.network, prague_time) - elif network_params.network == constants.NETWORK_NAME.ephemery: - # We are running an ephemery network + ) = launch_ephemery.launch(plan, prague_time) + elif ( + network_params.network in constants.PUBLIC_NETWORKS + and network_params.network != constants.NETWORK_NAME.ephemery + ): + # We are running a public network ( el_cl_data, final_genesis_timestamp, network_id, validator_data, - ) = launch_ephemery.launch(plan, prague_time) + ) = launch_public_network.launch(plan, network_params.network, prague_time) else: # We are running a devnet ( From c0b883dc5e6ec3b5115700874f7643ac276431da Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 29 Aug 2024 15:16:16 +0200 Subject: [PATCH 5/6] fix ephemery --- src/cl/grandine/grandine_launcher.star | 5 ++++- src/cl/lighthouse/lighthouse_launcher.star | 5 ++++- src/cl/lodestar/lodestar_launcher.star | 7 +++++-- src/cl/prysm/prysm_launcher.star | 5 ++++- src/cl/teku/teku_launcher.star | 5 ++++- src/package_io/constants.star | 1 - 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/cl/grandine/grandine_launcher.star b/src/cl/grandine/grandine_launcher.star index 92b9270e0..c5dbae4de 100644 --- a/src/cl/grandine/grandine_launcher.star +++ b/src/cl/grandine/grandine_launcher.star @@ -306,7 +306,10 @@ def get_beacon_config( if checkpoint_sync_url: cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url) else: - if network in constants.PUBLIC_NETWORKS: + if ( + network in constants.PUBLIC_NETWORKS + or network == constants.NETWORK_NAME.ephemery + ): cmd.append( "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] ) diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star index 2799180f3..158763409 100644 --- a/src/cl/lighthouse/lighthouse_launcher.star +++ b/src/cl/lighthouse/lighthouse_launcher.star @@ -310,7 +310,10 @@ def get_beacon_config( if checkpoint_sync_url: cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url) else: - if network in constants.PUBLIC_NETWORKS: + if ( + network in constants.PUBLIC_NETWORKS + or network == constants.NETWORK_NAME.ephemery + ): cmd.append( "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] ) diff --git a/src/cl/lodestar/lodestar_launcher.star b/src/cl/lodestar/lodestar_launcher.star index 3de6b0f74..85c607c3b 100644 --- a/src/cl/lodestar/lodestar_launcher.star +++ b/src/cl/lodestar/lodestar_launcher.star @@ -297,9 +297,12 @@ def get_beacon_config( if checkpoint_sync_url: cmd.append("--checkpointSyncUrl=" + checkpoint_sync_url) else: - if network in constants.PUBLIC_NETWORKS: + if ( + network in constants.PUBLIC_NETWORKS + or network == constants.NETWORK_NAME.ephemery + ): cmd.append( - "--ccheckpointSyncUrl=" + constants.CHECKPOINT_SYNC_URL[network] + "--checkpointSyncUrl=" + constants.CHECKPOINT_SYNC_URL[network] ) else: fail( diff --git a/src/cl/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star index fc814ae4a..861284b7c 100644 --- a/src/cl/prysm/prysm_launcher.star +++ b/src/cl/prysm/prysm_launcher.star @@ -288,7 +288,10 @@ def get_beacon_config( "--genesis-beacon-api-url=" + constants.CHECKPOINT_SYNC_URL[network] ) else: - if network in constants.PUBLIC_NETWORKS: + if ( + network in constants.PUBLIC_NETWORKS + or network == constants.NETWORK_NAME.ephemery + ): cmd.append( "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] ) diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index 1315d3b99..c26820608 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -327,7 +327,10 @@ def get_beacon_config( if checkpoint_sync_url: cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url) else: - if network in constants.PUBLIC_NETWORKS: + if ( + network in constants.PUBLIC_NETWORKS + or network == constants.NETWORK_NAME.ephemery + ): cmd.append( "--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network] ) diff --git a/src/package_io/constants.star b/src/package_io/constants.star index b7d833b3f..d2e9cd74f 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -124,7 +124,6 @@ PUBLIC_NETWORKS = ( "mainnet", "sepolia", "holesky", - "ephemery", ) NETWORK_ID = { From 9fb6f381b690d10e37582fa356114b0dfc10ada8 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 29 Aug 2024 15:40:10 +0200 Subject: [PATCH 6/6] fix error notifcation --- .github/workflows/nightly.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6fa6a510a..5f9b600ad 100644 --- 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