Merge pull request #3 from osmosis-labs/adam/avoid-double-call-block-…

…proto

perf(internal/blocksync): avoid double-calling `types.BlockFromProto`…

.changelog/unreleased/improvements/2016-blocksync-avoid-double-calling-block-from-proto.md

@@ -0,0 +1,2 @@
+- `[blocksync]` Avoid double-calling `types.BlockFromProto` for performance
+  reasons ([\#2016](https://github.com/cometbft/cometbft/pull/2016))

blocksync/msgs.go

@@ -31,10 +31,9 @@ func ValidateMsg(pb proto.Message) error {
 			return errors.New("negative Height")
 		}
 	case *bcproto.BlockResponse:
-		_, err := types.BlockFromProto(msg.Block)
-		if err != nil {
-			return err
-		}
+		// Avoid double-calling `types.BlockFromProto` for performance reasons.
+		// See https://github.com/cometbft/cometbft/issues/1964
+		return nil
 	case *bcproto.NoBlockResponse:
 		if msg.Height < 0 {
 			return errors.New("negative Height")

blocksync/reactor.go

@@ -230,7 +230,8 @@ func (bcR *Reactor) ReceiveEnvelope(e p2p.Envelope) {
 	case *bcproto.BlockResponse:
 		bi, err := types.BlockFromProto(msg.Block)
 		if err != nil {
-			bcR.Logger.Error("Block content is invalid", "err", err)
+			bcR.Logger.Error("Peer sent us invalid block", "peer", e.Src, "msg", e.Message, "err", err)
+			bcR.Switch.StopPeerForError(e.Src, err)
 			return
 		}
 		bcR.pool.AddBlock(e.Src.ID(), bi, msg.Block.Size())