From 446e32d982a1e3920b1eee8ce21bc0fee875edc9 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 9 May 2024 16:16:08 +0200 Subject: [PATCH 1/3] fix: pectra example --- .github/tests/pectra-devnet-0.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/tests/pectra-devnet-0.yaml b/.github/tests/pectra-devnet-0.yaml index 420734e65..f0fef26b4 100644 --- a/.github/tests/pectra-devnet-0.yaml +++ b/.github/tests/pectra-devnet-0.yaml @@ -1,14 +1,14 @@ 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 +network_params: + electra_fork_epoch: 1 +additional_services: + - dora +snooper_enabled: true From 36f4229c7e43a9ecd198811bf69040aa3067adb5 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Sun, 12 May 2024 12:21:45 +0300 Subject: [PATCH 2/3] fix verkle, peerdas and pectra example --- .github/tests/pectra-devnet-0.yaml | 4 ++++ .github/tests/peerdas-fork.yaml | 7 +++++++ .github/tests/verkle-gen-devnet-4.yaml | 13 ------------- .github/tests/verkle-gen-devnet-6.yaml | 13 +++++++++++++ 4 files changed, 24 insertions(+), 13 deletions(-) delete mode 100644 .github/tests/verkle-gen-devnet-4.yaml create mode 100644 .github/tests/verkle-gen-devnet-6.yaml diff --git a/.github/tests/pectra-devnet-0.yaml b/.github/tests/pectra-devnet-0.yaml index f0fef26b4..66f1b5ca9 100644 --- a/.github/tests/pectra-devnet-0.yaml +++ b/.github/tests/pectra-devnet-0.yaml @@ -7,6 +7,10 @@ participants: 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: diff --git a/.github/tests/peerdas-fork.yaml b/.github/tests/peerdas-fork.yaml index 1f241a500..fc8dd5953 100644 --- 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 deleted file mode 100644 index 8b56647c9..000000000 --- a/.github/tests/verkle-gen-devnet-4.yaml +++ /dev/null @@ -1,13 +0,0 @@ -participants: - - el_type: geth - el_image: ethpandaops/geth:kaustinen-with-shapella-0b110bd - cl_type: lighthouse - cl_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9 - count: 2 - - el_type: geth - el_image: ethpandaops/geth:kaustinen-with-shapella-0b110bd - cl_type: lodestar - cl_image: ethpandaops/lodestar:g11tech-verge-815364b -network_params: - network: verkle-gen-devnet-4 - diff --git a/.github/tests/verkle-gen-devnet-6.yaml b/.github/tests/verkle-gen-devnet-6.yaml new file mode 100644 index 000000000..877682e80 --- /dev/null +++ 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 + From 9e2ab636f17fa397cf22c197b19956b15d83296c Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Mon, 13 May 2024 09:27:35 +0300 Subject: [PATCH 3/3] remove image temp for now --- src/cl/grandine/grandine_launcher.star | 2 +- src/cl/lighthouse/lighthouse_launcher.star | 2 +- src/cl/lodestar/lodestar_launcher.star | 2 +- src/cl/nimbus/nimbus_launcher.star | 2 +- src/cl/prysm/prysm_launcher.star | 2 +- src/cl/teku/teku_launcher.star | 2 +- src/el/besu/besu_launcher.star | 2 +- src/el/erigon/erigon_launcher.star | 2 +- src/el/ethereumjs/ethereumjs_launcher.star | 2 +- src/el/geth/geth_launcher.star | 2 +- src/el/nethermind/nethermind_launcher.star | 2 +- src/el/nimbus-eth1/nimbus_launcher.star | 2 +- src/el/reth/reth_launcher.star | 2 +- src/shared_utils/shared_utils.star | 6 ++++-- src/vc/lighthouse.star | 2 +- src/vc/lodestar.star | 2 +- src/vc/nimbus.star | 2 +- src/vc/prysm.star | 2 +- src/vc/teku.star | 2 +- 19 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/cl/grandine/grandine_launcher.star b/src/cl/grandine/grandine_launcher.star index 8bfdc135e..02a8e3b3e 100644 --- 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 index ca5b4cfac..ed5ff0d4e 100644 --- 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 index e410b2229..c08d15ba9 100644 --- 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 index 2b04d4510..4f717a37a 100644 --- 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 index 8c36b28f6..3d02d64a0 100644 --- 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 index d8e967b9b..0d7853919 100644 --- 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 index 1dcd17a50..b971cede9 100644 --- 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 index 9c96b7744..267daf0c3 100644 --- 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 index 187e422e9..68c9cd51f 100644 --- 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 index cff68c758..b5580fe93 100644 --- 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 index 4e8ae8dc9..324cd6e2c 100644 --- 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 index 30fdd0966..17b3b2ddd 100644 --- 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 index 2158d5eb8..9e0c8035a 100644 --- 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 index 225e5bdc6..fae2135bd 100644 --- 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 index b011ac9e6..1bb16a9c3 100644 --- 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 index 3b3c1ca9b..cf6a3d4df 100644 --- 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 index d84fd161a..7f7972a42 100644 --- 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 index 3c7368c8e..8c777a713 100644 --- 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 index 91065cdc2..d29ec9cc5 100644 --- 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, ),