remove verbose logging and bug fix for resetting checkpoint manager state

Author: hexoscott

consensus/polybft/checkpoint_manager.go

@@ -327,7 +327,6 @@ func (c *checkpointManager) PostBlock(req *PostBlockRequest) error {
 	if err != nil {
 		return fmt.Errorf("could not get last processed block for exit events. Error: %w", err)
 	}
-	c.logger.Info("[checkPointManager] read last block", "block", lastBlock)
 
 	if lastBlock == 0 {
 		// if we are running in a forked context here we need to make sure that we update the last block
@@ -343,8 +342,6 @@ func (c *checkpointManager) PostBlock(req *PostBlockRequest) error {
 		return err
 	}
 
-	c.logger.Info("[checkPointManager] got exit events", "count", len(exitEvents))
-
 	sort.Slice(exitEvents, func(i, j int) bool {
 		// keep events in sequential order
 		return exitEvents[i].ID.Cmp(exitEvents[j].ID) < 0
@@ -354,8 +351,6 @@ func (c *checkpointManager) PostBlock(req *PostBlockRequest) error {
 		return err
 	}
 
-	c.logger.Info("[checkPointManager] written exit events")
-
 	if err := c.state.CheckpointStore.updateLastSaved(block); err != nil {
 		return err
 	}

consensus/polybft/consensus_runtime.go

@@ -257,8 +257,6 @@ func (c *consensusRuntime) getGuardedData() (guardedDataDTO, error) {
 	c.lock.RLock()
 	defer c.lock.RUnlock()
 
-	c.logger.Info("getting guarded data")
-
 	lastBuiltBlock := c.lastBuiltBlock.Copy()
 	epoch := new(epochMetadata)
 	*epoch = *c.epoch // shallow copy, don't need to make validators copy because AccountSet is immutable
@@ -295,11 +293,9 @@ func (c *consensusRuntime) OnBlockInserted(fullBlock *types.FullBlock) {
 	if err := updateBlockMetrics(fullBlock.Block, c.lastBuiltBlock); err != nil {
 		c.logger.Error("failed to update block metrics", "error", err)
 	}
-	c.logger.Info("[newBlock] metrics updated")
 
 	// after the block has been written we reset the txpool so that the old transactions are removed
 	c.config.txPool.ResetWithHeaders(fullBlock.Block.Header)
-	c.logger.Info("[newBlock] txpool reset")
 
 	var (
 		epoch = c.epoch
@@ -315,32 +311,27 @@ func (c *consensusRuntime) OnBlockInserted(fullBlock *types.FullBlock) {
 	if err := c.stateSyncManager.PostBlock(postBlock); err != nil {
 		c.logger.Error("failed to post block state sync", "err", err)
 	}
-	c.logger.Info("[newBlock] state sync complete")
 
 	// handle exit events that happened in block
 	if err := c.checkpointManager.PostBlock(postBlock); err != nil {
 		c.logger.Error("failed to post block in checkpoint manager", "err", err)
 	}
-	c.logger.Info("[newBlock] checkpoint manager complete")
 
 	// update proposer priorities
 	if err := c.proposerCalculator.PostBlock(postBlock); err != nil {
 		c.logger.Error("Could not update proposer calculator", "err", err)
 	}
-	c.logger.Info("[newBlock] proposer calculator complete")
 
 	// handle transfer events that happened in block
 	if err := c.stakeManager.PostBlock(postBlock); err != nil {
 		c.logger.Error("failed to post block in stake manager", "err", err)
 	}
-	c.logger.Info("[newBlock] stake manager complete")
 
 	if isEndOfEpoch {
 		if epoch, err = c.restartEpoch(fullBlock.Block.Header); err != nil {
 			c.logger.Error("failed to restart epoch after block inserted", "error", err)
 			return
 		}
-		c.logger.Info("[newBlock] restart epoch complete")
 
 		// PALM HACK - testing something out - remove - I don't think state is being updated at the end of an epoch properly
 		//epoch.Number++
@@ -389,9 +380,7 @@ func (c *consensusRuntime) FSM() error {
 
 	valSet := validator.NewValidatorSet(epoch.Validators, c.logger)
 
-	c.logger.Info("building event root", "endOfSprint", isEndOfSprint, "endOfEpoch", isEndOfEpoch)
 	exitRootHash, err := c.checkpointManager.BuildEventRoot(epoch.Number)
-	c.logger.Info("built event root")
 	if err != nil {
 		return fmt.Errorf("could not build exit root hash for fsm: %w", err)
 	}

consensus/polybft/state_store_checkpoint.go

@@ -68,7 +68,27 @@ func (s *CheckpointStore) initialize(tx *bolt.Tx) error {
 		return fmt.Errorf("failed to create bucket=%s: %w", string(exitEventLastProcessedBlockBucket), err)
 	}
 
-	return tx.Bucket(exitEventLastProcessedBlockBucket).Put(lastProcessedBlockKey, common.EncodeUint64ToBytes(0))
+	shouldResetLastProcessed := false
+	if err := s.db.View(func(tx *bolt.Tx) error {
+		bucket := tx.Bucket(exitEventLastProcessedBlockBucket)
+		if bucket == nil {
+			shouldResetLastProcessed = true
+			return nil
+		}
+		v := bucket.Get(lastProcessedBlockKey)
+		if v == nil {
+			shouldResetLastProcessed = true
+		}
+		return nil
+	}); err != nil {
+		return err
+	}
+
+	if shouldResetLastProcessed {
+		return tx.Bucket(exitEventLastProcessedBlockBucket).Put(lastProcessedBlockKey, common.EncodeUint64ToBytes(0))
+	}
+
+	return nil
 }
 
 // insertExitEvents inserts a slice of exit events to exit event bucket in bolt db