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: pectra example #605

Merged
merged 5 commits into from
May 13, 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
30 changes: 17 additions & 13 deletions .github/tests/pectra-devnet-0.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
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
- 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:
- dora
snooper_enabled: true
7 changes: 7 additions & 0 deletions .github/tests/peerdas-fork.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions .github/tests/verkle-gen-devnet-4.yaml

This file was deleted.

13 changes: 13 additions & 0 deletions .github/tests/verkle-gen-devnet-6.yaml
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion src/cl/grandine/grandine_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/cl/lighthouse/lighthouse_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/cl/lodestar/lodestar_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/cl/nimbus/nimbus_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/cl/prysm/prysm_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/cl/teku/teku_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/el/besu/besu_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/el/erigon/erigon_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/el/ethereumjs/ethereumjs_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/el/geth/geth_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/el/nethermind/nethermind_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/el/nimbus-eth1/nimbus_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/el/reth/reth_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
6 changes: 4 additions & 2 deletions src/shared_utils/shared_utils.star
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/vc/lighthouse.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/vc/lodestar.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/vc/nimbus.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/vc/prysm.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion src/vc/teku.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down