@secondlayer/subgraphs 0.5.7 → 0.7.0

package/dist/src/index.js

@@ -53,15 +53,15 @@ var SubgraphDefinitionSchema = z.object({
   description: z.string().optional(),
   sources: z.array(SubgraphSourceSchema).min(1, "Must have at least one source"),
   schema: SubgraphSchemaSchema,
-  handlers: z.record(z.string(), z.function())
+  handlers: z.record(z.string(), z.any())
 });
 function validateSubgraphDefinition(def) {
   return SubgraphDefinitionSchema.parse(def);
 }
 
 // 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}`);
@@ -102,13 +102,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) {
@@ -166,53 +179,83 @@ class SubgraphContext {
     }
     return opsToFlush.length;
   }
+  prepareInsert(op) {
+    const upsertKeys = op.data._upsert_keys;
+    const data = { ...op.data };
+    delete data._upsert_keys;
+    delete data._upsert_fallback_keys;
+    delete data._upsert_fallback_set;
+    data._block_height = this.block.height;
+    data._tx_id = this._tx.txId;
+    data._created_at = "NOW()";
+    const cols = Object.keys(data);
+    cols.forEach(validateColumnName);
+    const vals = cols.map((c) => data[c] === "NOW()" ? "NOW()" : escapeLiteral(data[c]));
+    const batchKey = `${op.table}:${[...cols].sort().join(",")}:${upsertKeys ? [...upsertKeys].sort().join(",") : ""}`;
+    return { data, cols, vals, upsertKeys, batchKey };
+  }
   buildStatements(ops) {
     const statements = [];
+    let currentBatch = null;
+    let currentBatchKey = "";
+    const flushInsertBatch = () => {
+      if (!currentBatch)
+        return;
+      const qualifiedTable = `"${this.pgSchemaName}"."${currentBatch.table}"`;
+      const colList = currentBatch.cols.map((c) => `"${c}"`).join(", ");
+      let rows = currentBatch.rows;
+      if (currentBatch.upsertKeys && currentBatch.upsertKeys.length > 0) {
+        const keyIndices = currentBatch.upsertKeys.map((k) => currentBatch.cols.indexOf(k));
+        const seen = new Map;
+        for (let i = 0;i < rows.length; i++) {
+          const key = keyIndices.map((ki) => rows[i][ki]).join("\x00");
+          seen.set(key, i);
+        }
+        if (seen.size < rows.length) {
+          rows = Array.from(seen.values()).map((i) => rows[i]);
+        }
+      }
+      const valuesList = rows.map((r) => `(${r.join(", ")})`).join(", ");
+      let stmt = `INSERT INTO ${qualifiedTable} (${colList}) VALUES ${valuesList}`;
+      if (currentBatch.upsertKeys && currentBatch.upsertKeys.length > 0) {
+        const updateCols = currentBatch.cols.filter((c) => !currentBatch.upsertKeys.includes(c) && !c.startsWith("_"));
+        if (updateCols.length > 0) {
+          const setClauses = updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`);
+          stmt += ` ON CONFLICT (${currentBatch.upsertKeys.map((k) => `"${k}"`).join(", ")}) DO UPDATE SET ${setClauses.join(", ")}`;
+        } else {
+          stmt += ` ON CONFLICT (${currentBatch.upsertKeys.map((k) => `"${k}"`).join(", ")}) DO NOTHING`;
+        }
+      }
+      statements.push(stmt);
+      currentBatch = null;
+      currentBatchKey = "";
+    };
     for (const op of ops) {
       const qualifiedTable = `"${this.pgSchemaName}"."${op.table}"`;
-      switch (op.kind) {
-        case "insert": {
-          const upsertKeys = op.data._upsert_keys;
-          const fallbackKeys = op.data._upsert_fallback_keys;
-          const fallbackSet = op.data._upsert_fallback_set;
-          const data = { ...op.data };
-          delete data._upsert_keys;
-          delete data._upsert_fallback_keys;
-          delete data._upsert_fallback_set;
-          data._block_height = this.block.height;
-          data._tx_id = this._tx.txId;
-          data._created_at = "NOW()";
-          const cols = Object.keys(data);
-          cols.forEach(validateColumnName);
-          const vals = cols.map((c) => data[c] === "NOW()" ? "NOW()" : escapeLiteral(data[c]));
-          let stmt = `INSERT INTO ${qualifiedTable} (${cols.map((c) => `"${c}"`).join(", ")}) VALUES (${vals.join(", ")})`;
-          if (upsertKeys && upsertKeys.length > 0) {
-            const updateCols = cols.filter((c) => !upsertKeys.includes(c) && !c.startsWith("_"));
-            if (updateCols.length > 0) {
-              const setClauses = updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`);
-              stmt += ` ON CONFLICT (${upsertKeys.map((k) => `"${k}"`).join(", ")}) DO UPDATE SET ${setClauses.join(", ")}`;
-            } else {
-              stmt += ` ON CONFLICT (${upsertKeys.map((k) => `"${k}"`).join(", ")}) DO NOTHING`;
-            }
-          } else if (fallbackKeys && fallbackSet) {}
-          statements.push(stmt);
-          break;
+      if (op.kind === "insert") {
+        const { cols, vals, upsertKeys, batchKey } = this.prepareInsert(op);
+        if (batchKey === currentBatchKey && currentBatch) {
+          currentBatch.rows.push(vals);
+        } else {
+          flushInsertBatch();
+          currentBatch = { table: op.table, cols, rows: [vals], upsertKeys };
+          currentBatchKey = batchKey;
         }
-        case "update": {
+      } else {
+        flushInsertBatch();
+        if (op.kind === "update") {
           const setEntries = Object.entries(op.set);
           setEntries.forEach(([k]) => validateColumnName(k));
           const setClauses = setEntries.map(([k, v]) => `"${k}" = ${escapeLiteral(v)}`);
           const { clause } = buildWhereClause(op.data);
           statements.push(`UPDATE ${qualifiedTable} SET ${setClauses.join(", ")} WHERE ${clause}`);
-          break;
-        }
-        case "delete": {
+        } else if (op.kind === "delete") {
           const { clause } = buildWhereClause(op.data);
           statements.push(`DELETE FROM ${qualifiedTable} WHERE ${clause}`);
-          break;
         }
       }
     }
+    flushInsertBatch();
     return statements;
   }
   validateTable(table) {
@@ -241,95 +284,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) {
@@ -362,8 +316,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;
@@ -375,7 +329,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({
@@ -452,16 +410,109 @@ 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";
 
 // src/runtime/block-processor.ts
+var schemaNameCache = new Map;
 async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   const db = getDb();
   const blockStart = performance.now();
@@ -472,19 +523,32 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     errors: 0,
     skipped: false
   };
-  const block = await db.selectFrom("blocks").selectAll().where("height", "=", blockHeight).executeTakeFirst();
-  if (!block) {
-    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 });
-    result.skipped = true;
-    return result;
+  let block, txs, evts;
+  if (opts?.preloaded) {
+    block = opts.preloaded.block;
+    txs = opts.preloaded.txs;
+    evts = opts.preloaded.events;
+  } else {
+    block = await db.selectFrom("blocks").selectAll().where("height", "=", blockHeight).executeTakeFirst();
+    if (!block) {
+      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
+      });
+      result.skipped = true;
+      return result;
+    }
+    txs = await db.selectFrom("transactions").selectAll().where("block_height", "=", blockHeight).execute();
+    evts = await db.selectFrom("events").selectAll().where("block_height", "=", blockHeight).execute();
   }
-  const txs = await db.selectFrom("transactions").selectAll().where("block_height", "=", blockHeight).execute();
-  const evts = await db.selectFrom("events").selectAll().where("block_height", "=", blockHeight).execute();
   const matched = matchSources(subgraph.sources, txs, evts);
   result.matched = matched.length;
   if (matched.length === 0) {
@@ -493,8 +557,12 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     }
     return result;
   }
-  const subgraphRecord = await db.selectFrom("subgraphs").select("schema_name").where("name", "=", subgraphName).executeTakeFirst();
-  const schemaName = subgraphRecord?.schema_name ?? pgSchemaName(subgraphName);
+  let schemaName = schemaNameCache.get(subgraphName);
+  if (!schemaName) {
+    const subgraphRecord = await db.selectFrom("subgraphs").select("schema_name").where("name", "=", subgraphName).executeTakeFirst();
+    schemaName = subgraphRecord?.schema_name ?? pgSchemaName(subgraphName);
+    schemaNameCache.set(subgraphName, schemaName);
+  }
   const blockMeta = {
     height: block.height,
     hash: block.hash,
@@ -543,7 +611,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 {}
@@ -597,7 +669,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();
   }
@@ -619,10 +691,14 @@ class StatsAccumulator {
 }
 
 // src/runtime/reindex.ts
+import { getErrorMessage as getErrorMessage2 } from "@secondlayer/shared";
 import { getDb as getDb2, getRawClient } from "@secondlayer/shared/db";
+import {
+  recordGapBatch,
+  resolveGaps
+} from "@secondlayer/shared/db/queries/subgraph-gaps";
 import { updateSubgraphStatus as updateSubgraphStatus2 } from "@secondlayer/shared/db/queries/subgraphs";
 import { logger as logger4 } from "@secondlayer/shared/logger";
-import { getErrorMessage as getErrorMessage2 } from "@secondlayer/shared";
 
 // src/schema/generator.ts
 var TYPE_MAP = {
@@ -709,45 +785,121 @@ function generateSubgraphSQL(def, schemaNameOverride) {
   return { statements, hash };
 }
 
+// src/runtime/batch-loader.ts
+async function loadBlockRange(db, fromHeight, toHeight) {
+  const [blocks, txs, events] = await Promise.all([
+    db.selectFrom("blocks").selectAll().where("height", ">=", fromHeight).where("height", "<=", toHeight).where("canonical", "=", true).execute(),
+    db.selectFrom("transactions").selectAll().where("block_height", ">=", fromHeight).where("block_height", "<=", toHeight).execute(),
+    db.selectFrom("events").selectAll().where("block_height", ">=", fromHeight).where("block_height", "<=", toHeight).execute()
+  ]);
+  const txsByHeight = new Map;
+  for (const tx of txs) {
+    const h = Number(tx.block_height);
+    const list = txsByHeight.get(h) ?? [];
+    list.push(tx);
+    txsByHeight.set(h, list);
+  }
+  const eventsByHeight = new Map;
+  for (const evt of events) {
+    const h = Number(evt.block_height);
+    const list = eventsByHeight.get(h) ?? [];
+    list.push(evt);
+    eventsByHeight.set(h, list);
+  }
+  const result = new Map;
+  for (const block of blocks) {
+    const h = Number(block.height);
+    result.set(h, {
+      block,
+      txs: txsByHeight.get(h) ?? [],
+      events: eventsByHeight.get(h) ?? []
+    });
+  }
+  return result;
+}
+function avgEventsPerBlock(batch) {
+  if (batch.size === 0)
+    return 0;
+  let totalEvents = 0;
+  for (const data of batch.values()) {
+    totalEvents += data.events.length;
+  }
+  return totalEvents / batch.size;
+}
+
 // src/runtime/reindex.ts
 var LOG_INTERVAL = 1000;
-async function reindexSubgraph(def, opts) {
-  const db = getDb2();
-  const client = getRawClient();
-  const subgraphName = def.name;
-  const schemaName = opts?.schemaName ?? pgSchemaName(subgraphName);
-  await updateSubgraphStatus2(db, subgraphName, "reindexing");
-  logger4.info("Reindex starting", { subgraph: subgraphName });
-  try {
-    await client.unsafe(`DROP SCHEMA IF EXISTS "${schemaName}" CASCADE`);
-    const { statements } = generateSubgraphSQL(def, schemaName);
-    for (const stmt of statements) {
-      await client.unsafe(stmt);
-    }
-    logger4.info("Schema recreated for reindex", { subgraph: subgraphName });
-    const fromBlock = opts?.fromBlock ?? 1;
-    let toBlock;
-    if (opts?.toBlock != null) {
-      toBlock = opts.toBlock;
+var DEFAULT_BATCH_SIZE = 500;
+var MIN_BATCH_SIZE = 100;
+var MAX_BATCH_SIZE = 1000;
+function coalesceFailedBlocks(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 {
-      const progress = await db.selectFrom("index_progress").selectAll().where("network", "=", process.env.NETWORK ?? "mainnet").executeTakeFirst();
-      toBlock = progress?.last_indexed_block ?? progress?.last_contiguous_block ?? 0;
+      ranges.push({ start, end, reason });
+      start = b.height;
+      end = b.height;
+      reason = b.reason;
     }
-    if (fromBlock > toBlock) {
-      logger4.info("No blocks to reindex", { subgraph: subgraphName, fromBlock, toBlock });
-      await updateSubgraphStatus2(db, subgraphName, "active", 0);
-      return { processed: 0 };
+  }
+  ranges.push({ start, end, reason });
+  return ranges;
+}
+async function processBlockRange(def, opts) {
+  const db = getDb2();
+  const subgraphName = def.name;
+  const { fromBlock, toBlock, status } = opts;
+  const totalBlocks = toBlock - fromBlock + 1;
+  const stats = new StatsAccumulator(subgraphName, opts.apiKeyId, opts.isCatchup);
+  let blocksProcessed = 0;
+  let totalEventsProcessed = 0;
+  let totalErrors = 0;
+  let batchSize = DEFAULT_BATCH_SIZE;
+  let currentHeight = fromBlock;
+  let nextBatchPromise = loadBlockRange(db, currentHeight, Math.min(currentHeight + batchSize - 1, toBlock));
+  while (currentHeight <= toBlock) {
+    const batch = await nextBatchPromise;
+    const batchEnd = Math.min(currentHeight + batchSize - 1, toBlock);
+    const nextStart = batchEnd + 1;
+    if (nextStart <= toBlock) {
+      const nextEnd = Math.min(nextStart + batchSize - 1, toBlock);
+      nextBatchPromise = loadBlockRange(db, nextStart, nextEnd);
     }
-    const totalBlocks = toBlock - fromBlock + 1;
-    logger4.info("Reindexing blocks", { subgraph: subgraphName, fromBlock, toBlock, totalBlocks });
-    const subgraphRow = await db.selectFrom("subgraphs").select("api_key_id").where("name", "=", subgraphName).executeTakeFirst();
-    const stats = new StatsAccumulator(subgraphName, subgraphRow?.api_key_id ?? null, false);
-    let blocksProcessed = 0;
-    let totalEventsProcessed = 0;
-    let totalErrors = 0;
-    const PROGRESS_INTERVAL = 100;
-    for (let height = fromBlock;height <= toBlock; height++) {
-      const result = await processBlock(def, subgraphName, height, { skipProgressUpdate: true });
+    const batchFailedBlocks = [];
+    for (let height = currentHeight;height <= batchEnd; height++) {
+      const blockData = batch.get(height);
+      if (!blockData) {
+        batchFailedBlocks.push({ height, reason: "block_missing" });
+        blocksProcessed++;
+        continue;
+      }
+      let result;
+      try {
+        result = await processBlock(def, subgraphName, height, {
+          skipProgressUpdate: true,
+          preloaded: blockData
+        });
+      } catch (err) {
+        logger4.error("Block processing error", {
+          subgraph: subgraphName,
+          blockHeight: height,
+          error: err instanceof Error ? err.message : String(err)
+        });
+        batchFailedBlocks.push({ height, reason: "processing_error" });
+        await updateSubgraphStatus2(db, subgraphName, status, height).catch(() => {});
+        blocksProcessed++;
+        totalErrors++;
+        continue;
+      }
       blocksProcessed++;
       totalEventsProcessed += result.processed;
       totalErrors += result.errors;
@@ -757,11 +909,11 @@ async function reindexSubgraph(def, opts) {
           await stats.flush(db);
         }
       }
-      if (blocksProcessed % PROGRESS_INTERVAL === 0) {
-        await updateSubgraphStatus2(db, subgraphName, "reindexing", height);
+      if (blocksProcessed % 100 === 0) {
+        await updateSubgraphStatus2(db, subgraphName, status, height);
       }
       if (blocksProcessed % LOG_INTERVAL === 0) {
-        logger4.info("Reindex progress", {
+        logger4.info(`${status === "reindexing" ? "Reindex" : "Backfill"} progress`, {
           subgraph: subgraphName,
           processed: blocksProcessed,
           total: totalBlocks,
@@ -770,14 +922,87 @@ async function reindexSubgraph(def, opts) {
         });
       }
     }
-    await stats.flush(db);
+    if (batchFailedBlocks.length > 0 && opts.subgraphId) {
+      const gaps = coalesceFailedBlocks(batchFailedBlocks);
+      await recordGapBatch(db, opts.subgraphId, 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);
+    if (avg > 50)
+      batchSize = Math.max(Math.round(batchSize * 0.5), MIN_BATCH_SIZE);
+    else if (avg < 10)
+      batchSize = Math.min(Math.round(batchSize * 1.5), MAX_BATCH_SIZE);
+    currentHeight = batchEnd + 1;
+  }
+  await stats.flush(db);
+  return { blocksProcessed, totalEventsProcessed, totalErrors };
+}
+async function resolveBlockRange(db, opts) {
+  const fromBlock = opts?.fromBlock ?? 1;
+  let toBlock;
+  if (opts?.toBlock != null) {
+    toBlock = opts.toBlock;
+  } else {
+    const progress = await db.selectFrom("index_progress").selectAll().where("network", "=", process.env.NETWORK ?? "mainnet").executeTakeFirst();
+    toBlock = progress?.last_indexed_block ?? progress?.last_contiguous_block ?? 0;
+  }
+  return { fromBlock, toBlock };
+}
+async function reindexSubgraph(def, opts) {
+  const db = getDb2();
+  const client = getRawClient();
+  const subgraphName = def.name;
+  const schemaName = opts?.schemaName ?? pgSchemaName(subgraphName);
+  await updateSubgraphStatus2(db, subgraphName, "reindexing");
+  logger4.info("Reindex starting", { subgraph: subgraphName });
+  try {
+    await client.unsafe(`DROP SCHEMA IF EXISTS "${schemaName}" CASCADE`);
+    const { statements } = generateSubgraphSQL(def, schemaName);
+    for (const stmt of statements) {
+      await client.unsafe(stmt);
+    }
+    logger4.info("Schema recreated for reindex", { subgraph: subgraphName });
+    const { fromBlock, toBlock } = await resolveBlockRange(db, opts);
+    if (fromBlock > toBlock) {
+      logger4.info("No blocks to reindex", {
+        subgraph: subgraphName,
+        fromBlock,
+        toBlock
+      });
+      await updateSubgraphStatus2(db, subgraphName, "active", 0);
+      return { processed: 0 };
+    }
+    logger4.info("Reindexing blocks", {
+      subgraph: subgraphName,
+      fromBlock,
+      toBlock,
+      totalBlocks: toBlock - fromBlock + 1
+    });
+    const subgraphRow = await db.selectFrom("subgraphs").select(["id", "api_key_id"]).where("name", "=", subgraphName).executeTakeFirst();
+    const result = await processBlockRange(def, {
+      fromBlock,
+      toBlock,
+      status: "reindexing",
+      isCatchup: false,
+      apiKeyId: subgraphRow?.api_key_id ?? null,
+      subgraphId: subgraphRow?.id
+    });
     const { recordSubgraphProcessed: recordSubgraphProcessed2 } = await import("@secondlayer/shared/db/queries/subgraphs");
-    if (totalEventsProcessed > 0 || totalErrors > 0) {
-      await recordSubgraphProcessed2(db, subgraphName, totalEventsProcessed, totalErrors, totalErrors > 0 ? `${totalErrors} error(s) during reindex` : undefined);
+    if (result.totalEventsProcessed > 0 || result.totalErrors > 0) {
+      await recordSubgraphProcessed2(db, subgraphName, result.totalEventsProcessed, result.totalErrors, result.totalErrors > 0 ? `${result.totalErrors} error(s) during reindex` : undefined);
     }
     await updateSubgraphStatus2(db, subgraphName, "active", toBlock);
-    logger4.info("Reindex complete", { subgraph: subgraphName, blocks: blocksProcessed, events: totalEventsProcessed, errors: totalErrors });
-    return { processed: blocksProcessed };
+    logger4.info("Reindex complete", {
+      subgraph: subgraphName,
+      blocks: result.blocksProcessed,
+      events: result.totalEventsProcessed,
+      errors: result.totalErrors
+    });
+    return { processed: result.blocksProcessed };
   } catch (err) {
     logger4.error("Reindex failed", {
       subgraph: subgraphName,
@@ -787,6 +1012,50 @@ async function reindexSubgraph(def, opts) {
     throw err;
   }
 }
+async function backfillSubgraph(def, opts) {
+  const db = getDb2();
+  const subgraphName = def.name;
+  logger4.info("Backfill starting", {
+    subgraph: subgraphName,
+    from: opts.fromBlock,
+    to: opts.toBlock
+  });
+  try {
+    const subgraphRow = await db.selectFrom("subgraphs").select(["id", "api_key_id"]).where("name", "=", subgraphName).executeTakeFirst();
+    const result = await processBlockRange(def, {
+      fromBlock: opts.fromBlock,
+      toBlock: opts.toBlock,
+      status: "active",
+      isCatchup: false,
+      apiKeyId: subgraphRow?.api_key_id ?? null,
+      subgraphId: subgraphRow?.id
+    });
+    const resolved = await resolveGaps(db, subgraphName, opts.fromBlock, opts.toBlock).catch(() => 0);
+    if (resolved > 0) {
+      logger4.info("Resolved subgraph gaps via backfill", {
+        subgraph: subgraphName,
+        resolved
+      });
+    }
+    const { recordSubgraphProcessed: recordSubgraphProcessed2 } = await import("@secondlayer/shared/db/queries/subgraphs");
+    if (result.totalEventsProcessed > 0 || result.totalErrors > 0) {
+      await recordSubgraphProcessed2(db, subgraphName, result.totalEventsProcessed, result.totalErrors, result.totalErrors > 0 ? `${result.totalErrors} error(s) during backfill` : undefined);
+    }
+    logger4.info("Backfill complete", {
+      subgraph: subgraphName,
+      blocks: result.blocksProcessed,
+      events: result.totalEventsProcessed,
+      errors: result.totalErrors
+    });
+    return { processed: result.blocksProcessed };
+  } catch (err) {
+    logger4.error("Backfill failed", {
+      subgraph: subgraphName,
+      error: getErrorMessage2(err)
+    });
+    throw err;
+  }
+}
 // src/define.ts
 function defineSubgraph(def) {
   return def;
@@ -845,7 +1114,13 @@ async function deploySchema(db, def, handlerPath, opts) {
   const regData = {
     name: def.name,
     version: def.version || "1.0.0",
-    definition: toJsonSafe({ name: def.name, version: def.version, description: def.description, sources: def.sources, schema: def.schema }),
+    definition: toJsonSafe({
+      name: def.name,
+      version: def.version,
+      description: def.description,
+      sources: def.sources,
+      schema: def.schema
+    }),
     schemaHash: hash,
     handlerPath,
     apiKeyId: opts?.apiKeyId,
@@ -961,8 +1236,9 @@ export {
   generateSubgraphSQL,
   diffSchema,
   deploySchema,
-  defineSubgraph
+  defineSubgraph,
+  backfillSubgraph
 };
 
-//# debugId=B83B1361C4912AAD64756E2164756E21
+//# debugId=5A0D359BE0D619B264756E2164756E21
 //# sourceMappingURL=index.js.map