pr comments

block/block.go

@@ -116,6 +116,35 @@ func (m *Manager) isHeightAlreadyApplied(blockHeight uint64) (bool, error) {
 	return isBlockAlreadyApplied, nil
 }
 
+func (m *Manager) attemptApplyCachedBlocks() error {
+	m.retrieverMutex.Lock()
+	defer m.retrieverMutex.Unlock()
+
+	for {
+		expectedHeight := m.State.NextHeight()
+
+		cachedBlock, blockExists := m.blockCache[expectedHeight]
+		if !blockExists {
+			break
+		}
+		if err := m.validateBlock(cachedBlock.Block, cachedBlock.Commit); err != nil {
+			delete(m.blockCache, cachedBlock.Block.Header.Height)
+			/// TODO: can we take an action here such as dropping the peer / reducing their reputation?
+			return fmt.Errorf("block not valid at height %d, dropping it: err:%w", cachedBlock.Block.Header.Height, err)
+		}
+
+		err := m.applyBlock(cachedBlock.Block, cachedBlock.Commit, blockMetaData{source: gossipedBlock})
+		if err != nil {
+			return fmt.Errorf("apply cached block: expected height: %d: %w", expectedHeight, err)
+		}
+		m.logger.Debug("applied cached block", "height", expectedHeight)
+
+		delete(m.blockCache, cachedBlock.Block.Header.Height)
+	}
+
+	return nil
+}
+
 func (m *Manager) validateBlock(block *types.Block, commit *types.Commit) error {
 	// Currently we're assuming proposer is never nil as it's a pre-condition for
 	// dymint to start

block/gossip.go

@@ -39,35 +39,6 @@ func (m *Manager) onNewGossipedBlock(event pubsub.Message) {
 	}
 }
 
-func (m *Manager) attemptApplyCachedBlocks() error {
-	m.retrieverMutex.Lock()
-	defer m.retrieverMutex.Unlock()
-
-	for {
-		expectedHeight := m.State.NextHeight()
-
-		cachedBlock, blockExists := m.blockCache[expectedHeight]
-		if !blockExists {
-			break
-		}
-		if err := m.validateBlock(cachedBlock.Block, cachedBlock.Commit); err != nil {
-			delete(m.blockCache, cachedBlock.Block.Header.Height)
-			/// TODO: can we take an action here such as dropping the peer / reducing their reputation?
-			return fmt.Errorf("block not valid at height %d, dropping it: err:%w", cachedBlock.Block.Header.Height, err)
-		}
-
-		err := m.applyBlock(cachedBlock.Block, cachedBlock.Commit, blockMetaData{source: gossipedBlock})
-		if err != nil {
-			return fmt.Errorf("apply cached block: expected height: %d: %w", expectedHeight, err)
-		}
-		m.logger.Debug("applied cached block", "height", expectedHeight)
-
-		delete(m.blockCache, cachedBlock.Block.Header.Height)
-	}
-
-	return nil
-}
-
 func (m *Manager) gossipBlock(ctx context.Context, block types.Block, commit types.Commit) error {
 	gossipedBlock := p2p.GossipedBlock{Block: block, Commit: commit}
 	gossipedBlockBytes, err := gossipedBlock.MarshalBinary()

block/produce.go

@@ -103,12 +103,11 @@ func (m *Manager) produceBlock(allowEmpty bool) (*types.Block, *types.Commit, er
 	newHeight := m.State.NextHeight()
 	lastHeaderHash, lastCommit, err := loadPrevBlock(m.Store, newHeight-1)
 	if err != nil {
-		if m.State.IsGenesis() { //allow prevBlock not to be found only on genesis
-			lastHeaderHash = [32]byte{}
-			lastCommit = &types.Commit{}
-		} else {
+		if !m.State.IsGenesis() { //allow prevBlock not to be found only on genesis
 			return nil, nil, fmt.Errorf("load prev block: %w: %w", err, ErrNonRecoverable)
 		}
+		lastHeaderHash = [32]byte{}
+		lastCommit = &types.Commit{}
 	}
 
 	var block *types.Block

block/pruning.go

@@ -21,7 +21,7 @@ func (m *Manager) pruneBlocks(retainHeight uint64) (uint64, error) {
 	m.State.BaseHeight = retainHeight
 	_, err = m.Store.SaveState(m.State, nil)
 	if err != nil {
-		return 0, fmt.Errorf("final update state: %w", err)
+		return 0, fmt.Errorf("save state: %w", err)
 	}
 
 	m.logger.Info("pruned blocks", "pruned", pruned, "retain_height", retainHeight)

store/pruning.go

@@ -11,8 +11,7 @@ func (s *DefaultStore) PruneBlocks(from, to uint64) (uint64, error) {
 	}
 
 	if to <= from {
-		return 0, fmt.Errorf("cannot prune to height %v, it is lower than base height %v",
-			to, from)
+		return 0, fmt.Errorf("to height (%d) must be greater than from height (%d)", to, from)
 	}
 
 	pruned := uint64(0)