From 2cf59054379aa6d9a1168e5c39a161ca7ebc14d7 Mon Sep 17 00:00:00 2001
From: nischit <nischitpra@gmail.com>
Date: Fri, 31 Oct 2025 00:57:21 +0545
Subject: [PATCH] nil block

---
 internal/storage/kafka_publisher.go | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/internal/storage/kafka_publisher.go b/internal/storage/kafka_publisher.go
index e1a86bf..70c1d54 100644
--- a/internal/storage/kafka_publisher.go
+++ b/internal/storage/kafka_publisher.go
@@ -247,18 +247,29 @@ func (p *KafkaPublisher) publishBlockData(blockData []*common.BlockData, isDelet
 
 	publishStart := time.Now()
 
-	// Prepare messages for blocks, events, transactions and traces
-	blockMessages := make([]*kgo.Record, len(blockData))
+	// Filter out nil blocks and prepare messages
+	blockMessages := make([]*kgo.Record, 0, len(blockData))
+
+	for _, data := range blockData {
+		// Skip nil blocks
+		if data == nil {
+			log.Warn().Msg("Skipping nil block in publishBlockData")
+			continue
+		}
 
-	for i, data := range blockData {
 		// Block message
 		if blockMsg, err := p.createBlockDataMessage(data, isDeleted, isReorg); err == nil {
-			blockMessages[i] = blockMsg
+			blockMessages = append(blockMessages, blockMsg)
 		} else {
 			return fmt.Errorf("failed to create block message: %v", err)
 		}
 	}
 
+	if len(blockMessages) == 0 {
+		log.Warn().Msg("No valid blocks to publish after filtering")
+		return nil
+	}
+
 	if err := p.publishMessages(context.Background(), blockMessages); err != nil {
 		return fmt.Errorf("failed to publish block messages: %v", err)
 	}
@@ -268,6 +279,10 @@ func (p *KafkaPublisher) publishBlockData(blockData []*common.BlockData, isDelet
 }
 
 func (p *KafkaPublisher) createBlockDataMessage(block *common.BlockData, isDeleted bool, isReorg bool) (*kgo.Record, error) {
+	if block == nil {
+		return nil, fmt.Errorf("block is nil")
+	}
+
 	timestamp := time.Now()
 
 	data := PublishableMessageBlockData{