Check block height before populating BlockCache

Author: Manav-Aggarwal

block/manager.go

@@ -305,6 +305,7 @@ func (m *Manager) SyncLoop(ctx context.Context, cancel context.CancelFunc) {
 		case <-blockTicker.C:
 			m.sendNonBlockingSignalToBlockStoreCh()
 		case blockEvent := <-m.blockInCh:
+			// Only validated blocks are sent to blockInCh, so we can safely assume that blockEvent.block is valid
 			block := blockEvent.block
 			daHeight := blockEvent.daHeight
 			blockHash := block.Hash().String()
@@ -314,7 +315,7 @@ func (m *Manager) SyncLoop(ctx context.Context, cancel context.CancelFunc) {
 				"daHeight", daHeight,
 				"hash", blockHash,
 			)
-			if m.blockCache.isSeen(blockHash) {
+			if m.blockCache.isSeen(blockHash) || blockHeight <= m.store.Height() {
 				m.logger.Debug("block already seen", "height", blockHeight, "block hash", blockHash)
 				continue
 			}