@secondlayer/sdk 6.48.1 → 6.49.0

package/dist/subgraphs/index.js

@@ -606,13 +606,15 @@ function resumeHeight(cursor) {
     return null;
   }
 }
-function batchContext(cursor, height, tip, reorgs = []) {
+function batchContext(cursor, height, tip, reorgs = [], scannedHeight = null) {
   const tipHeight = tip.block_height;
+  const position = scannedHeight ?? height;
   return {
     cursor,
     height,
+    scannedHeight: position,
     tipHeight,
-    blocksBehind: height === null ? null : Math.max(0, tipHeight - height),
+    blocksBehind: position === null ? null : Math.max(0, tipHeight - position),
     tip,
     reorgs
   };
@@ -679,6 +681,7 @@ async function consumeStreamsEvents(opts) {
   let pages = 0;
   let emptyPolls = 0;
   let height = resumeHeight(cursor);
+  let scanned = height;
   while (pages < maxPages && emptyPolls < maxEmptyPolls && !opts.signal?.aborted) {
     const envelope = await fetchPageWithRetry(() => opts.fetchEvents({
       cursor,
@@ -710,6 +713,7 @@ async function consumeStreamsEvents(opts) {
         }
         cursor = rewind;
         height = forkPoint > 0 ? forkPoint - 1 : null;
+        scanned = height;
         emptyPolls = 0;
         continue;
       }
@@ -717,7 +721,14 @@ async function consumeStreamsEvents(opts) {
     const emitted = finalizedOnly ? envelope.events.filter((event) => event.finalized) : envelope.events;
     const checkpoint = finalizedOnly ? emitted.at(-1)?.cursor ?? cursor : envelope.next_cursor;
     height = emitted.at(-1)?.block_height ?? height;
-    const ctx = batchContext(checkpoint ?? cursor, height, envelope.tip, envelope.reorgs);
+    if (emitted.length > 0) {
+      scanned = height;
+    } else if (checkpoint !== null && checkpoint !== cursor) {
+      scanned = resumeHeight(checkpoint) ?? scanned;
+    } else if (envelope.events.length === 0) {
+      scanned = envelope.tip.block_height;
+    }
+    const ctx = batchContext(checkpoint ?? cursor, height, envelope.tip, envelope.reorgs, scanned);
     opts.onProgress?.(ctx);
     let nextCursor;
     if (opts.sink) {
@@ -846,6 +857,7 @@ async function consumeIndexFeed(opts) {
   let pages = 0;
   let emptyPolls = 0;
   let height = resumeHeight(cursor);
+  let scanned = height;
   while (pages < maxPages && emptyPolls < maxEmptyPolls && !opts.signal?.aborted) {
     const envelope = await fetchPageWithRetry(() => opts.fetchPage({
       cursor,
@@ -871,6 +883,7 @@ async function consumeIndexFeed(opts) {
         }
         cursor = rewind;
         height = forkPoint > 0 ? forkPoint - 1 : null;
+        scanned = height;
         emptyPolls = 0;
         continue;
       }
@@ -879,7 +892,14 @@ async function consumeIndexFeed(opts) {
     const emitted = finalizedOnly ? items.filter((item) => item.block_height <= envelope.tip.finalized_height) : items;
     const checkpoint = finalizedOnly ? emitted.at(-1)?.cursor ?? cursor : envelope.next_cursor;
     height = emitted.at(-1)?.block_height ?? height;
-    const ctx = batchContext(checkpoint ?? cursor, height, envelope.tip, envelope.reorgs);
+    if (emitted.length > 0) {
+      scanned = height;
+    } else if (checkpoint !== null && checkpoint !== cursor) {
+      scanned = resumeHeight(checkpoint) ?? scanned;
+    } else {
+      scanned = finalizedOnly ? envelope.tip.finalized_height : envelope.tip.block_height;
+    }
+    const ctx = batchContext(checkpoint ?? cursor, height, envelope.tip, envelope.reorgs, scanned);
     opts.onProgress?.(ctx);
     let nextCursor;
     if (opts.sink) {
@@ -2212,5 +2232,5 @@ export {
   Subgraphs
 };
 
-//# debugId=BE9B5D3664FE5C8464756E2164756E21
+//# debugId=0E0B0BAAF8B4C44E64756E2164756E21
 //# sourceMappingURL=index.js.map