Cleared endorsement pool caches for rollbacks

Author: esuwu

pkg/crypto/secp256.go

@@ -1,3 +1,4 @@
+//nolint:revive // Package name is part of public API and intentionally kept as crypto.
 package crypto
 
 import (

pkg/miner/endorsementpool/endorsement_pool.go

@@ -287,6 +287,11 @@ func (cache *EndorsementIDsCache) RememberEndorsement(id crypto.Digest) {
 	cache.order = append(cache.order, id)
 }
 
+func (cache *EndorsementIDsCache) Clear() {
+	cache.ids = make(map[crypto.Digest]struct{})
+	cache.order = nil
+}
+
 func (p *EndorsementPool) SaveBlockGenerator(blockGenerator *crypto.PublicKey) {
 	p.mu.Lock()
 	defer p.mu.Unlock()

pkg/node/fsm/ng_state.go

@@ -112,6 +112,8 @@ func (a *NGState) Score(p peer.Peer, score *proto.Score) (State, Async, error) {
 
 func (a *NGState) rollbackToStateFromCache(blockFromCache *proto.Block) error {
 	previousBlockID := blockFromCache.Parent
+	a.baseInfo.endorsements.CleanAll()
+	a.baseInfo.endorsementIDsCache.Clear()
 	err := a.baseInfo.storage.RollbackTo(previousBlockID, true)
 	if err != nil {
 		return errors.Wrapf(err, "failed to rollback to parent block '%s' of cached block '%s'",
@@ -143,6 +145,8 @@ func (a *NGState) rollbackToStateFromCacheInLightNode(parentID proto.BlockID) er
 	a.baseInfo.logger.Debug("Re-applying block from cache", "state", a.String(),
 		"blockID", blockFromCache.ID.String())
 	previousBlockID := blockFromCache.Parent
+	a.baseInfo.endorsements.CleanAll()
+	a.baseInfo.endorsementIDsCache.Clear()
 	err := a.baseInfo.storage.RollbackTo(previousBlockID, true)
 	if err != nil {
 		return errors.Wrapf(err, "failed to rollback to parent block '%s' of cached block '%s'",

pkg/state/appender.go

@@ -1453,19 +1453,19 @@ func (f *finalizationProcessor) loadLastFinalizedHeight(
 	calculatedFinalizedHeight := proto.CalculateLastFinalizedHeight(height)
 
 	storedFinalizedHeight, err := f.stor.finalizations.newest()
+	if err != nil && !errors.Is(err, ErrNoFinalization) && !errors.Is(err, ErrNoFinalizationHistory) {
+		return 0, err
+	}
 	if err == nil {
-		if storedFinalizedHeight < calculatedFinalizedHeight {
-			if finalityActivated {
-				if storErr := f.stor.finalizations.store(calculatedFinalizedHeight, currentBlockID); storErr != nil {
-					return 0, storErr
-				}
+		if storedFinalizedHeight >= calculatedFinalizedHeight {
+			return storedFinalizedHeight, nil
+		}
+		if finalityActivated {
+			if storErr := f.stor.finalizations.store(calculatedFinalizedHeight, currentBlockID); storErr != nil {
+				return 0, storErr
 			}
-			return calculatedFinalizedHeight, nil
 		}
-		return storedFinalizedHeight, nil
-	}
-	if !errors.Is(err, ErrNoFinalization) && !errors.Is(err, ErrNoFinalizationHistory) {
-		return 0, err
+		return calculatedFinalizedHeight, nil
 	}
 
 	// No finalization found, calculate it, and, if finality activated - initialize it.