From 148564839320d71f40f61e494be0a1e4a71cd6cf Mon Sep 17 00:00:00 2001 From: parithosh Date: Wed, 18 Dec 2024 14:12:56 +0100 Subject: [PATCH 1/5] updating devnet test --- .github/tests/pectra-devnet-2.yaml.norun | 60 ------------------------ .github/tests/pectra-devnet-4.yaml.norun | 18 +++++++ src/package_io/constants.star | 2 +- 3 files changed, 19 insertions(+), 61 deletions(-) delete mode 100644 .github/tests/pectra-devnet-2.yaml.norun create mode 100644 .github/tests/pectra-devnet-4.yaml.norun diff --git a/.github/tests/pectra-devnet-2.yaml.norun b/.github/tests/pectra-devnet-2.yaml.norun deleted file mode 100644 index ec5fb0865..000000000 --- a/.github/tests/pectra-devnet-2.yaml.norun +++ /dev/null @@ -1,60 +0,0 @@ -participants_matrix: - el: - - el_type: nethermind - el_image: nethermindeth/nethermind:pectra-fix - - el_type: geth - el_image: ethpandaops/geth:lightclient-prague-devnet-1-37c4b03 - - el_type: ethereumjs - el_image: ethpandaops/ethereumjs:master-b543d2f - - el_type: erigon - el_image: ethpandaops/erigon:main-faa564e - - el_type: reth - el_image: ethpandaops/reth:onbjerg-devnet-2-36bc13d - - el_type: besu - el_image: ethpandaops/besu:main-ec8429f - cl: - - cl_type: lighthouse - cl_image: ethpandaops/lighthouse:electra-devnet-1-ba28217 - - cl_type: teku - cl_image: ethpandaops/teku:master-2d2d17b - - cl_type: nimbus - cl_image: ethpandaops/nimbus-eth2:unstable-ae0a148 - - cl_type: lodestar - cl_image: ethpandaops/lodestar:electra-fork-rebasejul30 - - cl_type: grandine - cl_image: ethpandaops/grandine:electra-bdd3997 - - cl_type: prysm - cl_image: ethpandaops/prysm-beacon-chain:develop-4d823ac -network_params: - network: pectra-devnet-2 -additional_services: - - dora - - assertoor -snooper_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/pectra-dev/wait-for-slot.yaml", id: "wait1", config: { slot: 34 }} - - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/bls-changes.yaml", config: { validatorCount: 300 }} - - # EIP-6110 - - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/wait-for-slot.yaml", id: "wait2", config: { slot: 38 }} - - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/massive-deposit-0x02.yaml - - # EIP-2935 - - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/wait-for-slot.yaml", id: "wait3", config: { slot: 42 }} - - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/blockhash-test.yaml - - # EIP-7002 - - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/wait-for-slot.yaml", id: "wait4", config: { slot: 46 }} - - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/voluntary-exits.yaml", config: { validatorCount: 10 }} - - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/wait-for-slot.yaml", id: "wait5", config: { slot: 50 }} - - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/el-triggered-exit.yaml", config: { validatorIndex: 20 }} - - # EIP-7251 - - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/wait-for-slot.yaml", id: "wait6", config: { slot: 54 }} - - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/el-triggered-consolidation.yaml", config: { sourceValidatorIndex: 21, targetValidatorIndex: 25 }} - - # Final check - - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/block-proposal-check.yaml" } diff --git a/.github/tests/pectra-devnet-4.yaml.norun b/.github/tests/pectra-devnet-4.yaml.norun new file mode 100644 index 000000000..76f2bb9f2 --- /dev/null +++ b/.github/tests/pectra-devnet-4.yaml.norun @@ -0,0 +1,18 @@ +participants: + - el_type: besu + el_image: siladu/besu:24.12-develop-8c5aabe + cl_type: teku + cl_image: consensys/teku:develop + el_log_level: "DEBUG" + +network_params: + electra_fork_epoch: 1 + min_validator_withdrawability_delay: 1 + shard_committee_period: 1 + churn_limit_quotient: 16 + num_validator_keys_per_node: 256 +additional_services: + - dora +dora_params: + image: "ethpandaops/dora:master-latest" +snooper_enabled: true \ No newline at end of file diff --git a/src/package_io/constants.star b/src/package_io/constants.star index c200600e6..c6fc57809 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -89,7 +89,7 @@ DEFAULT_DORA_IMAGE = "ethpandaops/dora:latest" DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest" DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest" DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE = ( - "ethpandaops/ethereum-genesis-generator:3.4.7" + "ethpandaops/ethereum-genesis-generator:3.5.0" ) DEFAULT_FLASHBOTS_RELAY_IMAGE = "flashbots/mev-boost-relay:0.29.2a3" DEFAULT_FLASHBOTS_BUILDER_IMAGE = "ethpandaops/reth-rbuilder:develop" From 3ddd0dd255f11b7e6fbe2246602ac0f608f07147 Mon Sep 17 00:00:00 2001 From: parithosh Date: Wed, 18 Dec 2024 14:52:07 +0100 Subject: [PATCH 2/5] updating egg --- README.md | 2 +- network_params.yaml | 2 +- src/package_io/input_parser.star | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 99a94d26e..ff11ee62a 100644 --- a/README.md +++ b/README.md @@ -960,7 +960,7 @@ spamoor_params: # Ethereum genesis generator params ethereum_genesis_generator_params: # The image to use for ethereum genesis generator - image: ethpandaops/ethereum-genesis-generator:3.4.7 + image: ethpandaops/ethereum-genesis-generator:3.5.0 # Global parameter to set the exit ip address of services and public ports port_publisher: diff --git a/network_params.yaml b/network_params.yaml index b0572c963..c945c7187 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -176,7 +176,7 @@ keymanager_enabled: false checkpoint_sync_enabled: false checkpoint_sync_url: "" ethereum_genesis_generator_params: - image: ethpandaops/ethereum-genesis-generator:3.4.7 + image: ethpandaops/ethereum-genesis-generator:3.5.0 port_publisher: nat_exit_ip: KURTOSIS_IP_ADDR_PLACEHOLDER el: diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index e50fd932b..7cdc78a16 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -1471,5 +1471,5 @@ def docker_cache_image_override(plan, result): def get_default_ethereum_genesis_generator_params(): return { - "image": "ethpandaops/ethereum-genesis-generator:3.4.7", + "image": "ethpandaops/ethereum-genesis-generator:3.5.0", } From d0ea9eaaca18455db999871986e51f6189337dc8 Mon Sep 17 00:00:00 2001 From: parithosh Date: Wed, 18 Dec 2024 15:09:13 +0100 Subject: [PATCH 3/5] use default --- src/package_io/input_parser.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 7cdc78a16..90df60d82 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -1471,5 +1471,5 @@ def docker_cache_image_override(plan, result): def get_default_ethereum_genesis_generator_params(): return { - "image": "ethpandaops/ethereum-genesis-generator:3.5.0", + "image": constants.DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE, } From a4bdb34dd86704e10e2e4b9dcbec197d2999acd7 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 18 Dec 2024 15:33:54 +0100 Subject: [PATCH 4/5] bump egg version --- README.md | 2 +- network_params.yaml | 2 +- src/package_io/constants.star | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ff11ee62a..23028e23f 100644 --- a/README.md +++ b/README.md @@ -960,7 +960,7 @@ spamoor_params: # Ethereum genesis generator params ethereum_genesis_generator_params: # The image to use for ethereum genesis generator - image: ethpandaops/ethereum-genesis-generator:3.5.0 + image: ethpandaops/ethereum-genesis-generator:3.5.1 # Global parameter to set the exit ip address of services and public ports port_publisher: diff --git a/network_params.yaml b/network_params.yaml index c945c7187..564c20fe3 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -176,7 +176,7 @@ keymanager_enabled: false checkpoint_sync_enabled: false checkpoint_sync_url: "" ethereum_genesis_generator_params: - image: ethpandaops/ethereum-genesis-generator:3.5.0 + image: ethpandaops/ethereum-genesis-generator:3.5.1 port_publisher: nat_exit_ip: KURTOSIS_IP_ADDR_PLACEHOLDER el: diff --git a/src/package_io/constants.star b/src/package_io/constants.star index c6fc57809..86596b7fc 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -89,7 +89,7 @@ DEFAULT_DORA_IMAGE = "ethpandaops/dora:latest" DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest" DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest" DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE = ( - "ethpandaops/ethereum-genesis-generator:3.5.0" + "ethpandaops/ethereum-genesis-generator:3.5.1" ) DEFAULT_FLASHBOTS_RELAY_IMAGE = "flashbots/mev-boost-relay:0.29.2a3" DEFAULT_FLASHBOTS_BUILDER_IMAGE = "ethpandaops/reth-rbuilder:develop" From 305485758dd8db64ef6fec0bb996355f4c4b7ede Mon Sep 17 00:00:00 2001 From: parithosh Date: Wed, 18 Dec 2024 17:15:06 +0100 Subject: [PATCH 5/5] updating test --- .../{pectra-devnet-4.yaml.norun => pectra-devnet-5.yaml.norun} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/tests/{pectra-devnet-4.yaml.norun => pectra-devnet-5.yaml.norun} (88%) diff --git a/.github/tests/pectra-devnet-4.yaml.norun b/.github/tests/pectra-devnet-5.yaml.norun similarity index 88% rename from .github/tests/pectra-devnet-4.yaml.norun rename to .github/tests/pectra-devnet-5.yaml.norun index 76f2bb9f2..14da39b62 100644 --- a/.github/tests/pectra-devnet-4.yaml.norun +++ b/.github/tests/pectra-devnet-5.yaml.norun @@ -1,6 +1,6 @@ participants: - el_type: besu - el_image: siladu/besu:24.12-develop-8c5aabe + el_image: ethpandaops/besu:24.12-develop-8c5aabe cl_type: teku cl_image: consensys/teku:develop el_log_level: "DEBUG"