From 3f0506b5bc8814d2a2e245e81420c3d6f49afc76 Mon Sep 17 00:00:00 2001
From: jangko <jangko128@gmail.com>
Date: Thu, 17 Aug 2023 14:02:04 +0700
Subject: [PATCH] fix getPayloadBodiesByRange upper limit

---
 nimbus/rpc/engine_api.nim | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nimbus/rpc/engine_api.nim b/nimbus/rpc/engine_api.nim
index 865c8b7a3..7a262836d 100644
--- a/nimbus/rpc/engine_api.nim
+++ b/nimbus/rpc/engine_api.nim
@@ -537,7 +537,12 @@ proc handle_getPayloadBodiesByRange(com: CommonRef,
 
   let db = com.db
   var header: BlockHeader
-  for bn in start..<start+count:
+  var last = start+count-1
+  let current = com.syncCurrent.truncate(uint64)
+  if last > current:
+    last = current
+
+  for bn in start..last:
     if not db.getBlockHeader(bn.toBlockNumber, header):
       result.add none(ExecutionPayloadBodyV1)
       continue