networkconfig: make hardcoded values configurable by nkryuchkov · Pull Request #2164 · ssvlabs/ssv

nkryuchkov · 2025-04-19T01:37:31Z

Part of PRs that will replace #1308

Depends on #2156

Required as a preparation for the local testnet

…-from-beacon-node

…-from-beacon-node # Conflicts: # beacon/goclient/attest_test.go # beacon/goclient/events_test.go # beacon/goclient/goclient.go # beacon/goclient/goclient_test.go # cli/operator/node.go # networkconfig/beacon.go

This reverts commit c2e2f8f.

…dcoded-configurable # Conflicts: # networkconfig/ssv.go

iurii-ssv

LGTM, left minor suggestions

iurii-ssv · 2025-04-22T12:08:08Z

+		if epochsPerSyncCommitteePeriodDecoded, ok := epochsPerSyncCommitteePeriodRaw.(uint64); ok {
+			epochsPerSyncCommitteePeriod = phase0.Epoch(epochsPerSyncCommitteePeriodDecoded)
+		} else {
+			gc.log.Warn("epochs per sync committee not known by chain, using default value",


I'm not sure if "not known by chain" phrasing is best, maybe something like "isn't provided by Beacon node" (or similar) would better describe what it actually entails ?

iurii-ssv · 2025-04-22T12:27:30Z

 		Bootnodes: []string{
 			"enr:-Li4QFIQzamdvTxGJhvcXG_DFmCeyggSffDnllY5DiU47pd_K_1MRnSaJimWtfKJ-MD46jUX9TwgW5Jqe0t4pH41RYWGAYuFnlyth2F0dG5ldHOIAAAAAAAAAACEZXRoMpD1pf1CAAAAAP__________gmlkgnY0gmlwhCLdu_SJc2VjcDI1NmsxoQN4v-N9zFYwEqzGPBBX37q24QPFvAVUtokIo1fblIsmTIN0Y3CCE4uDdWRwgg-j",
 		},
+		TotalEthereumValidators: 10, // just some random number


Maybe this value (for testnet) should be high enough so we never accidentally reach the message-limits derived from it while testing something with local testnet (unless ofc we are testing those message-limits specifically)

otherwise we might encounter some hard-to-debug failures just because of that ?

…-from-beacon-node # Conflicts: # beacon/goclient/goclient.go # beacon/goclient/spec.go # cli/operator/node.go

…rate-ssv

…dcoded-configurable # Conflicts: # beacon/goclient/aggregator.go # beacon/goclient/spec.go # beacon/goclient/sync_committee_contribution.go

…dcoded-configurable

oleg-ssvlabs

great job!

Copilot

Pull Request Overview

This PR refactors the network configuration to replace various hardcoded values with configurable parameters, preparing the project for local testnet deployment. Key changes include using externally defined beacon configurations, updating peer scoring and topic parameters to use dynamic network values, and revising mock and client code to incorporate the new configurable values.

Reviewed Changes

Copilot reviewed 37 out of 37 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
networkconfig/holesky-e2e.go	Updated beacon and SSV configuration to use dynamic parameters.
networkconfig/beacon_mock.go	Renamed and updated mock methods for beacon configuration.
networkconfig/beacon.go	Added new getters (e.g. EpochDuration, IntervalDuration) to BeaconConfig.
network/topics/*	Updated topic options and scoring parameters to use network configuration.
beacon/goclient/*	Refactored sync committee, spec, signing, and aggregator code to reference new config values.
message/validation/*	Revised validation logic to use configurable epoch duration.

Comments suppressed due to low confidence (1)

networkconfig/beacon_mock.go:67

[nitpick] The renaming of the mock method from 'EpochsPerSyncCommitteePeriod' to 'EpochStartTime' may cause confusion; please ensure these changes are fully consistent with the corresponding interface methods in beacon.go.

func (mr *MockBeaconMockRecorder) EpochStartTime(epoch any) *gomock.Call {

…-from-beacon-node

…-from-beacon-node # Conflicts: # beacon/goclient/attest_test.go # beacon/goclient/events_test.go # beacon/goclient/goclient.go # beacon/goclient/goclient_test.go # beacon/goclient/validator.go # cli/bootnode/boot_node.go # cli/operator/node.go # exporter/api/query_handlers_test.go # protocol/v2/blockchain/beacon/client.go # utils/boot_node/node.go

…rate-ssv # Conflicts: # 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

…rate-ssv

…dcoded-configurable # Conflicts: # beacon/goclient/aggregator.go # beacon/goclient/spec.go # beacon/goclient/sync_committee_contribution.go # message/validation/validation.go # networkconfig/beacon.go # networkconfig/beacon_mock.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/network_mock.go # networkconfig/sepolia.go # networkconfig/test-network.go # operator/duties/committee_test.go # operator/duties/scheduler.go # operator/duties/scheduler_test.go # operator/duties/sync_committee.go # operator/duties/sync_committee_test.go

…-from-beacon-node

…rate-ssv

…dcoded-configurable

…-make-hardcoded-configurable # Conflicts: # beacon/goclient/aggregator.go # beacon/goclient/spec.go # beacon/goclient/sync_committee_contribution.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/ssv.go # networkconfig/test-network.go

… 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 21 commits April 15, 2025 22:39

beacon/goclient: get beacon config from beacon node

fca0876

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

5253cca

…-from-beacon-node

use beacon config obtained from beacon node

c3f3527

log config as JSON

e57ef03

networkconfig: CLI for custom SSV config generation

3cdda27

implement JSON marshaling and YAML marshaling/unmarshaling

17eb427

remove TotalEthereumValidators

cf5db78

simplify marshaling/unmarshaling logic

72f4d8d

fix markdown formatting

1337765

use yaml@v3

e226819

add tests

b91c135

simplify unmarshaling

a286f15

delete a comment

65acd9b

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

7dd8ea4

…-from-beacon-node # Conflicts: # beacon/goclient/attest_test.go # beacon/goclient/events_test.go # beacon/goclient/goclient.go # beacon/goclient/goclient_test.go # cli/operator/node.go # networkconfig/beacon.go

use Stringer to log node

d5dea5a

guard beacon config reads with mutex

4fc30f2

add a timeout log

c04d2b9

delete hardcoded beacon configs

c2e2f8f

Revert "delete hardcoded beacon configs"

be8fbb7

This reverts commit c2e2f8f.

networkconfig: make hardcoded values configurable

b43d3e5

Merge branch 'networkconfig-generate-ssv' into networkconfig-make-har…

ae1a6cb

…dcoded-configurable # Conflicts: # networkconfig/ssv.go

iurii-ssv approved these changes Apr 22, 2025

View reviewed changes

nkryuchkov added 8 commits April 23, 2025 21:10

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

b1d22f0

…-from-beacon-node # Conflicts: # beacon/goclient/goclient.go # beacon/goclient/spec.go # cli/operator/node.go

fix issues after merging

e8d1fa2

code review comments

301fe46

Merge branch 'networkconfig-from-beacon-node' into networkconfig-gene…

c93cc43

…rate-ssv

Merge branch 'networkconfig-generate-ssv' into networkconfig-make-har…

7be669a

…dcoded-configurable # Conflicts: # beacon/goclient/aggregator.go # beacon/goclient/spec.go # beacon/goclient/sync_committee_contribution.go

fix issues after merging

ebde306

delete outer metrics for genesisForClient

bec420c

rewrite modulo calculation

d1fd692

nkryuchkov mentioned this pull request Apr 29, 2025

feat(network/config): pass custom ssv config & get beacon config from node & remove hardcoded network values #1308

Closed

nkryuchkov added 2 commits April 30, 2025 10:29

fix linter

144e380

Merge branch 'networkconfig-generate-ssv' into networkconfig-make-har…

95279d0

…dcoded-configurable

oleg-ssvlabs reviewed May 8, 2025

View reviewed changes

Comment thread beacon/goclient/spec.go

Comment thread beacon/goclient/spec.go

Comment thread beacon/goclient/sync_committee_contribution.go Outdated

MatusKysel requested a review from Copilot May 9, 2025 06:37

Copilot AI reviewed May 9, 2025

View reviewed changes

Comment thread network/topics/params/peer_score.go Outdated

Comment thread beacon/goclient/sync_committee_contribution.go Outdated

MatusKysel approved these changes May 9, 2025

View reviewed changes

nkryuchkov added 2 commits May 12, 2025 14:34

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

a04d173

…-from-beacon-node

fix a typo

5183f8b

nkryuchkov requested a review from y0sher May 12, 2025 18:30

remove redundant comments

8b4d726

oleg-ssvlabs approved these changes May 15, 2025

View reviewed changes

nkryuchkov added 10 commits May 21, 2025 11:01

fix a context bug

3ec364e

Merge branch 'networkconfig-from-beacon-node' into networkconfig-gene…

180db70

…rate-ssv

fix issues after merging

5478ec1

pass network config name

f790d99

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

ae9dde4

…-from-beacon-node

Merge branch 'networkconfig-from-beacon-node' into networkconfig-gene…

6d720fe

…rate-ssv

Merge branch 'networkconfig-generate-ssv' into networkconfig-make-har…

1eaef3d

…dcoded-configurable

Base automatically changed from networkconfig-generate-ssv to networkconfig-from-beacon-node May 27, 2025 13:02

Base automatically changed from networkconfig-from-beacon-node to networkconfig-extract-beacon-params May 27, 2025 13:12

MatusKysel merged commit 21e346c into networkconfig-extract-beacon-params May 27, 2025
7 checks passed

MatusKysel deleted the networkconfig-make-hardcoded-configurable branch May 27, 2025 14:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

networkconfig: make hardcoded values configurable#2164

networkconfig: make hardcoded values configurable#2164
MatusKysel merged 57 commits into
networkconfig-extract-beacon-paramsfrom
networkconfig-make-hardcoded-configurable

nkryuchkov commented Apr 19, 2025

Uh oh!

iurii-ssv left a comment

Uh oh!

iurii-ssv Apr 22, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

iurii-ssv Apr 22, 2025

Uh oh!

nkryuchkov Apr 24, 2025

Uh oh!

oleg-ssvlabs left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

nkryuchkov commented Apr 19, 2025

Uh oh!

iurii-ssv left a comment

Choose a reason for hiding this comment

Uh oh!

iurii-ssv Apr 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

iurii-ssv Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

nkryuchkov Apr 24, 2025

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!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

iurii-ssv Apr 22, 2025 •

edited

Loading