From bfff09f5d79d55f906aa08b2f8f1ed7c68fdb614 Mon Sep 17 00:00:00 2001
From: Andrew Davis <1709934+Savid@users.noreply.github.com>
Date: Wed, 11 Feb 2026 11:39:30 +1000
Subject: [PATCH] fix(state): cap NextBlocks batch against ClickHouse limiter
 max

NextBlocks only capped against chainHead, allowing blocks past the
beacon chain execution payload limit to be enqueued. Fetch limiter max
once at batch start and break the forwards-mode loop when exceeded.
---
 pkg/state/manager.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkg/state/manager.go b/pkg/state/manager.go
index 5e55925..6da2287 100644
--- a/pkg/state/manager.go
+++ b/pkg/state/manager.go
@@ -299,6 +299,16 @@ func (s *Manager) NextBlocks(
 		return []*big.Int{}, nil
 	}
 
+	// Get limiter max for forwards mode capping
+	var limiterMax *big.Int
+
+	if s.limiterEnabled && mode != tracker.BACKWARDS_MODE {
+		if maxAllowed, err := s.getLimiterMaxBlock(ctx, network); err == nil {
+			limiterMax = maxAllowed
+		}
+		// On error, proceed without limiter cap (same resilience pattern as NextBlock)
+	}
+
 	// Generate sequential block numbers
 	blocks := make([]*big.Int, 0, count)
 	blocks = append(blocks, firstBlock)
@@ -319,6 +329,10 @@ func (s *Manager) NextBlocks(
 			if chainHead != nil && nextBlock.Cmp(chainHead) > 0 {
 				break
 			}
+			// Don't exceed limiter max (beacon chain execution payload limit)
+			if limiterMax != nil && nextBlock.Cmp(limiterMax) > 0 {
+				break
+			}
 		}
 
 		blocks = append(blocks, nextBlock)