Generators set by alexeykiselev · Pull Request #2055 · wavesplatform/gowaves

alexeykiselev · 2026-04-09T08:31:42Z

No description provided.

Test added.

Generators balances legacy state hash calculation moved to the entity also. Test updated.

…rs set functions. State API updated.

…s storage. Type of endorser index changed to uint32 for convenience. Type EndorseBlock renamed to BlockEndorsement. Unused or used in tests only functions of commitments removed. Mocks regenerated, tests updated.

…of endorsement. Refactored some BLS functions to hide Circl BLS signature.

Removed duplicated code of function LastFinalizedHeight and related. Fixed height issue of generators set initialization. All block finalization checks moved to processBlockFinalization function of finalizer structure. Function calculateLastFinalazedHeight moved to finality structure. Function Validate added to FinalizationVoting structure, it performs basic checks of the structure without accessing the state. Integration test IsolatedFinalitySuite reimplemented to support miner's commitment to generation.

… balance of generators. Checks on sizes of conflicting and normal endorsements added. Duplicated endorsement cryptographic message serialization functions removed. Check on block generator absence in endorsements added. Addition of block generator balance to total endorsements balance added. Interface function CalculateVotingFinalization removed as unused.

Copilot

Pull request overview

This PR refactors deterministic finality around a new “generators set” abstraction, updates endorsement/finalization types, and rewires state/node APIs to consume the new generator-set based logic.

Changes:

Introduces state.generators + finalizer and integrates generator-set hashing/banning into state processing.
Renames/reshapes endorsement types (EndorseBlock → BlockEndorsement, endorser indexes to uint32) across node/proto/miner/state layers.
Refactors finalization persistence (finalizations → finality) and updates validation + APIs accordingly.

Reviewed changes

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

Show a summary per file

File	Description
pkg/wallet/embedded_wallet.go	Changes BLS keypair retrieval to return only secret keys.
pkg/types/types.go	Updates `EmbeddedWallet` and `EndorsementPool` interfaces for new signatures/types.
pkg/state/transaction_performer_test.go	Updates test to use `newestGenerators()` API.
pkg/state/threadsafe_wrapper.go	Replaces several finality/commitment read methods with generator-set queries.
pkg/state/state.go	Integrates `finality` + `generators` entities; switches miner GB retrieval to generator set; updates state hash inputs.
pkg/state/state_test.go	Updates tests to use `finality` storage.
pkg/state/state_hasher.go	Removes unused hasher `pop()` helper.
pkg/state/state_hasher_test.go	Updates state-hash test to use generator-set hashing.
pkg/state/mock_state.go	Regenerates mocks for updated State interface (generators/finality).
pkg/state/keys.go	Adds key prefix for banned generators tracking.
pkg/state/history_storage.go	Adds new blockchain entity type for `bannedGenerators`.
pkg/state/generators.go	New generator-set implementation (balances, bans, lookups, hashing).
pkg/state/generators_test.go	Adds placeholder generators test file.
pkg/state/finalizer.go	New finalization processor based on generator set + finality store.
pkg/state/finalization.go	Renames storage to `finality`, adds endorsement message builder, consolidates last-finalized-height logic.
pkg/state/commitments.go	Adds `newestCommitments()` and trims legacy commitment helper APIs.
pkg/state/commitments_internal_test.go	Updates commitment tests to new APIs and removes removed-API coverage.
pkg/state/appender.go	Replaces legacy `finalizationProcessor` with `finalizer` usage; adjusts checkerInfo flow and error text.
pkg/state/api.go	Updates StateInfo interface to generator-set based APIs.
pkg/proto/protobuf_converters.go	Converts endorsements to `BlockEndorsement` and normalizes index types.
pkg/proto/microblock_test.go	Updates finalization voting test data for new types.
pkg/proto/finalization.go	Introduces `EndorsementCryptoMessage`, `BlockEndorsement`, changes endorser index types, adds validation.
pkg/proto/finalization_test.go	Updates tests for new endorsement/voting types and adds validation coverage.
pkg/proto/endorse_test.go	Updates endorsement message test to new crypto-message builder.
pkg/node/fsm/ng_state.go	Reworks endorsement formation/verification around generator-set lookups and new proto types.
pkg/node/fsm/fsm.go	Renames FSM trigger constant and updates endorsement event payload type.
pkg/node/fsm/fsm_common.go	Updates FSM event argument type checks for endorsement events.
pkg/node/fsm/action.go	Updates action interface + implementation to send `BlockEndorsement`.
pkg/miner/endorsementpool/endorsementpool_test.go	Updates pool tests for `BlockEndorsement` and `uint32` indexes.
pkg/miner/endorsementpool/endorsement_pool.go	Updates pool storage/types and endorsement crypto-message usage; aggregates signatures via new API.
pkg/crypto/bls/bls.go	Changes `AggregateSignatures`/`VerifyAggregate` to use `Signature` value type end-to-end.
pkg/crypto/bls/bls_test.go	Updates aggregated signature compatibility test to new signature parsing type.
pkg/consensus/blocks_validation.go	Adds finalization-voting header validation gated by feature activation + de-duplication.
pkg/api/node_api.go	Updates generators endpoint to use `CommittedGenerators(height)` returning `GeneratorInfo`.
pkg/api/node_api_test.go	Updates wallet mock for new `KeyPairsBLS()` signature.
itests/finality_internal_test.go	Updates finality/deposit tests; adds miner commitments and fixes fee typing.
itests/config/config.go	Adds `GetAccount(address)` helper for integration tests.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Function to clean generators before initialization added. Index used to store the reference to block generator.

Copilot

Pull request overview

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

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-13T14:55:48Z

 func (a *NodeApi) GeneratorsAt(w http.ResponseWriter, r *http.Request) error {
 	heightStr := chi.URLParam(r, "height")
 	height, err := strconv.ParseUint(heightStr, 10, 64)
 	if err != nil {
 		return errors.Wrap(err, "invalid height")
 	}
 	isActivated, actErr := a.state.IsActivated(int16(settings.DeterministicFinality))
 	if actErr != nil {
 		return errors.Wrap(actErr, "failed to check DeterministicFinality activation")
 	}
 	if !isActivated {
 		return apiErrs.NewUnavailableError(errors.New("deterministic finality is not activated"))
 	}
-	activationHeight, err := a.state.ActivationHeight(int16(settings.DeterministicFinality))
-	if err != nil {
-		return errors.Wrapf(err, "failed to get DeterministicFinality activation height")
-	}

-	periodStart, err := state.CurrentGenerationPeriodStart(activationHeight, height,
-		a.app.settings.GenerationPeriod)
-	if err != nil {
-		return errors.Wrapf(err, "failed to calculate generationPeriodStart")
-	}
-	generatorAddresses, err := a.state.CommittedGenerators(periodStart)
+	// TODO: This would work only for height still present in history, once the height fell out of history, no
+	//  result will be returned.
+	//  Consider to create a separate storage for historical data that will persist data for any block.
+	//  Consider moving this API under the `-build-extended-api` and `-serve-extended-api` keys.
+	gs, err := a.state.CommittedGenerators(height)
 	if err != nil {
 		return err
 	}


GeneratorsAt now relies on State.CommittedGenerators(height), but the current implementation only supports the current height and returns a generic "not implemented" error for other heights. Since this endpoint accepts an arbitrary height path param, it should either (1) explicitly reject non-current heights with a clear 4xx error, or (2) implement historical generator retrieval (likely from history/commitments) to preserve the endpoint’s semantics.

Copilot · 2026-04-13T14:55:48Z

 // NewestMinerGeneratingBalance returns the generating balance of the miner at the given height.
 // This method includes the challenger bonus if the block has a challenged header.
+// After activation of Deterministic Finality feature, the method also checks presence of the block generator in
+// the generators set and returns 0 together with an error if the block generator is not in the generators set.
 func (s *stateManager) NewestMinerGeneratingBalance(header *proto.BlockHeader, height proto.Height) (uint64, error) {
 	minerAddr, err := proto.NewAddressFromPublicKey(s.settings.AddressSchemeCharacter, header.GeneratorPublicKey)
 	if err != nil {
 		return 0, wrapErr(stateerr.RetrievalError, errors.Wrapf(err, "failed create get miner address from PK %s",
 			header.GeneratorPublicKey,
 		))
 	}
-	minerGB, err := s.stor.balances.newestGeneratingBalance(minerAddr.ID(), height)
+	// Get miner's balance from the generators set.
+	minerGB, err := s.stor.generators.newestGeneratingBalance(minerAddr.ID(), height)
 	if err != nil {


The doc comment says this method returns an error when the block generator is not in the generators set after Deterministic Finality activation, but stor.generators.newestGeneratingBalance() falls back to balances.newestGeneratingBalance() when the generators set is empty. Either tighten the logic to always enforce membership after activation, or adjust the comment to match the actual behavior.

Copilot · 2026-04-13T14:55:49Z

+	generators, err := a.baseInfo.storage.CommittedGenerators(height)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to get committed generators at height %d: %w", height, err)
+	}
+	if len(generators) == 0 {
+		slog.Debug("No committed generators found, skipping finalization voting")
 	}

-	commitedGenerators, err := a.baseInfo.storage.CommittedGenerators(periodStart)
+	finalization, err := a.baseInfo.endorsements.FormFinalization()
 	if err != nil {


This block logs "skipping finalization voting" when len(generators) == 0, but then continues and forms/sends a finalization voting anyway. Either return early here (e.g., errNoFinalization) or adjust the log/message and remove the unused CommittedGenerators() call if it’s only informational.

nickeskov · 2026-04-14T03:25:22Z

 		return a, nil, a.Errorf(errors.Wrapf(err, "failed to get last finalized block header for endorser address"))
 	}
 	// TODO check if generator is in the generator set.
+	endorserPK := gi.BLSPublicKey()


What status about this TODO?

This should be handled in separate PR.

nickeskov · 2026-04-14T03:31:21Z

+		// TODO: remove height parameter from the following function. Micro-block mining is operates only current
+		//  generator set.
 		blockFinalization, err = a.getCurrentFinalizationVoting(height)
 		if err != nil && !errors.Is(err, errNoFinalization) && !errors.Is(err, errNoEndorsements) {


No errNoFinalization returns has been found. The error can be safely deleted, I guess?

The same here, I'll do it in a separate PR

Correct parameters of history storage for banned generators added.

TODO removed.

nickeskov · 2026-04-15T22:46:22Z

+	finalizedHeight, err := s.stor.finality.lastFinalizedHeight(blockHeight)
+	if err != nil {
+		return fmt.Errorf("failed to build local endorsement message: %w", err)
+	}
+	slog.Debug("Finalization", slog.Uint64("finalizedHeight", finalizedHeight),
+		slog.Uint64("blockHeight", blockHeight), slog.String("blockID", blockID.String()))


finalizedHeight is used only for logging. Maybe check log level before calling lastFinalizedHeight?
Though it's not critical, can be left unchanged.

alexeykiselev added 20 commits February 26, 2026 18:18

Added function to combine FinalizationVoting structures.

f6f2944

Test added.

Merge branch 'determenistic-finality-feature' into generators-set

a86f956

WIP: Generators set handling moved to separate storage entity.

6066246

Generators balances legacy state hash calculation moved to the entity also. Test updated.

WIP: Generators banning implemented, but not used yet.

b3e6cf5

WIP: Propagation of new generators API to the call sites in progress.

579dbb9

WIP: Usage of commitments storage replaced with calls to new generato…

11c71ab

…rs set functions. State API updated.

Merge branch 'determenistic-finality-feature' into generators-set

fcb1546

Small modernize fix.

e48c9b3

Merge branch 'determenistic-finality-feature' into generators-set

6447df2

Merge branch 'determenistic-finality-feature' into generators-set

f91389d

Merge branch 'determenistic-finality-feature' into generators-set

8ed0bcf

Fixed old tests after merge.

28a4774

Merge branch 'determenistic-finality-feature' into generators-set

b6827b1

WIP: Move finalization code to a separate structure.

db8e518

WIP: Extracted separate structure to calculate cryptographic message …

8c6e98e

…of endorsement. Refactored some BLS functions to hide Circl BLS signature.

Merge branch 'determenistic-finality-feature' into generators-set

274a553

Log messages improvement.

920aa99

alexeykiselev added the wip This is a WIP, should not be merged right away label Apr 9, 2026

Merge branch 'determenistic-finality-feature' into generators-set

aa8d03b

nickeskov requested review from Copilot and nickeskov April 9, 2026 15:37

Copilot started reviewing on behalf of nickeskov April 9, 2026 15:38 View session

Copilot AI reviewed Apr 9, 2026

View reviewed changes

alexeykiselev added 3 commits April 13, 2026 17:13

Merge branch 'determenistic-finality-feature' into generators-set

bbbfd50

Review issues fixed for generators storage.

ccf0962

Function to clean generators before initialization added. Index used to store the reference to block generator.

Other review fixes, mostly comments.

997aacb

alexeykiselev requested a review from Copilot April 13, 2026 14:47

Copilot started reviewing on behalf of alexeykiselev April 13, 2026 14:48 View session

Copilot AI reviewed Apr 13, 2026

View reviewed changes

nickeskov reviewed Apr 14, 2026

View reviewed changes

alexeykiselev added 2 commits April 14, 2026 11:19

Panic replaces with error for block's generator retrieval.

a59a334

Correct parameters of history storage for banned generators added.

Review fixes.

fdae65b

alexeykiselev requested a review from nickeskov April 14, 2026 16:55

alexeykiselev added 3 commits April 15, 2026 19:15

Merge branch 'determenistic-finality-feature' into generators-set

81e37b7

Logs added.

7ed50d5

TODO removed.

One more log added.

b3d3176

alexeykiselev removed the wip This is a WIP, should not be merged right away label Apr 15, 2026

nickeskov approved these changes Apr 15, 2026

View reviewed changes

nickeskov temporarily deployed to ITests April 15, 2026 22:54 — with GitHub Actions Inactive

alexeykiselev merged commit fea0c10 into determenistic-finality-feature Apr 16, 2026
13 checks passed

alexeykiselev deleted the generators-set branch April 16, 2026 07:45

Conversation

alexeykiselev commented Apr 9, 2026

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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Apr 13, 2026

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!

Uh oh!

nickeskov Apr 14, 2026

Choose a reason for hiding this comment

Uh oh!

alexeykiselev Apr 14, 2026

Choose a reason for hiding this comment

Uh oh!

nickeskov Apr 14, 2026

Choose a reason for hiding this comment

Uh oh!

alexeykiselev Apr 14, 2026

Choose a reason for hiding this comment

Uh oh!

nickeskov Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants