@secondlayer/subgraphs 0.6.0 → 0.7.1

package/dist/src/runtime/catchup.js

@@ -16,8 +16,8 @@ function sourceKey(source) {
 }
 
 // src/runtime/context.ts
-import { sql } from "kysely";
 import { logger } from "@secondlayer/shared/logger";
+import { sql } from "kysely";
 function validateColumnName(name) {
   if (!/^[a-z_][a-z0-9_]*$/i.test(name)) {
     throw new Error(`Invalid column name: ${name}`);
@@ -58,13 +58,26 @@ class SubgraphContext {
     const keyColumns = Object.keys(key);
     const hasUniqueConstraint = tableDef.uniqueKeys?.some((uk) => uk.length === keyColumns.length && uk.every((c) => keyColumns.includes(c)));
     if (hasUniqueConstraint) {
-      this.ops.push({ kind: "insert", table, data: { ...key, ...row, _upsert_keys: keyColumns } });
+      this.ops.push({
+        kind: "insert",
+        table,
+        data: { ...key, ...row, _upsert_keys: keyColumns }
+      });
     } else {
       logger.warn("upsert called without matching uniqueKeys constraint, using fallback", {
         table,
         keys: keyColumns
       });
-      this.ops.push({ kind: "insert", table, data: { ...key, ...row, _upsert_fallback_keys: keyColumns, _upsert_fallback_set: row } });
+      this.ops.push({
+        kind: "insert",
+        table,
+        data: {
+          ...key,
+          ...row,
+          _upsert_fallback_keys: keyColumns,
+          _upsert_fallback_set: row
+        }
+      });
     }
   }
   delete(table, where) {
@@ -227,95 +240,6 @@ function buildWhereClause(where) {
   return { clause: parts.join(" AND "), values: [] };
 }
 
-// src/runtime/source-matcher.ts
-function matchPattern(value, pattern) {
-  if (!pattern.includes("*"))
-    return value === pattern;
-  const regex = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
-  return new RegExp(`^${regex}$`).test(value);
-}
-function matchSource(source, transactions, eventsByTx) {
-  const results = [];
-  const key = sourceKey(source);
-  for (const tx of transactions) {
-    if (source.type) {
-      if (!matchPattern(tx.type, source.type))
-        continue;
-      const txEvents = eventsByTx.get(tx.tx_id) ?? [];
-      let matchedEvents = txEvents;
-      if (source.minAmount !== undefined) {
-        const amountEvents = matchedEvents.filter((e) => {
-          const data = e.data;
-          const rawAmount = data?.amount;
-          if (rawAmount === undefined)
-            return false;
-          const amount = BigInt(rawAmount);
-          return amount >= source.minAmount;
-        });
-        if (amountEvents.length === 0)
-          continue;
-        matchedEvents = amountEvents;
-      }
-      results.push({ tx, events: matchedEvents, sourceKey: key });
-      continue;
-    }
-    if (source.contract) {
-      const txContractMatch = tx.contract_id && matchPattern(tx.contract_id, source.contract);
-      if (source.function && tx.function_name) {
-        if (!matchPattern(tx.function_name, source.function))
-          continue;
-      } else if (source.function && !tx.function_name) {
-        continue;
-      }
-      const txEvents = eventsByTx.get(tx.tx_id) ?? [];
-      let matchedEvents = txEvents;
-      if (!txContractMatch) {
-        matchedEvents = txEvents.filter((e) => {
-          const data = e.data;
-          const contractIdentifier = data?.contract_identifier;
-          return contractIdentifier && matchPattern(contractIdentifier, source.contract);
-        });
-        if (matchedEvents.length === 0)
-          continue;
-      }
-      if (source.event) {
-        matchedEvents = matchedEvents.filter((e) => {
-          if (matchPattern(e.type, source.event))
-            return true;
-          const data = e.data;
-          const topic = data?.topic;
-          return topic ? matchPattern(topic, source.event) : false;
-        });
-      }
-      if (txContractMatch || matchedEvents.length > 0) {
-        results.push({ tx, events: matchedEvents, sourceKey: key });
-      }
-    }
-  }
-  return results;
-}
-function matchSources(sources, transactions, events) {
-  const eventsByTx = new Map;
-  for (const event of events) {
-    const list = eventsByTx.get(event.tx_id) ?? [];
-    list.push(event);
-    eventsByTx.set(event.tx_id, list);
-  }
-  const seen = new Set;
-  const results = [];
-  for (const source of sources) {
-    const matches = matchSource(source, transactions, eventsByTx);
-    for (const match of matches) {
-      const dedupeKey = `${match.tx.tx_id}:${match.sourceKey}`;
-      if (!seen.has(dedupeKey)) {
-        seen.add(dedupeKey);
-        results.push(match);
-      }
-    }
-  }
-  return results;
-}
-
 // src/runtime/clarity.ts
 import { cvToJSON, deserializeCV } from "@secondlayer/stacks/clarity";
 function decodeClarityValue(hex) {
@@ -348,8 +272,8 @@ function decodeFunctionArgs(args) {
 }
 
 // src/runtime/runner.ts
-import { logger as logger2 } from "@secondlayer/shared/logger";
 import { getErrorMessage } from "@secondlayer/shared";
+import { logger as logger2 } from "@secondlayer/shared/logger";
 var DEFAULT_ERROR_THRESHOLD = 50;
 function resolveHandler(handlers, key) {
   return handlers[key] ?? handlers["*"] ?? null;
@@ -361,7 +285,11 @@ async function runHandlers(subgraph, matched, ctx, opts) {
   for (const { tx, events, sourceKey: sourceKey2 } of matched) {
     const handler = resolveHandler(subgraph.handlers, sourceKey2);
     if (!handler) {
-      logger2.warn("No handler found for source key", { subgraph: subgraph.name, sourceKey: sourceKey2, txId: tx.tx_id });
+      logger2.warn("No handler found for source key", {
+        subgraph: subgraph.name,
+        sourceKey: sourceKey2,
+        txId: tx.tx_id
+      });
       continue;
     }
     ctx.setTx({
@@ -438,11 +366,103 @@ async function runHandlers(subgraph, matched, ctx, opts) {
   return { processed, errors };
 }
 
+// src/runtime/source-matcher.ts
+function matchPattern(value, pattern) {
+  if (!pattern.includes("*"))
+    return value === pattern;
+  const regex = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
+  return new RegExp(`^${regex}$`).test(value);
+}
+function matchSource(source, transactions, eventsByTx) {
+  const results = [];
+  const key = sourceKey(source);
+  for (const tx of transactions) {
+    if (source.type) {
+      if (!matchPattern(tx.type, source.type))
+        continue;
+      const txEvents = eventsByTx.get(tx.tx_id) ?? [];
+      let matchedEvents = txEvents;
+      if (source.minAmount !== undefined) {
+        const amountEvents = matchedEvents.filter((e) => {
+          const data = e.data;
+          const rawAmount = data?.amount;
+          if (rawAmount === undefined)
+            return false;
+          const amount = BigInt(rawAmount);
+          return amount >= source.minAmount;
+        });
+        if (amountEvents.length === 0)
+          continue;
+        matchedEvents = amountEvents;
+      }
+      results.push({ tx, events: matchedEvents, sourceKey: key });
+      continue;
+    }
+    if (source.contract) {
+      const txContractMatch = tx.contract_id && matchPattern(tx.contract_id, source.contract);
+      if (source.function && tx.function_name) {
+        if (!matchPattern(tx.function_name, source.function))
+          continue;
+      } else if (source.function && !tx.function_name) {
+        continue;
+      }
+      const txEvents = eventsByTx.get(tx.tx_id) ?? [];
+      let matchedEvents = txEvents;
+      if (!txContractMatch) {
+        matchedEvents = txEvents.filter((e) => {
+          const data = e.data;
+          const contractIdentifier = data?.contract_identifier;
+          return contractIdentifier && matchPattern(contractIdentifier, source.contract);
+        });
+        if (matchedEvents.length === 0)
+          continue;
+      }
+      if (source.event) {
+        matchedEvents = matchedEvents.filter((e) => {
+          if (matchPattern(e.type, source.event))
+            return true;
+          const data = e.data;
+          const topic = data?.topic;
+          return topic ? matchPattern(topic, source.event) : false;
+        });
+      }
+      if (txContractMatch || matchedEvents.length > 0) {
+        results.push({ tx, events: matchedEvents, sourceKey: key });
+      }
+    }
+  }
+  return results;
+}
+function matchSources(sources, transactions, events) {
+  const eventsByTx = new Map;
+  for (const event of events) {
+    const list = eventsByTx.get(event.tx_id) ?? [];
+    list.push(event);
+    eventsByTx.set(event.tx_id, list);
+  }
+  const seen = new Set;
+  const results = [];
+  for (const source of sources) {
+    const matches = matchSource(source, transactions, eventsByTx);
+    for (const match of matches) {
+      const dedupeKey = `${match.tx.tx_id}:${match.sourceKey}`;
+      if (!seen.has(dedupeKey)) {
+        seen.add(dedupeKey);
+        results.push(match);
+      }
+    }
+  }
+  return results;
+}
+
 // src/runtime/block-processor.ts
-import { sql as sql2 } from "kysely";
 import { getDb } from "@secondlayer/shared/db";
+import {
+  recordSubgraphProcessed,
+  updateSubgraphStatus
+} from "@secondlayer/shared/db/queries/subgraphs";
 import { logger as logger3 } from "@secondlayer/shared/logger";
-import { updateSubgraphStatus, recordSubgraphProcessed } from "@secondlayer/shared/db/queries/subgraphs";
+import { sql as sql2 } from "kysely";
 
 // src/schema/utils.ts
 import { pgSchemaName } from "@secondlayer/shared/db/queries/subgraphs";
@@ -467,12 +487,18 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   } else {
     block = await db.selectFrom("blocks").selectAll().where("height", "=", blockHeight).executeTakeFirst();
     if (!block) {
-      logger3.warn("Block not found for subgraph processing", { subgraph: subgraphName, blockHeight });
+      logger3.warn("Block not found for subgraph processing", {
+        subgraph: subgraphName,
+        blockHeight
+      });
       result.skipped = true;
       return result;
     }
     if (!block.canonical) {
-      logger3.debug("Skipping non-canonical block", { subgraph: subgraphName, blockHeight });
+      logger3.debug("Skipping non-canonical block", {
+        subgraph: subgraphName,
+        blockHeight
+      });
       result.skipped = true;
       return result;
     }
@@ -541,7 +567,11 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
         const { rows } = await sql2.raw(`SELECT COUNT(*) as count FROM "${schemaName}"."${table}"`).execute(db);
         const count = Number(rows[0].count);
         if (count >= 1e7) {
-          logger3.warn("Subgraph table exceeds 10M rows", { subgraph: subgraphName, table, count });
+          logger3.warn("Subgraph table exceeds 10M rows", {
+            subgraph: subgraphName,
+            table,
+            count
+          });
         }
       }
     } catch {}
@@ -595,7 +625,7 @@ class StatsAccumulator {
       flush_time_ms: Math.round(entry.flushTimeMs),
       max_block_time_ms: Math.round(entry.maxBlockTimeMs),
       max_handler_time_ms: Math.round(entry.maxHandlerTimeMs),
-      avg_ops_per_block: parseFloat(avgOpsPerBlock.toFixed(2)),
+      avg_ops_per_block: Number.parseFloat(avgOpsPerBlock.toFixed(2)),
       is_catchup: entry.isCatchup
     }).execute();
   }
@@ -618,8 +648,11 @@ class StatsAccumulator {
 
 // src/runtime/catchup.ts
 import { getDb as getDb2 } from "@secondlayer/shared/db";
-import { logger as logger4 } from "@secondlayer/shared/logger";
+import {
+  recordGapBatch
+} from "@secondlayer/shared/db/queries/subgraph-gaps";
 import { getSubgraph } from "@secondlayer/shared/db/queries/subgraphs";
+import { logger as logger4 } from "@secondlayer/shared/logger";
 
 // src/runtime/batch-loader.ts
 async function loadBlockRange(db, fromHeight, toHeight) {
@@ -669,6 +702,28 @@ var DEFAULT_BATCH_SIZE = 500;
 var MIN_BATCH_SIZE = 100;
 var MAX_BATCH_SIZE = 1000;
 var catchingUp = new Set;
+function coalesceGaps(blocks) {
+  if (blocks.length === 0)
+    return [];
+  blocks.sort((a, b) => a.height - b.height);
+  const ranges = [];
+  let start = blocks[0].height;
+  let end = blocks[0].height;
+  let reason = blocks[0].reason;
+  for (let i = 1;i < blocks.length; i++) {
+    const b = blocks[i];
+    if (b.height === end + 1 && b.reason === reason) {
+      end = b.height;
+    } else {
+      ranges.push({ start, end, reason });
+      start = b.height;
+      end = b.height;
+      reason = b.reason;
+    }
+  }
+  ranges.push({ start, end, reason });
+  return ranges;
+}
 function adjustBatchSize(current, avgEvents) {
   if (avgEvents > 50)
     return Math.max(Math.round(current * 0.5), MIN_BATCH_SIZE);
@@ -689,10 +744,11 @@ async function catchUpSubgraph(subgraph, subgraphName) {
     const progress = await db.selectFrom("index_progress").selectAll().where("network", "=", process.env.NETWORK ?? "mainnet").executeTakeFirst();
     if (!progress)
       return 0;
-    const chainTip = Number(progress.last_contiguous_block);
+    const chainTip = Number(progress.highest_seen_block);
     if (lastProcessedBlock >= chainTip)
       return 0;
-    const startBlock = lastProcessedBlock + 1;
+    const subgraphStart = Number(subgraphRow.start_block) || 1;
+    const startBlock = Math.max(lastProcessedBlock + 1, subgraphStart);
     const totalBlocks = chainTip - lastProcessedBlock;
     logger4.info("Subgraph catch-up starting", {
       subgraph: subgraphName,
@@ -706,6 +762,14 @@ async function catchUpSubgraph(subgraph, subgraphName) {
     let currentHeight = startBlock;
     let nextBatchPromise = loadBlockRange(db, currentHeight, Math.min(currentHeight + batchSize - 1, chainTip));
     while (currentHeight <= chainTip) {
+      const currentRow = await getSubgraph(db, subgraphName);
+      if (!currentRow || currentRow.status !== "active") {
+        logger4.info("Subgraph status changed, stopping catch-up", {
+          subgraph: subgraphName,
+          status: currentRow?.status ?? "deleted"
+        });
+        break;
+      }
       const batch = await nextBatchPromise;
       const batchEnd = Math.min(currentHeight + batchSize - 1, chainTip);
       const nextStart = batchEnd + 1;
@@ -713,9 +777,11 @@ async function catchUpSubgraph(subgraph, subgraphName) {
         const nextEnd = Math.min(nextStart + batchSize - 1, chainTip);
         nextBatchPromise = loadBlockRange(db, nextStart, nextEnd);
       }
+      const batchFailedBlocks = [];
       for (let height = currentHeight;height <= batchEnd; height++) {
         const blockData = batch.get(height);
         if (!blockData) {
+          batchFailedBlocks.push({ height, reason: "block_missing" });
           processed++;
           continue;
         }
@@ -730,6 +796,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
             blockHeight: height,
             error: err instanceof Error ? err.message : String(err)
           });
+          batchFailedBlocks.push({ height, reason: "processing_error" });
           const { updateSubgraphStatus: updateSubgraphStatus2 } = await import("@secondlayer/shared/db/queries/subgraphs");
           await updateSubgraphStatus2(db, subgraphName, "active", height).catch(() => {});
           processed++;
@@ -752,6 +819,15 @@ async function catchUpSubgraph(subgraph, subgraphName) {
           });
         }
       }
+      if (batchFailedBlocks.length > 0) {
+        const gaps = coalesceGaps(batchFailedBlocks);
+        await recordGapBatch(db, subgraphRow.id, subgraphName, gaps).catch((err) => {
+          logger4.warn("Failed to record subgraph gaps", {
+            subgraph: subgraphName,
+            error: err instanceof Error ? err.message : String(err)
+          });
+        });
+      }
       const avg = avgEventsPerBlock(batch);
       batchSize = adjustBatchSize(batchSize, avg);
       currentHeight = batchEnd + 1;
@@ -770,5 +846,5 @@ export {
   catchUpSubgraph
 };
 
-//# debugId=ECEE17CC2A59B3A164756E2164756E21
+//# debugId=953B5DBF1473343764756E2164756E21
 //# sourceMappingURL=catchup.js.map