From 04b9ece58321094f35066663e80937a1a2234ca0 Mon Sep 17 00:00:00 2001 From: Rafael Matias Date: Wed, 22 Oct 2025 13:21:35 +0200 Subject: [PATCH 1/5] chore(ci): user network id for sync tests --- .github/workflows/syncoor-devnet-2.yaml | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/syncoor-devnet-2.yaml b/.github/workflows/syncoor-devnet-2.yaml index def9e1d..0361908 100644 --- a/.github/workflows/syncoor-devnet-2.yaml +++ b/.github/workflows/syncoor-devnet-2.yaml @@ -23,7 +23,7 @@ on: el-image: description: 'Execution layer client images as JSON (e.g., {"geth": "ethereum/client-go:latest", "besu": "hyperledger/besu:latest"})' required: false - default: '{"geth": "ethpandaops/geth:performance", "besu": "ethpandaops/besu:performance", "nethermind": "ethpandaops/nethermind:performance", "erigon": "ethpandaops/erigon:performance", "reth": "ethpandaops/reth:main"}' + default: '{"geth": "ethpandaops/geth:performance", "besu": "ethpandaops/besu:performance", "nethermind": "ethpandaops/nethermind:performance", "erigon": "ethpandaops/erigon:performance", "reth": "ethpandaops/reth:performance"}' type: string cl-image: description: 'Consensus layer client images as JSON (e.g., {"lighthouse": "sigp/lighthouse:latest", "teku": "consensys/teku:latest"})' @@ -150,30 +150,20 @@ jobs: el-extra-args: >- ${{ (matrix.el-client == 'besu') && '[ - "--required-block=23115201=0x88b0d56cc14c5232cdf6238c7252ca953e505f2a44ee60374f2bafb18bf067bf" + "--network-id=12159" ]' || (matrix.el-client == 'erigon') && '[ "--prune.mode=full", - "--nodiscover" + "--networkid=12159" ]' || (matrix.el-client == 'geth') && '[ - "--eth.requiredblocks=23115201=0x88b0d56cc14c5232cdf6238c7252ca953e505f2a44ee60374f2bafb18bf067bf" + "--networkid=12159" ]' || (matrix.el-client == 'nethermind') && '[ - "--Init.DiscoveryEnabled=true", - "--Sync.PivotHash=0x77811bb477a5d40cc40b694fa7e6a3482772f2d045a91f725fe40b9215ef51b2", - "--Sync.PivotNumber=23142646", - "--Sync.PivotTotalDifficulty=58750003716598352816469", - "--Sync.FastSync=true", - "--Sync.SnapSync=true", - "--Network.Bootnodes=enode://3ba5f46aa1a9d863de4ce5ff67ec46704c43b2a1d5100e272dbfec5e56b350113018d3e67c400f09db60d4ec55df025bd209802c67826717a33a48acbe13b305@157.180.14.226:30303", - "--Network.StaticPeers=enode://3ba5f46aa1a9d863de4ce5ff67ec46704c43b2a1d5100e272dbfec5e56b350113018d3e67c400f09db60d4ec55df025bd209802c67826717a33a48acbe13b305@157.180.14.226:30303", - "--Init.StaticNodesPath=/data/static-nodes.json", - "--Init.TrustedNodesPath=/data/trusted-nodes.json" + "--Init.NetworkId=12159" ]' || (matrix.el-client == 'reth') && '[ - "--trusted-only", - "--required-block-hashes=0x88b0d56cc14c5232cdf6238c7252ca953e505f2a44ee60374f2bafb18bf067bf" + "--network-id=12159" ]' || '' }} From fab2bf368ecb2a7ee1bd04bf129edd252b52b1f8 Mon Sep 17 00:00:00 2001 From: Rafael Matias Date: Wed, 22 Oct 2025 13:37:41 +0200 Subject: [PATCH 2/5] use default package --- .github/workflows/syncoor-devnet-2.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/syncoor-devnet-2.yaml b/.github/workflows/syncoor-devnet-2.yaml index 0361908..e7df9db 100644 --- a/.github/workflows/syncoor-devnet-2.yaml +++ b/.github/workflows/syncoor-devnet-2.yaml @@ -134,12 +134,7 @@ jobs: cl-client: ${{ matrix.cl-client }} el-image: ${{ steps.parse-images.outputs.el-image }} cl-image: ${{ steps.parse-images.outputs.cl-image }} - ethereum-package: >- - ${{ - matrix.el-client == 'erigon' && 'github.com/ethpandaops/ethereum-package@static-nodes-workaround' || - matrix.el-client == 'reth' && 'github.com/ethpandaops/ethereum-package@static-nodes-workaround' || - 'github.com/ethpandaops/ethereum-package@main' - }} + ethereum-package: github.com/ethpandaops/ethereum-package@main el-env-vars: >- ${{ (matrix.el-client == 'erigon') && '[ From ed13ce738f66af643a8a6247aa4763b8f177fbe8 Mon Sep 17 00:00:00 2001 From: Rafael Matias Date: Wed, 22 Oct 2025 13:40:30 +0200 Subject: [PATCH 3/5] update nethermind image --- .github/workflows/syncoor-devnet-2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/syncoor-devnet-2.yaml b/.github/workflows/syncoor-devnet-2.yaml index e7df9db..c78f45e 100644 --- a/.github/workflows/syncoor-devnet-2.yaml +++ b/.github/workflows/syncoor-devnet-2.yaml @@ -23,7 +23,7 @@ on: el-image: description: 'Execution layer client images as JSON (e.g., {"geth": "ethereum/client-go:latest", "besu": "hyperledger/besu:latest"})' required: false - default: '{"geth": "ethpandaops/geth:performance", "besu": "ethpandaops/besu:performance", "nethermind": "ethpandaops/nethermind:performance", "erigon": "ethpandaops/erigon:performance", "reth": "ethpandaops/reth:performance"}' + default: '{"geth": "ethpandaops/geth:performance", "besu": "ethpandaops/besu:performance", "nethermind": "nethermindeth/nethermind:performance", "erigon": "ethpandaops/erigon:performance", "reth": "ethpandaops/reth:performance"}' type: string cl-image: description: 'Consensus layer client images as JSON (e.g., {"lighthouse": "sigp/lighthouse:latest", "teku": "consensys/teku:latest"})' From 89ba40806076743d092c8ce01fd655f32c486005 Mon Sep 17 00:00:00 2001 From: Rafael Matias Date: Wed, 22 Oct 2025 13:43:06 +0200 Subject: [PATCH 4/5] add reth full flag --- .github/workflows/syncoor-devnet-2.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/syncoor-devnet-2.yaml b/.github/workflows/syncoor-devnet-2.yaml index c78f45e..775ebcf 100644 --- a/.github/workflows/syncoor-devnet-2.yaml +++ b/.github/workflows/syncoor-devnet-2.yaml @@ -158,6 +158,7 @@ jobs: "--Init.NetworkId=12159" ]' || (matrix.el-client == 'reth') && '[ + "--full", "--network-id=12159" ]' || '' From 97826c192ad58a56877515a9d12a0242f8d2da17 Mon Sep 17 00:00:00 2001 From: Rafael Matias Date: Wed, 22 Oct 2025 13:45:21 +0200 Subject: [PATCH 5/5] more readable img json --- .github/workflows/syncoor-devnet-2.yaml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/syncoor-devnet-2.yaml b/.github/workflows/syncoor-devnet-2.yaml index 775ebcf..347234f 100644 --- a/.github/workflows/syncoor-devnet-2.yaml +++ b/.github/workflows/syncoor-devnet-2.yaml @@ -23,12 +23,27 @@ on: el-image: description: 'Execution layer client images as JSON (e.g., {"geth": "ethereum/client-go:latest", "besu": "hyperledger/besu:latest"})' required: false - default: '{"geth": "ethpandaops/geth:performance", "besu": "ethpandaops/besu:performance", "nethermind": "nethermindeth/nethermind:performance", "erigon": "ethpandaops/erigon:performance", "reth": "ethpandaops/reth:performance"}' + default: >- + { + "geth": "ethpandaops/geth:performance", + "besu": "ethpandaops/besu:performance", + "nethermind": "nethermindeth/nethermind:performance", + "erigon": "ethpandaops/erigon:performance", + "reth": "ethpandaops/reth:performance" + } type: string cl-image: description: 'Consensus layer client images as JSON (e.g., {"lighthouse": "sigp/lighthouse:latest", "teku": "consensys/teku:latest"})' required: false - default: '{"lighthouse": "ethpandaops/lighthouse:unstable", "teku": "ethpandaops/teku:master", "prysm": "ethpandaops/prysm-beacon-chain:develop", "nimbus": "ethpandaops/nimbus-eth2:unstable", "lodestar": "ethpandaops/lodestar:latest", "grandine": "ethpandaops/grandine:latest"}' + default: >- + { + "lighthouse": "ethpandaops/lighthouse:unstable", + "teku": "ethpandaops/teku:master", + "prysm": "ethpandaops/prysm-beacon-chain:develop", + "nimbus": "ethpandaops/nimbus-eth2:unstable", + "lodestar": "ethpandaops/lodestar:latest", + "grandine": "ethpandaops/grandine:latest" + } type: string log-level-cl: description: 'Log level for consensus layer clients (debug, info, warn, error)'