From f0cde05e6d0d3d40f951b1c9f02d9d7a1044cb16 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Tue, 16 Jan 2024 15:46:05 +0100 Subject: [PATCH] add verkle to not have checkpoint --- .github/tests/devnet-test.yaml | 28 ------------------- README.md | 3 +- examples/README.md | 1 + examples/capella-mev.yaml | 18 ------------ examples/dencun.yaml | 32 ---------------------- examples/verkle-gen-nethermind.yaml | 32 ---------------------- examples/verkle-gen.yaml | 17 ------------ examples/verkle.yaml | 17 ------------ src/cl/lighthouse/lighthouse_launcher.star | 10 ++++--- src/cl/lodestar/lodestar_launcher.star | 10 ++++--- src/cl/prysm/prysm_launcher.star | 18 ++++++------ src/cl/teku/teku_launcher.star | 10 ++++--- 12 files changed, 30 insertions(+), 166 deletions(-) delete mode 100644 .github/tests/devnet-test.yaml create mode 100644 examples/README.md delete mode 100644 examples/capella-mev.yaml delete mode 100644 examples/dencun.yaml delete mode 100644 examples/verkle-gen-nethermind.yaml delete mode 100644 examples/verkle-gen.yaml delete mode 100644 examples/verkle.yaml diff --git a/.github/tests/devnet-test.yaml b/.github/tests/devnet-test.yaml deleted file mode 100644 index 72502f846..000000000 --- a/.github/tests/devnet-test.yaml +++ /dev/null @@ -1,28 +0,0 @@ -participants: - - el_client_type: geth - el_client_image: ethpandaops/geth:master - cl_client_type: teku - cl_client_image: ethpandaops/teku:master - - el_client_type: nethermind - el_client_image: ethpandaops/nethermind:master - cl_client_type: prysm - cl_client_image: ethpandaops/prysm:develop,ethpandaops/prysm-validator:develop - - el_client_type: erigon - el_client_image: ethpandaops/erigon:devel - cl_client_type: nimbus - cl_client_image: ethpandaops/nimbus:unstable - - el_client_type: besu - el_client_image: ethpandaops/besu:main - cl_client_type: lighthouse - cl_client_image: ethpandaops/lighthouse:unstable - - el_client_type: reth - el_client_image: ethpandaops/reth:main - cl_client_type: lodestar - cl_client_image: ethpandaops/lodestar:unstable - - el_client_type: ethereumjs - el_client_image: ethpandaops/ethereumjs:master - cl_client_type: teku - cl_client_image: ethpandaops/teku:master -network_params: - network: "dencun-devnet-12" -additional_services: [] diff --git a/README.md b/README.md index 3cbf859fc..fd0a559b5 100644 --- a/README.md +++ b/README.md @@ -645,8 +645,7 @@ This note is from 2023-10-05 `flashbots/mev-boost-relay:0.27` and later support `capella_fork_epoch` at `0` but this seems to require a few flags enabled on the `lighthouse` beacon client including `--always-prefer-builder-payload` and `--disable-peer-scoring` -Users are recommended to use [`examples/capella-mev.yaml`](./examples/capella-mev.yaml); as inspiration for reliable payload -delivery. +Users are recommended to browse the example tests [`./github/tests`](./github/tests); as inspiration for different ways to use the package. ## Pre-funded accounts at Genesis diff --git a/examples/README.md b/examples/README.md new file mode 100644 index 000000000..8914b2b31 --- /dev/null +++ b/examples/README.md @@ -0,0 +1 @@ +Please find the example configurations in the [../.github/tests](../.github/tests) directory. diff --git a/examples/capella-mev.yaml b/examples/capella-mev.yaml deleted file mode 100644 index c8724cd75..000000000 --- a/examples/capella-mev.yaml +++ /dev/null @@ -1,18 +0,0 @@ -mev_type: full -participants: -- el_client_type: geth - cl_client_type: lighthouse - cl_client_image: ethpandaops/lighthouse:unstable-c55608b - beacon_extra_params: - - "--always-prefer-builder-payload" - - "--disable-peer-scoring" -network_config: - deneb_fork_epoch: 1 -mev_params: - mev_flood_seconds_per_bundle: 12 - mev_flood_extra_args: - - "--txsPerBundle=300" - mev_flood_image: flashbots/mev-flood:0.0.9 - mev_relay_image: flashbots/mev-boost-relay:0.28.0a7 - mev_boost_image: flashbots/mev-boost:1.6.4844.dev5 - mev_builder_image: flashbots/builder:1.13.2.4844.dev7-4d161de diff --git a/examples/dencun.yaml b/examples/dencun.yaml deleted file mode 100644 index bad793e98..000000000 --- a/examples/dencun.yaml +++ /dev/null @@ -1,32 +0,0 @@ -participants: - - el_client_type: geth - el_client_image: ethpandaops/geth:master-5b57727 - cl_client_type: lighthouse - cl_client_image: ethpandaops/lighthouse:proposer-signature-cache-29ecfc3 - - el_client_type: erigon - el_client_image: ethpandaops/erigon:devel-8cfafa4 - cl_client_type: lodestar - cl_client_image: ethpandaops/lodestar:blobs-inclproof-d5a5a47 - - el_client_type: nethermind - el_client_image: ethpandaops/nethermind:master-dcec565 - cl_client_type: teku - cl_client_image: ethpandaops/teku:master-16c4354 - - el_client_type: besu - el_client_image: ethpandaops/besu:main-be5cc68 - cl_client_type: teku - cl_client_image: ethpandaops/teku:master-16c4354 - - el_client_type: reth - el_client_image: ethpandaops/reth:main-b0c4d99 - cl_client_type: nimbus - cl_client_image: ethpandaops/nimbus:unstable-15147cc - - el_client_type: geth - el_client_image: ethpandaops/geth:master-5b57727 - cl_client_type: prysm - cl_client_image: ethpandaops/prysm:develop-381116a,ethpandaops/prysm-validator:develop-linux-amd64-381116a -network_params: - deneb_fork_epoch: 1 -additional_services: - - el_forkmon - - tx_spammer - - dora -snooper_enabled: true diff --git a/examples/verkle-gen-nethermind.yaml b/examples/verkle-gen-nethermind.yaml deleted file mode 100644 index 63da51762..000000000 --- a/examples/verkle-gen-nethermind.yaml +++ /dev/null @@ -1,32 +0,0 @@ -participants: - - el_client_type: geth - el_client_image: ethpandaops/geth:gballet-kaustinen-with-shapella-fc8f4b9 - cl_client_type: lighthouse - cl_client_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9 - - el_client_type: geth - el_client_image: ethpandaops/geth:gballet-kaustinen-with-shapella-fc8f4b9 - cl_client_type: lodestar - cl_client_image: ethpandaops/lodestar:g11tech-verge-815364b - - el_client_type: nethermind - el_client_image: nethermindeth/nethermind:kaustinen-648c6b8 - cl_client_type: lodestar - cl_client_image: ethpandaops/lodestar:g11tech-verge-815364b - validator_count: 0 - el_client_log_level: "debug" - - el_client_type: nethermind - el_client_image: nethermindeth/nethermind:kaustinen-648c6b8 - cl_client_type: lodestar - cl_client_image: ethpandaops/lodestar:g11tech-verge-815364b - validator_count: 0 - el_client_log_level: "debug" -network_params: - electra_fork_epoch: 0 - genesis_delay: 0 - seconds_per_slot: 8 -additional_services: - - el_forkmon - - tx_spammer - - dora - - prometheus_grafana -snooper_enabled: true -ethereum_metrics_exporter_enabled: true diff --git a/examples/verkle-gen.yaml b/examples/verkle-gen.yaml deleted file mode 100644 index 553a11f5a..000000000 --- a/examples/verkle-gen.yaml +++ /dev/null @@ -1,17 +0,0 @@ -participants: - - el_client_type: geth - el_client_image: ethpandaops/geth:gballet-kaustinen-with-shapella-fc8f4b9 - cl_client_type: lighthouse - cl_client_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9 - count: 2 - - el_client_type: geth - el_client_image: ethpandaops/geth:gballet-kaustinen-with-shapella-fc8f4b9 - cl_client_type: lodestar - cl_client_image: ethpandaops/lodestar:g11tech-verge-815364b -network_params: - electra_fork_epoch: 0 -additional_services: - - el_forkmon - - tx_spammer - - dora -snooper_enabled: true diff --git a/examples/verkle.yaml b/examples/verkle.yaml deleted file mode 100644 index dc9de4217..000000000 --- a/examples/verkle.yaml +++ /dev/null @@ -1,17 +0,0 @@ -participants: - - el_client_type: geth - el_client_image: ethpandaops/geth:transition-post-genesis-1d80ebd - cl_client_type: lighthouse - cl_client_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9 - count: 2 - - el_client_type: geth - el_client_image: ethpandaops/geth:transition-post-genesis-1d80ebd - cl_client_type: lodestar - cl_client_image: ethpandaops/lodestar:g11tech-verge-815364b -network_params: - electra_fork_epoch: 1 -additional_services: - - el_forkmon - - tx_spammer - - dora -snooper_enabled: true diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star index 70b5c0e71..7d863e403 100644 --- a/src/cl/lighthouse/lighthouse_launcher.star +++ b/src/cl/lighthouse/lighthouse_launcher.star @@ -389,11 +389,13 @@ def get_beacon_config( ) ) else: # Devnets - cmd.append( - "--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format( - network + # TODO Remove once checkpoint sync is working for verkle + if "verkle" not in network: + cmd.append( + "--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format( + network + ) ) - ) cmd.append( "--boot-nodes=" + shared_utils.get_devnet_enrs_list( diff --git a/src/cl/lodestar/lodestar_launcher.star b/src/cl/lodestar/lodestar_launcher.star index 5d313fb4d..10fb34f3a 100644 --- a/src/cl/lodestar/lodestar_launcher.star +++ b/src/cl/lodestar/lodestar_launcher.star @@ -347,11 +347,13 @@ def get_beacon_config( ) ) else: # Devnets - cmd.append( - "--checkpointSyncUrl=https://checkpoint-sync.{0}.ethpandaops.io".format( - network + # TODO Remove once checkpoint sync is working for verkle + if "verkle" not in network: + cmd.append( + "--checkpointSyncUrl=https://checkpoint-sync.{0}.ethpandaops.io".format( + network + ) ) - ) cmd.append( "--bootnodes=" + shared_utils.get_devnet_enrs_list( diff --git a/src/cl/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star index 592efb011..73ffbe2b5 100644 --- a/src/cl/prysm/prysm_launcher.star +++ b/src/cl/prysm/prysm_launcher.star @@ -355,16 +355,18 @@ def get_beacon_config( + "/boot_enr.yaml" ) else: # Devnets - cmd.append( - "--genesis-beacon-api-url=https://checkpoint-sync.{0}.ethpandaops.io".format( - network + # TODO Remove once checkpoint sync is working for verkle + if "verkle" not in network: + cmd.append( + "--genesis-beacon-api-url=https://checkpoint-sync.{0}.ethpandaops.io".format( + network + ) ) - ) - cmd.append( - "--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format( - network + cmd.append( + "--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format( + network + ) ) - ) cmd.append( "--bootstrap-node=" + constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index 08e326dc5..ba5c70249 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -410,11 +410,13 @@ def get_beacon_config( ) ) else: # Devnets - cmd.append( - "--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format( - network + # TODO Remove once checkpoint sync is working for verkle + if "verkle" not in network: + cmd.append( + "--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format( + network + ) ) - ) cmd.append( "--p2p-discovery-bootnodes=" + shared_utils.get_devnet_enrs_list(