refactor(networkconfig): extract beacon parameters from BeaconNetwork interface by nkryuchkov · Pull Request #2145 · ssvlabs/ssv

nkryuchkov · 2025-04-12T02:32:18Z

Part of PRs that will replace #1308

Based on #2144

Depends on ssvlabs/eth2-key-manager#106

Required as a preparation to pull those parameters from the beacon node

codecov · 2025-04-16T01:05:30Z

Codecov Report

Attention: Patch coverage is 48.08687% with 502 lines in your changes missing coverage. Please review.

Project coverage is 49.3%. Comparing base (10a8edb) to head (4d0175a).
Report is 1 commits behind head on stage.

Files with missing lines	Patch %	Lines
beacon/goclient/spec.go	46.3%	98 Missing and 26 partials ⚠️
networkconfig/beacon.go	13.7%	112 Missing and 1 partial ⚠️
cli/generate_config.go	0.0%	64 Missing ⚠️
cli/operator/node.go	0.0%	55 Missing ⚠️
utils/testutils.go	0.0%	29 Missing ⚠️
networkconfig/ssv.go	57.1%	20 Missing and 4 partials ⚠️
beacon/goclient/goclient.go	84.4%	10 Missing and 2 partials ⚠️
operator/validator/controller.go	59.0%	9 Missing ⚠️
beacon/goclient/aggregator.go	0.0%	8 Missing ⚠️
beacon/goclient/sync_committee_contribution.go	0.0%	8 Missing ⚠️
... and 23 more

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

# Conflicts: # network/discovery/util_test.go # networkconfig/config.go # networkconfig/holesky-e2e.go # networkconfig/holesky-stage.go # networkconfig/holesky.go # networkconfig/hoodi-stage.go # networkconfig/hoodi.go # networkconfig/local-testnet.go # networkconfig/mainnet.go # networkconfig/sepolia.go # networkconfig/test-network.go

…act-beacon-params # Conflicts: # cli/operator/node.go # network/discovery/util_test.go # networkconfig/beacon.go # networkconfig/holesky-e2e.go # networkconfig/holesky-stage.go # networkconfig/holesky.go # networkconfig/hoodi-stage.go # networkconfig/hoodi.go # networkconfig/local-testnet.go # networkconfig/mainnet.go # networkconfig/sepolia.go # networkconfig/test-network.go

# Conflicts: # beacon/goclient/attest_test.go # ekm/signer_key_manager_test.go # eth/eventhandler/event_handler_test.go # message/validation/validation_test.go # network/discovery/dv5_service_test.go # network/discovery/util_test.go # networkconfig/beacon.go # networkconfig/config.go # networkconfig/holesky-e2e.go # networkconfig/holesky-stage.go # networkconfig/holesky.go # networkconfig/hoodi-stage.go # networkconfig/hoodi.go # networkconfig/local-testnet.go # networkconfig/mainnet.go # networkconfig/sepolia.go # networkconfig/ssv.go # networkconfig/test-network.go # operator/duties/scheduler_test.go # protocol/v2/blockchain/beacon/client.go

iurii-ssv

LGTM (not sure about this though - #2145 (comment) - maybe somebody else can chime in on that)

Also, spec-alignment pipeline seems to be failing

# Conflicts: # cli/operator/node.go # ekm/eth_key_manager_signer.go # ekm/signer_key_manager_test.go # ekm/signer_storage_test.go # eth/eventhandler/event_handler_test.go # go.mod # go.sum # message/validation/validation.go # message/validation/validation_test.go # migrations/migrations.go # operator/duties/committee.go # operator/duties/sync_committee.go # operator/duties/validatorregistration.go # operator/validator/controller.go # operator/validator/metadata/syncer.go # operator/validator/metadata/syncer_test.go # protocol/v2/ssv/runner/proposer.go # protocol/v2/ssv/runner/runner_signatures.go # protocol/v2/ssv/testing/runner.go # protocol/v2/ssv/value_check.go # ssvsigner/ekm/signer_storage.go

# Conflicts: # beacon/goclient/attest_test.go # beacon/goclient/current_fork_test.go # beacon/goclient/events_test.go # beacon/goclient/genesis_test.go # beacon/goclient/goclient.go # beacon/goclient/goclient_test.go # beacon/goclient/options.go # beacon/goclient/signing_test.go # beacon/goclient/spec_test.go # cli/operator/node.go # message/validation/validation.go # message/validation/validation_test.go # operator/duties/scheduler.go # operator/fee_recipient/controller_test.go # protocol/v2/blockchain/beacon/client.go # protocol/v2/ssv/runner/runner_signatures.go # protocol/v2/ssv/runner/runner_validations.go # protocol/v2/ssv/runner/sync_committee_aggregator.go

# Conflicts: # operator/validator/metadata/syncer_test.go

…de (#2153) * beacon/goclient: get beacon config from beacon node * use beacon config obtained from beacon node * log config as JSON * delete a comment * use Stringer to log node * guard beacon config reads with mutex * add a timeout log * delete hardcoded beacon configs * Revert "delete hardcoded beacon configs" This reverts commit c2e2f8f. * fix issues after merging * code review comments * unexport supportedSSVConfigs * fix a context bug * pass network config name * feat(networkconfig): CLI for custom SSV config generation (#2156) * networkconfig: CLI for custom SSV config generation * implement JSON marshaling and YAML marshaling/unmarshaling * remove TotalEthereumValidators * simplify marshaling/unmarshaling logic * fix markdown formatting * use yaml@v3 * add tests * simplify unmarshaling * fix linter * add missing fields to LocalTestnet

# Conflicts: # cli/operator/node.go # go.mod # go.sum # protocol/v2/qbft/roundtimer/timer_test.go # ssvsigner/go.mod # ssvsigner/go.sum

* beacon/goclient: get beacon config from beacon node * use beacon config obtained from beacon node * log config as JSON * networkconfig: CLI for custom SSV config generation * implement JSON marshaling and YAML marshaling/unmarshaling * remove TotalEthereumValidators * simplify marshaling/unmarshaling logic * fix markdown formatting * use yaml@v3 * add tests * simplify unmarshaling * delete a comment * use Stringer to log node * guard beacon config reads with mutex * add a timeout log * delete hardcoded beacon configs * Revert "delete hardcoded beacon configs" This reverts commit c2e2f8f. * networkconfig: make hardcoded values configurable * fix issues after merging * code review comments * fix issues after merging * delete outer metrics for genesisForClient * rewrite modulo calculation * code review comments * unexport supportedSSVConfigs * revert the modulo calculation * add EpochDuration mock * G115 * fill missing fields in configs * add a comment about eth spec * fix error text * use genesis validators root from config in computeVoluntaryExitDomain * fix linter * fix a typo * remove redundant comments * fix a context bug * fix issues after merging * pass network config name

* use SSV/Beacon configs instead of NetworkConfig where possible * fix linter * fix a comment * fix issues after merging

oleg-ssvlabs

Great job!
Left few minor comments

…#2178) * beacon/goclient: get beacon config from beacon node * use beacon config obtained from beacon node * log config as JSON * networkconfig: CLI for custom SSV config generation * implement JSON marshaling and YAML marshaling/unmarshaling * remove TotalEthereumValidators * simplify marshaling/unmarshaling logic * fix markdown formatting * use yaml@v3 * add tests * simplify unmarshaling * delete a comment * use Stringer to log node * guard beacon config reads with mutex * add a timeout log * delete hardcoded beacon configs * Revert "delete hardcoded beacon configs" This reverts commit c2e2f8f. * networkconfig: make hardcoded values configurable * fix issues after merging * code review comments * fix issues after merging * delete outer metrics for genesisForClient * rewrite modulo calculation * code review comments * unexport supportedSSVConfigs * revert the modulo calculation * add EpochDuration mock * G115 * fill missing fields in configs * add a comment about eth spec * fix error text * use genesis validators root from config in computeVoluntaryExitDomain * beacon,networkconfig: move forks from beacon to networkconfig * get rid of using Genesis method * use ForkAtEpoch instead of DataVersion * generate mocks * fix linter * fix beacon tests * beacon: delete ForkAtEpoch * fix ekm tests * update go.mod * fix some TODOs * fix linter * fix a typo * remove redundant comments * remove Spec method * delete a comment * uncomment config print * fix a context bug * fix issues after merging * pass network config name * update go.mod * fix issues after merging

* beacon/goclient: get beacon config from beacon node * use beacon config obtained from beacon node * log config as JSON * networkconfig: CLI for custom SSV config generation * implement JSON marshaling and YAML marshaling/unmarshaling * remove TotalEthereumValidators * simplify marshaling/unmarshaling logic * fix markdown formatting * use yaml@v3 * add tests * simplify unmarshaling * delete a comment * use Stringer to log node * guard beacon config reads with mutex * add a timeout log * delete hardcoded beacon configs * Revert "delete hardcoded beacon configs" This reverts commit c2e2f8f. * networkconfig: make hardcoded values configurable * fix issues after merging * code review comments * fix issues after merging * delete outer metrics for genesisForClient * rewrite modulo calculation * code review comments * unexport supportedSSVConfigs * revert the modulo calculation * add EpochDuration mock * G115 * fill missing fields in configs * add a comment about eth spec * fix error text * use genesis validators root from config in computeVoluntaryExitDomain * beacon,networkconfig: move forks from beacon to networkconfig * get rid of using Genesis method * use ForkAtEpoch instead of DataVersion * generate mocks * fix linter * fix beacon tests * beacon: delete ForkAtEpoch * fix ekm tests * update go.mod * fix some TODOs * networkconfig: delete mainnet beacon config * networkconfig: delete rest of configs * replace TestRealNetwork with TestNetwork * fix linter * fix a typo * remove redundant comments * remove Spec method * delete a comment * uncomment config print * fix a context bug * fix issues after merging * delete TestRealNetwork * pass network config name * update go.mod * fix issues after merging * fix issues after merging

… interface (#2145) * networkconfig: split beacon and ssv configs * move most parameters outside of BeaconNetwork interface * get rid of BeaconNetwork interface * some leftovers * fix linter * fix message validation tests * fix linter again * leftovers after merging * fix issues after merging * fix network name bug * code review comments * fix issues after merging * update go.mod * fix ekm tests * remove unused import * update go.mod * fix issues after merging * format/imports * revert preparationSlots type change * use uint64 for amount of slots and epochs * use github.com/ssvlabs/eth2-key-manager@v1.5.5 * spec-alignment * feat(networkconfig,beacon/goclient): get beacon config from beacon node (#2153) * beacon/goclient: get beacon config from beacon node * use beacon config obtained from beacon node * log config as JSON * delete a comment * use Stringer to log node * guard beacon config reads with mutex * add a timeout log * delete hardcoded beacon configs * Revert "delete hardcoded beacon configs" This reverts commit c2e2f8f. * fix issues after merging * code review comments * unexport supportedSSVConfigs * fix a context bug * pass network config name * feat(networkconfig): CLI for custom SSV config generation (#2156) * networkconfig: CLI for custom SSV config generation * implement JSON marshaling and YAML marshaling/unmarshaling * remove TotalEthereumValidators * simplify marshaling/unmarshaling logic * fix markdown formatting * use yaml@v3 * add tests * simplify unmarshaling * fix linter * add missing fields to LocalTestnet * update go.mod * networkconfig: make hardcoded values configurable (#2164) * beacon/goclient: get beacon config from beacon node * use beacon config obtained from beacon node * log config as JSON * networkconfig: CLI for custom SSV config generation * implement JSON marshaling and YAML marshaling/unmarshaling * remove TotalEthereumValidators * simplify marshaling/unmarshaling logic * fix markdown formatting * use yaml@v3 * add tests * simplify unmarshaling * delete a comment * use Stringer to log node * guard beacon config reads with mutex * add a timeout log * delete hardcoded beacon configs * Revert "delete hardcoded beacon configs" This reverts commit c2e2f8f. * networkconfig: make hardcoded values configurable * fix issues after merging * code review comments * fix issues after merging * delete outer metrics for genesisForClient * rewrite modulo calculation * code review comments * unexport supportedSSVConfigs * revert the modulo calculation * add EpochDuration mock * G115 * fill missing fields in configs * add a comment about eth spec * fix error text * use genesis validators root from config in computeVoluntaryExitDomain * fix linter * fix a typo * remove redundant comments * fix a context bug * fix issues after merging * pass network config name * networkconfig: narrow config usage (#2172) * use SSV/Beacon configs instead of NetworkConfig where possible * fix linter * fix a comment * fix issues after merging * fix issues after merging * beacon,networkconfig: move fork handling from beacon to networkconfig (#2178) * beacon/goclient: get beacon config from beacon node * use beacon config obtained from beacon node * log config as JSON * networkconfig: CLI for custom SSV config generation * implement JSON marshaling and YAML marshaling/unmarshaling * remove TotalEthereumValidators * simplify marshaling/unmarshaling logic * fix markdown formatting * use yaml@v3 * add tests * simplify unmarshaling * delete a comment * use Stringer to log node * guard beacon config reads with mutex * add a timeout log * delete hardcoded beacon configs * Revert "delete hardcoded beacon configs" This reverts commit c2e2f8f. * networkconfig: make hardcoded values configurable * fix issues after merging * code review comments * fix issues after merging * delete outer metrics for genesisForClient * rewrite modulo calculation * code review comments * unexport supportedSSVConfigs * revert the modulo calculation * add EpochDuration mock * G115 * fill missing fields in configs * add a comment about eth spec * fix error text * use genesis validators root from config in computeVoluntaryExitDomain * beacon,networkconfig: move forks from beacon to networkconfig * get rid of using Genesis method * use ForkAtEpoch instead of DataVersion * generate mocks * fix linter * fix beacon tests * beacon: delete ForkAtEpoch * fix ekm tests * update go.mod * fix some TODOs * fix linter * fix a typo * remove redundant comments * remove Spec method * delete a comment * uncomment config print * fix a context bug * fix issues after merging * pass network config name * update go.mod * fix issues after merging * networkconfig: delete hardcoded beacon configs (#2183) * beacon/goclient: get beacon config from beacon node * use beacon config obtained from beacon node * log config as JSON * networkconfig: CLI for custom SSV config generation * implement JSON marshaling and YAML marshaling/unmarshaling * remove TotalEthereumValidators * simplify marshaling/unmarshaling logic * fix markdown formatting * use yaml@v3 * add tests * simplify unmarshaling * delete a comment * use Stringer to log node * guard beacon config reads with mutex * add a timeout log * delete hardcoded beacon configs * Revert "delete hardcoded beacon configs" This reverts commit c2e2f8f. * networkconfig: make hardcoded values configurable * fix issues after merging * code review comments * fix issues after merging * delete outer metrics for genesisForClient * rewrite modulo calculation * code review comments * unexport supportedSSVConfigs * revert the modulo calculation * add EpochDuration mock * G115 * fill missing fields in configs * add a comment about eth spec * fix error text * use genesis validators root from config in computeVoluntaryExitDomain * beacon,networkconfig: move forks from beacon to networkconfig * get rid of using Genesis method * use ForkAtEpoch instead of DataVersion * generate mocks * fix linter * fix beacon tests * beacon: delete ForkAtEpoch * fix ekm tests * update go.mod * fix some TODOs * networkconfig: delete mainnet beacon config * networkconfig: delete rest of configs * replace TestRealNetwork with TestNetwork * fix linter * fix a typo * remove redundant comments * remove Spec method * delete a comment * uncomment config print * fix a context bug * fix issues after merging * delete TestRealNetwork * pass network config name * update go.mod * fix issues after merging * fix issues after merging * rename BeaconName to NetworkName * refactor getting spec parameters * update go.mod * fix type assertion * fix spec align --------- Co-authored-by: y0sher <lyosher@gmail.com> Co-authored-by: Matus Kysel <matus@ssvlabs.io>

nkryuchkov added 2 commits April 11, 2025 22:35

networkconfig: split beacon and ssv configs

ca8d35a

move most parameters outside of BeaconNetwork interface

4a7b18f

nkryuchkov marked this pull request as draft April 12, 2025 02:32

nkryuchkov changed the base branch from stage to networkconfig-split-ssv-beacon April 12, 2025 02:33

nkryuchkov added 2 commits April 15, 2025 21:31

get rid of BeaconNetwork interface

5847a35

some leftovers

1f30b56

nkryuchkov marked this pull request as ready for review April 16, 2025 00:38

nkryuchkov added 3 commits April 15, 2025 21:44

fix linter

e94b394

fix message validation tests

927b30f

fix linter again

59d18d5

nkryuchkov mentioned this pull request Apr 16, 2025

feat(networkconfig,beacon/goclient): get beacon config from beacon node #2153

Merged

nkryuchkov added 3 commits April 16, 2025 12:34

leftovers after merging

ee81f74

nkryuchkov requested review from MatusKysel, iurii-ssv, kchojn and oleg-ssvlabs April 16, 2025 15:45

iurii-ssv reviewed Apr 17, 2025

View reviewed changes

nkryuchkov changed the title ~~networkconfig: extract beacon parameters from BeaconNetwork interface~~ refactor(networkconfig): extract beacon parameters from BeaconNetwork interface Apr 17, 2025

Base automatically changed from networkconfig-split-ssv-beacon to stage April 17, 2025 13:57

nkryuchkov added 2 commits April 17, 2025 11:26

fix issues after merging

5d86317

iurii-ssv mentioned this pull request Apr 17, 2025

Simplify Beacon interface #2160

Closed

fix network name bug

4f72bd9

nkryuchkov requested a review from iurii-ssv April 17, 2025 17:24

code review comments

ccbb20e

iurii-ssv approved these changes Apr 18, 2025

View reviewed changes

nkryuchkov added 6 commits May 20, 2025 18:22

format/imports

ffd78bf

revert preparationSlots type change

46eb61c

use uint64 for amount of slots and epochs

6adb4d5

Merge branch 'stage' into networkconfig-extract-beacon-params

86b4d4b

# Conflicts: # operator/validator/metadata/syncer_test.go

use github.com/ssvlabs/eth2-key-manager@v1.5.5

7274f17

y0sher approved these changes May 26, 2025

View reviewed changes

y0sher and others added 5 commits May 26, 2025 18:47

spec-alignment

b244241

Merge branch 'stage' into networkconfig-extract-beacon-params

3c9b3b6

Merge branch 'stage' into networkconfig-extract-beacon-params

4546486

# Conflicts: # cli/operator/node.go # go.mod # go.sum # protocol/v2/qbft/roundtimer/timer_test.go # ssvsigner/go.mod # ssvsigner/go.sum

update go.mod

7ce717a

MatusKysel approved these changes May 27, 2025

View reviewed changes

nkryuchkov added 3 commits May 27, 2025 16:04

networkconfig: narrow config usage (#2172)

6bfa93b

* use SSV/Beacon configs instead of NetworkConfig where possible * fix linter * fix a comment * fix issues after merging

fix issues after merging

411a3a1

oleg-ssvlabs reviewed May 27, 2025

View reviewed changes

nkryuchkov added 6 commits May 27, 2025 17:22

rename BeaconName to NetworkName

00af14d

refactor getting spec parameters

8fc6fde

update go.mod

4810da8

fix type assertion

2d09e23

oleg-ssvlabs approved these changes May 28, 2025

View reviewed changes

fix spec align

4d0175a

iurii-ssv approved these changes May 28, 2025

View reviewed changes

MatusKysel merged commit 8b4fb83 into stage May 28, 2025
5 checks passed

MatusKysel deleted the networkconfig-extract-beacon-params branch May 28, 2025 08:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(networkconfig): extract beacon parameters from BeaconNetwork interface#2145

refactor(networkconfig): extract beacon parameters from BeaconNetwork interface#2145
MatusKysel merged 46 commits intostagefrom
networkconfig-extract-beacon-params

nkryuchkov commented Apr 12, 2025 •

edited

Loading

Uh oh!

codecov Bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

iurii-ssv left a comment

Uh oh!

oleg-ssvlabs left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

nkryuchkov commented Apr 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

iurii-ssv left a comment

Choose a reason for hiding this comment

Uh oh!

oleg-ssvlabs left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

nkryuchkov commented Apr 12, 2025 •

edited

Loading

codecov Bot commented Apr 16, 2025 •

edited

Loading