fix(p2p): validate block before applying and not before caching in p2… (

#724)

Co-authored-by: Sergi Rene <[email protected]>
Co-authored-by: github-actions <[email protected]>

CHANGELOG.md

@@ -1,4 +1,8 @@
-# [](https://github.com/dymensionxyz/dymint/compare/v1.1.0-rc01...v) (2024-04-26)
+# [](https://github.com/dymensionxyz/dymint/compare/v1.1.0-rc02...v) (2024-04-26)
+
+
+
+# [1.1.0-rc02](https://github.com/dymensionxyz/dymint/compare/v1.1.0-rc01...v1.1.0-rc02) (2024-04-26)
 
 
 

block/block.go

@@ -130,8 +130,12 @@ func (m *Manager) attemptApplyCachedBlocks() error {
 		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)
+		}
 
-		// Note: cached <block,commit> pairs have passed basic validation, so no need to validate again
 		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)

block/manager.go

@@ -243,12 +243,6 @@ func (m *Manager) onNewGossipedBlock(event pubsub.Message) {
 	block := eventData.Block
 	commit := eventData.Commit
 
-	if err := m.validateBlock(&block, &commit); err != nil {
-		m.logger.Error("apply block callback, block not valid: dropping it", "err", err, "height", block.Header.Height)
-		/// TODO: can we take an action here such as dropping the peer / reducing their reputation?
-		return
-	}
-
 	nextHeight := m.Store.NextHeight()
 	if block.Header.Height >= nextHeight {
 		m.blockCache[block.Header.Height] = CachedBlock{