feat: add peerdas-electra-support (#740)

ethpandaops · Aug 15, 2024 · 663e7e6 · 663e7e6
1 parent a19398d
commit 663e7e6
Show file tree

Hide file tree

Showing 39 changed files with 255 additions and 85 deletions.
diff --git a/.github/tests/besu-all.yaml b/.github/tests/besu-all.yaml
@@ -11,4 +11,3 @@ participants:
  cl_type: lodestar
  - el_type: besu
  cl_type: grandine
-additional_services: []
diff --git a/.github/tests/custom-contracts.yaml b/.github/tests/custom-contracts.yaml
@@ -14,4 +14,3 @@ participants:
 network_params:
  network: kurtosis
  additional_preloaded_contracts: '{"0x123463a4B065722E99115D6c222f267d9cABb524": {"balance": "2ETH","code": "0x1234","storage": {}}}'
-additional_services: []
diff --git a/.github/tests/dencun-genesis.yaml b/.github/tests/dencun-genesis.yaml
@@ -13,4 +13,3 @@ participants:
  cl_type: teku
 network_params:
  deneb_fork_epoch: 0
-additional_services: []
diff --git a/.github/tests/disable-peer-scoring.yaml b/.github/tests/disable-peer-scoring.yaml
@@ -11,5 +11,4 @@ participants:
  cl_type: prysm
  - el_type: ethereumjs
  cl_type: teku
-additional_services: []
 disable_peer_scoring: true
diff --git a/.github/tests/ephemery.yaml b/.github/tests/ephemery.yaml
@@ -16,4 +16,3 @@ participants:
  cl_type: grandine
 network_params:
  network: ephemery
-additional_services: []
diff --git a/.github/tests/erigon-all.yaml b/.github/tests/erigon-all.yaml
@@ -11,4 +11,3 @@ participants:
  cl_type: lodestar
  - el_type: erigon
  cl_type: grandine
-additional_services: []
diff --git a/.github/tests/ethereumjs-all.yaml b/.github/tests/ethereumjs-all.yaml
@@ -11,4 +11,3 @@ participants:
  cl_type: lodestar
  - el_type: ethereumjs
  cl_type: grandine
-additional_services: []
diff --git a/.github/tests/geth-all.yaml b/.github/tests/geth-all.yaml
@@ -11,4 +11,3 @@ participants:
  cl_type: lodestar
  - el_type: geth
  cl_type: grandine
-additional_services: []
diff --git a/.github/tests/grandine-all.yaml b/.github/tests/grandine-all.yaml
@@ -11,4 +11,3 @@ participants:
  cl_type: grandine
  - el_type: ethereumjs
  cl_type: grandine
-additional_services: []
diff --git a/.github/tests/lighthouse-all.yaml b/.github/tests/lighthouse-all.yaml
@@ -11,4 +11,3 @@ participants:
  cl_type: lighthouse
  - el_type: ethereumjs
  cl_type: lighthouse
-additional_services: []
diff --git a/.github/tests/lodestar-all.yaml b/.github/tests/lodestar-all.yaml
@@ -11,4 +11,3 @@ participants:
  cl_type: lodestar
  - el_type: ethereumjs
  cl_type: lodestar
-additional_services: []
diff --git a/.github/tests/mev-mock.yaml b/.github/tests/mev-mock.yaml
@@ -3,5 +3,4 @@ participants:
  cl_type: lighthouse
 network_params:
  seconds_per_slot: 3
-additional_services: []
 mev_type: mock
diff --git a/.github/tests/minimal.yaml b/.github/tests/minimal.yaml
@@ -13,5 +13,3 @@ participants:
  cl_type: grandine
 network_params:
  preset: minimal
- seconds_per_slot: 6
-additional_services: []
diff --git a/.github/tests/mix-persistence-k8s.yaml b/.github/tests/mix-persistence-k8s.yaml
@@ -13,5 +13,4 @@ participants:
  cl_type: lodestar
  - el_type: ethereumjs
  cl_type: nimbus
-additional_services: []
 persistent: true
diff --git a/.github/tests/mix-persistence.yaml b/.github/tests/mix-persistence.yaml
@@ -13,5 +13,4 @@ participants:
  cl_type: lighthouse
  - el_type: ethereumjs
  cl_type: nimbus
-additional_services: []
-persistent: true
+persistent: true
diff --git a/.github/tests/mix-public.yaml b/.github/tests/mix-public.yaml
@@ -13,7 +13,6 @@ participants:
  cl_type: teku
  - el_type: ethereumjs
  cl_type: grandine
-additional_services: []
 port_publisher:
  el:
  enabled: true

diff --git a/.github/tests/mix.yaml b/.github/tests/mix.yaml
@@ -13,4 +13,3 @@ participants:
  cl_type: teku
  - el_type: ethereumjs
  cl_type: grandine
-additional_services: []
diff --git a/.github/tests/mixed-cl-vc.yml b/.github/tests/mixed-cl-vc.yml
@@ -7,4 +7,3 @@ participants:
  cl_type: nimbus
  use_separate_vc: true
  vc_type: lighthouse
-additional_services: []
diff --git a/.github/tests/nethermind-all.yaml b/.github/tests/nethermind-all.yaml
@@ -11,4 +11,3 @@ participants:
  cl_type: lodestar
  - el_type: nethermind
  cl_type: grandine
-additional_services: []
diff --git a/.github/tests/nimbus-all.yaml b/.github/tests/nimbus-all.yaml
@@ -11,4 +11,3 @@ participants:
  cl_type: nimbus
  - el_type: ethereumjs
  cl_type: nimbus
-additional_services: []
diff --git a/.github/tests/nimbus-eth1-all.yaml b/.github/tests/nimbus-eth1-all.yaml
@@ -13,4 +13,3 @@ participants:
  cl_type: lodestar
  - el_type: nimbus
  cl_type: grandine
-additional_services: []
diff --git a/.github/tests/pectra-devnet-0.yaml b/.github/tests/pectra-devnet-0.yaml
diff --git a/.github/tests/pectra-devnet-2.yaml b/.github/tests/pectra-devnet-2.yaml
@@ -0,0 +1,60 @@
+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.yaml b/.github/tests/pectra.yaml
@@ -0,0 +1,69 @@
+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
+ - cl_type: nimbus
+ cl_image: ethpandaops/nimbus-eth2:unstable-minimal
+# cl_image: ethpandaops/nimbus-eth2:unstable-c0fc0f4
+ - cl_type: lodestar
+ cl_image: ethpandaops/lodestar:electra-fork-rebasejul30
+ - cl_type: grandine
+ cl_image: ethpandaops/grandine:electra-minimal
+ #cl_image: ethpandaops/grandine:electra-5a2ffe2
+ - cl_type: prysm
+ # cl_image: ethpandaops/prysm-beacon-chain:develop-e0785a8
+ cl_image: ethpandaops/prysm-beacon-chain:develop-minimal
+network_params:
+ electra_fork_epoch: 1
+ min_validator_withdrawability_delay: 1
+ shard_committee_period: 1
+ preset: minimal
+additional_services:
+ - dora
+ - assertoor
+dora_params:
+ image: "ethpandaops/dora:indexer-reimplementation"
+
+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/peerdas-devnet-1.yaml → .github/tests/peerdas-devnet-2.yaml b/.github/tests/peerdas-devnet-1.yaml → .github/tests/peerdas-devnet-2.yaml
@@ -6,5 +6,5 @@ participants:
  - cl_type: teku
  cl_image: ethpandaops/teku:nashatyrev-das
 network_params:
- network: peerdas-devnet-1
+ network: peerdas-devnet-2
 snooper_enabled: true
diff --git a/.github/tests/peerdas-electra.yaml b/.github/tests/peerdas-electra.yaml
@@ -0,0 +1,48 @@
+participants:
+# Supernodes
+ - cl_type: prysm
+ cl_image: ethpandaops/prysm-beacon-chain:peerDAS-minimal
+ cl_extra_params: [--subscribe-all-subnets, --pprof]
+ vc_image: ethpandaops/prysm-validator:develop
+ - cl_type: lighthouse
+ cl_image: ethpandaops/lighthouse:das-devnet-2
+ cl_extra_params: [--subscribe-all-data-column-subnets]
+ - cl_type: teku
+ cl_image: ethpandaops/teku:nashatyrev-das
+ cl_extra_params: [--p2p-subscribe-all-custody-subnets-enabled]
+ - cl_type: nimbus
+ cl_image: ethpandaops/nimbus-eth2:peerdas-p2p-minimal
+ cl_extra_params: [--subscribe-all-subnets=true]
+# Non supernodes
+ - cl_type: prysm
+ cl_image: ethpandaops/prysm-beacon-chain:peerDAS-minimal
+ vc_image: ethpandaops/prysm-validator:develop
+ - cl_type: lighthouse
+ cl_image: ethpandaops/lighthouse:das-devnet-2
+ - cl_type: teku
+ cl_image: ethpandaops/teku:nashatyrev-das
+ - cl_type: nimbus
+ cl_image: ethpandaops/nimbus-eth2:peerdas-p2p-minimal
+ - cl_type: lodestar
+ cl_image: ethpandaops/lodestar:peerDAS
+ cl_extra_params: [--persistNetworkIdentity]
+network_params:
+ electra_fork_epoch: 1
+ eip7594_fork_epoch: 1
+ eip7594_fork_version: "0x50000038"
+ preset: minimal
+snooper_enabled: true
+global_log_level: debug
+additional_services:
+ - dora
+ - goomy_blob
+ - prometheus_grafana
+ - assertoor
+ethereum_metrics_exporter_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/block-proposal-check.yaml" }
+ - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/blob-transactions-test.yaml" }
+ - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/stability-check.yaml" }
diff --git a/.github/tests/peerdas-fork.yaml b/.github/tests/peerdas-fork.yaml
diff --git a/.github/tests/peerdas.yaml b/.github/tests/peerdas.yaml
@@ -0,0 +1,47 @@
+participants:
+# Supernodes
+ - cl_type: prysm
+ cl_image: ethpandaops/prysm-beacon-chain:peerDAS-minimal
+ cl_extra_params: [--subscribe-all-subnets, --pprof]
+ vc_image: ethpandaops/prysm-validator:develop
+ - cl_type: lighthouse
+ cl_image: ethpandaops/lighthouse:das-devnet-2
+ cl_extra_params: [--subscribe-all-data-column-subnets]
+ - cl_type: teku
+ cl_image: ethpandaops/teku:nashatyrev-das
+ cl_extra_params: [--p2p-subscribe-all-custody-subnets-enabled]
+ - cl_type: nimbus
+ cl_image: ethpandaops/nimbus-eth2:peerdas-p2p
+ cl_extra_params: [--subscribe-all-subnets=true]
+# Non supernodes
+ - cl_type: prysm
+ cl_image: ethpandaops/prysm-beacon-chain:peerDAS-minimal
+ vc_image: ethpandaops/prysm-validator:develop
+ - cl_type: lighthouse
+ cl_image: ethpandaops/lighthouse:das-devnet-2
+ - cl_type: teku
+ cl_image: ethpandaops/teku:nashatyrev-das
+ - cl_type: nimbus
+ cl_image: ethpandaops/nimbus-eth2:peerdas-p2p
+ - cl_type: lodestar
+ cl_image: ethpandaops/lodestar:peerDAS
+ cl_extra_params: [--persistNetworkIdentity]
+network_params:
+ eip7594_fork_epoch: 0
+ eip7594_fork_version: "0x50000038"
+ preset: minimal
+snooper_enabled: true
+global_log_level: debug
+additional_services:
+ - dora
+ - goomy_blob
+ - prometheus_grafana
+ - assertoor
+ethereum_metrics_exporter_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/block-proposal-check.yaml" }
+ - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/blob-transactions-test.yaml" }
+ - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/stability-check.yaml" }