Add reorg block check (#892)

Kukoomomo · web-flow · commit 895120c16352 · 2026-03-02T11:26:03.000+08:00
diff --git a/tx-submitter/services/reorg.go b/tx-submitter/services/reorg.go
@@ -53,6 +53,9 @@ func (r *ReorgDetector) DetectReorg(ctx context.Context) (bool, uint64, error) {
 	if err != nil {
 		return false, 0, fmt.Errorf("failed to get latest block: %w", err)
 	}
+	if latestBlock == nil {
+		return false, 0, fmt.Errorf("latest block is nil")
+	}
 
 	// Check each block in history to find reorg point
 	reorgDepth := uint64(0)
@@ -61,6 +64,9 @@ func (r *ReorgDetector) DetectReorg(ctx context.Context) (bool, uint64, error) {
 		if err != nil {
 			return false, 0, fmt.Errorf("failed to get block %d: %w", info.number, err)
 		}
+		if block == nil {
+			return false, 0, fmt.Errorf("block %d is nil", info.number)
+		}
 
 		if block.Hash() != info.hash {
 			// Reorg detected
@@ -92,6 +98,9 @@ func (r *ReorgDetector) updateHistory(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("failed to get latest block: %w", err)
 	}
+	if latest == nil {
+		return fmt.Errorf("latest block is nil")
+	}
 
 	// Add new blocks to history
 	currentNum := latest.NumberU64()
@@ -105,6 +114,9 @@ func (r *ReorgDetector) updateHistory(ctx context.Context) error {
 		if err != nil {
 			return fmt.Errorf("failed to get block %d: %w", num, err)
 		}
+		if block == nil {
+			return fmt.Errorf("block %d is nil", num)
+		}
 
 		r.blockHistory = append(r.blockHistory, blockInfo{
 			number: num,
