@secondlayer/subgraphs 3.23.1 → 3.24.0

package/dist/src/service.js

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/runtime/context.ts
-import { logger } from "@secondlayer/shared/logger";
+import { logger as logger2 } from "@secondlayer/shared/logger";
 import { formatUnits } from "@secondlayer/stacks/utils";
 import { sql } from "kysely";
 
@@ -147,6 +147,7 @@ function generateSubgraphSQL(def, schemaNameOverride) {
 
 // src/runtime/chain-read.ts
 import { getSourceDb } from "@secondlayer/shared/db";
+import { logger } from "@secondlayer/shared/logger";
 import { http, createPublicClient } from "@secondlayer/stacks";
 import {
   ContractResponseError,
@@ -232,6 +233,14 @@ function createChainReadClient(ctx) {
     const pinnedTo = constant ? null : ctx.indexBlockHash;
     const cached = await db.selectFrom("chain_read_cache").select("result_hex").where("contract_id", "=", contractId).where("function_name", "=", fn.name).where("args_hash", "=", argsHash).where((eb) => pinnedTo === null ? eb("index_block_hash", "is", null) : eb("index_block_hash", "=", pinnedTo)).executeTakeFirst();
     const resultHex = cached?.result_hex ?? await gate.run(async () => {
+      if (!ctx.indexBlockHash) {
+        logger.warn("Chain read is not pinned to a block (no index_block_hash)", {
+          contractId,
+          functionName: fn.name,
+          blockHeight: ctx.blockHeight,
+          note: 'cache: "contract-constant" asserts this value cannot change; the node answered at its own tip'
+        });
+      }
       const value2 = await readContract(nodeClient(rpcUrl), {
         contract: contractId,
         functionName: fn.name,
@@ -346,7 +355,7 @@ class SubgraphContext {
         data: { ...key, ...row, ...meta, _upsert_keys: keyColumns }
       });
     } else {
-      logger.warn("upsert called without matching uniqueKeys constraint, using fallback", {
+      logger2.warn("upsert called without matching uniqueKeys constraint, using fallback", {
         table,
         keys: keyColumns
       });
@@ -906,7 +915,7 @@ function decodeFunctionArgs(args) {
 
 // src/runtime/runner.ts
 import { getErrorMessage } from "@secondlayer/shared";
-import { logger as logger2 } from "@secondlayer/shared/logger";
+import { logger as logger3 } from "@secondlayer/shared/logger";
 import {
   clarityValueToJS,
   deserializeCV as deserializeCV3,
@@ -1257,7 +1266,7 @@ async function runHandlers(subgraph, matched, ctx, opts) {
   units.sort((a, b) => (a.tx.tx_index ?? 0) - (b.tx.tx_index ?? 0) || (a.event?.event_index ?? -1) - (b.event?.event_index ?? -1));
   for (const { tx, event, sourceName } of units) {
     if (errors >= threshold) {
-      logger2.error("Subgraph error threshold reached, skipping remaining events", {
+      logger3.error("Subgraph error threshold reached, skipping remaining events", {
         subgraph: subgraph.name,
         errors,
         threshold
@@ -1266,7 +1275,7 @@ async function runHandlers(subgraph, matched, ctx, opts) {
     }
     const handler = subgraph.handlers[sourceName] ?? subgraph.handlers["*"] ?? null;
     if (!handler) {
-      logger2.warn("No handler found for source", {
+      logger3.warn("No handler found for source", {
         subgraph: subgraph.name,
         sourceName,
         txId: tx.tx_id
@@ -1323,7 +1332,7 @@ async function runHandlers(subgraph, matched, ctx, opts) {
         const verdict = validatePrintPayload(filter.prints, printPayload.topic ?? "", printPayload.data ?? {});
         if (!verdict.ok) {
           skipped++;
-          logger2.warn("Print payload does not match declared prints schema", {
+          logger3.warn("Print payload does not match declared prints schema", {
             subgraph: subgraph.name,
             sourceName,
             topic: printPayload.topic,
@@ -1338,7 +1347,7 @@ async function runHandlers(subgraph, matched, ctx, opts) {
     } catch (err) {
       ctx.rollbackTo(checkpoint);
       errors++;
-      logger2.error("Subgraph handler error", {
+      logger3.error("Subgraph handler error", {
         subgraph: subgraph.name,
         sourceName,
         txId: tx.tx_id,
@@ -1618,12 +1627,14 @@ import { resolveTraitContractIds } from "@secondlayer/shared/db/queries/contract
 import { advanceOperationCursor } from "@secondlayer/shared/db/queries/subgraph-operations";
 import {
   isByoSubgraph,
+  recordLiveError,
   recordLiveProgress,
   recordSubgraphProcessed,
   resolveSubgraphDb,
+  rewindLiveProgress,
   updateSubgraphStatus
 } from "@secondlayer/shared/db/queries/subgraphs";
-import { logger as logger5 } from "@secondlayer/shared/logger";
+import { logger as logger6 } from "@secondlayer/shared/logger";
 import { sql as sql3 } from "kysely";
 
 // src/runtime/block-source.ts
@@ -1631,7 +1642,7 @@ import { getSourceDb as getSourceDb2 } from "@secondlayer/shared/db";
 import {
   IndexHttpClient
 } from "@secondlayer/shared/index-http";
-import { logger as logger3 } from "@secondlayer/shared/logger";
+import { logger as logger4 } from "@secondlayer/shared/logger";
 
 // src/runtime/batch-loader.ts
 async function loadBlockRange(db, fromHeight, toHeight) {
@@ -1955,7 +1966,7 @@ class FallbackBlockSource {
     try {
       return await this.primary.getTip();
     } catch (err) {
-      logger3.warn("block source primary getTip failed — using DB tap", {
+      logger4.warn("block source primary getTip failed — using DB tap", {
         error: err instanceof Error ? err.message : String(err)
       });
       return this.fallback.getTip();
@@ -1965,7 +1976,7 @@ class FallbackBlockSource {
     try {
       return await this.primary.loadBlockRange(fromHeight, toHeight);
     } catch (err) {
-      logger3.warn("block source primary loadBlockRange failed — using DB tap", {
+      logger4.warn("block source primary loadBlockRange failed — using DB tap", {
         from: fromHeight,
         to: toHeight,
         error: err instanceof Error ? err.message : String(err)
@@ -1997,7 +2008,7 @@ function resolveBlockSource(subgraph) {
     return new FallbackBlockSource(new PublicApiBlockSource(buildHttpClient(), referencedIndexEventTypes(subgraph), canSparseScan(subgraph) ? sparseProbeTargets(subgraph) : undefined, needsTransactionData(subgraph)), postgresBlockSource);
   }
   if (process.env.SUBGRAPH_SOURCE === "streams-index" && subgraph) {
-    logger3.debug("Subgraph not streams-index eligible, using DB tap", {
+    logger4.debug("Subgraph not streams-index eligible, using DB tap", {
       subgraph: subgraph.name
     });
   }
@@ -2006,7 +2017,7 @@ function resolveBlockSource(subgraph) {
 
 // src/runtime/outbox-emit.ts
 import { createHash as createHash2 } from "node:crypto";
-import { logger as logger4 } from "@secondlayer/shared/logger";
+import { logger as logger5 } from "@secondlayer/shared/logger";
 var loggedKillSwitch = false;
 var OP_VERB = {
   insert: "created",
@@ -2030,7 +2041,7 @@ function stableStringify(obj) {
 async function emitSubscriptionOutbox(tx, subgraphName, manifest, matcher, blockHeight) {
   if (!isEmitOutboxEnabled()) {
     if (!loggedKillSwitch) {
-      logger4.warn("SECONDLAYER_EMIT_OUTBOX=false — outbox emission bypassed");
+      logger5.warn("SECONDLAYER_EMIT_OUTBOX=false — outbox emission bypassed");
       loggedKillSwitch = true;
     }
     return 0;
@@ -2328,10 +2339,20 @@ class CursorRaceLostError extends Error {
     this.name = "CursorRaceLostError";
   }
 }
+
+class LiveCursorRaceLostError extends Error {
+  constructor(subgraphName, height) {
+    super(`live cursor race lost for ${subgraphName} at block ${height}`);
+    this.name = "LiveCursorRaceLostError";
+  }
+}
 function opCursorMode(opts) {
   const ap = opts?.atomicProgress;
   return ap && "operationId" in ap ? ap : undefined;
 }
+function isReorgRewind(opts) {
+  return opts?.reorgRewind === true;
+}
 function statusMode(opts) {
   const ap = opts?.atomicProgress;
   return ap && "status" in ap ? ap : undefined;
@@ -2350,7 +2371,7 @@ async function processBlockWithRetry(subgraph, subgraphName, blockHeight, opts,
       const delay = retryDelaysMs[attempt];
       if (delay === undefined)
         break;
-      logger5.warn("Block processing failed, retrying", {
+      logger6.warn("Block processing failed, retrying", {
         subgraph: subgraphName,
         blockHeight,
         attempt: attempt + 1,
@@ -2382,7 +2403,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   } else {
     const data = (await resolveBlockSource(subgraph).loadBlockRange(blockHeight, blockHeight)).get(blockHeight);
     if (!data) {
-      logger5.debug("Block not found or non-canonical for subgraph processing", {
+      logger6.debug("Block not found or non-canonical for subgraph processing", {
         subgraph: subgraphName,
         blockHeight
       });
@@ -2401,7 +2422,11 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   result.matched = matched.length;
   if (matched.length === 0) {
     if (!opts?.skipProgressUpdate) {
-      await recordLiveProgress(targetDb, subgraphName, blockHeight);
+      if (isReorgRewind(opts)) {
+        await rewindLiveProgress(targetDb, subgraphName, blockHeight);
+      } else {
+        await recordLiveProgress(targetDb, subgraphName, blockHeight);
+      }
     }
     return result;
   }
@@ -2420,13 +2445,23 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   };
   let handlerMs = 0;
   let flushMs = 0;
-  const applyProgress = async (tx, rr) => {
+  const applyProgress = async (tx, rr, flushedWrites) => {
     if (opts?.skipProgressUpdate)
       return;
+    const rewind = isReorgRewind(opts);
     if (rr.errors > 0 && rr.processed === 0) {
-      await updateSubgraphStatus(tx, subgraphName, "error", blockHeight);
+      if (rewind) {
+        await updateSubgraphStatus(tx, subgraphName, "error", blockHeight);
+      } else {
+        await recordLiveError(tx, subgraphName, blockHeight);
+      }
+    } else if (rewind) {
+      await rewindLiveProgress(tx, subgraphName, blockHeight);
     } else {
-      await recordLiveProgress(tx, subgraphName, blockHeight);
+      const advanced = await recordLiveProgress(tx, subgraphName, blockHeight);
+      if (!advanced && flushedWrites && !route.byo) {
+        throw new LiveCursorRaceLostError(subgraphName, blockHeight);
+      }
     }
     if (rr.processed > 0 || rr.errors > 0) {
       const lastError = rr.errors > 0 ? `${rr.errors} error(s) at block ${blockHeight}` : undefined;
@@ -2475,13 +2510,15 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
       } else if (byoOm && manifest && manifest.count > 0) {
         await advanceOperationCursor(tx, byoOm.operationId, blockHeight);
       }
-      await applyProgress(tx, runResult);
+      await applyProgress(tx, runResult, manifest ? manifest.count > 0 : false);
     });
   } else {
     try {
       await targetDb.transaction().execute(async (tx) => {
         const opMode = opCursorMode(opts);
-        if (statusMode(opts)) {
+        const sm = statusMode(opts);
+        const rewind = isReorgRewind(opts);
+        if (sm) {
           const row = await tx.selectFrom("subgraphs").select("last_processed_block").where("name", "=", subgraphName).executeTakeFirst();
           if (row && Number(row.last_processed_block) >= blockHeight) {
             result.skipped = true;
@@ -2493,6 +2530,12 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
             result.skipped = true;
             return;
           }
+        } else if (!rewind) {
+          const row = await tx.selectFrom("subgraphs").select("last_processed_block").where("name", "=", subgraphName).executeTakeFirst();
+          if (row && Number(row.last_processed_block) >= blockHeight) {
+            result.skipped = true;
+            return;
+          }
         }
         const ctx = new SubgraphContext(tx, schemaName, subgraph.schema, blockMeta, initialTx, false, journalEnabled(opts));
         const handlerStart = performance.now();
@@ -2510,7 +2553,6 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
           }
           flushMs = performance.now() - flushStart;
         }
-        const sm = statusMode(opts);
         if (sm && flushedWrites) {
           await updateSubgraphStatus(tx, subgraphName, sm.status, blockHeight);
         } else if (opMode && flushedWrites) {
@@ -2519,11 +2561,11 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
             throw new CursorRaceLostError(opMode.operationId, blockHeight);
           }
         }
-        await applyProgress(tx, runResult);
+        await applyProgress(tx, runResult, flushedWrites);
       });
     } catch (err) {
-      if (err instanceof CursorRaceLostError) {
-        logger5.warn("cursor race lost — block already covered", {
+      if (err instanceof CursorRaceLostError || err instanceof LiveCursorRaceLostError) {
+        logger6.warn("cursor race lost — block already covered", {
           subgraph: subgraphName,
           blockHeight,
           error: err.message
@@ -2535,11 +2577,13 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     }
   }
   const totalMs = performance.now() - blockStart;
-  result.timing = {
-    totalMs: Math.round(totalMs),
-    handlerMs: Math.round(handlerMs),
-    flushMs: Math.round(flushMs)
-  };
+  if (!result.skipped) {
+    result.timing = {
+      totalMs: Math.round(totalMs),
+      handlerMs: Math.round(handlerMs),
+      flushMs: Math.round(flushMs)
+    };
+  }
   if (blockHeight % 1000 === 0) {
     try {
       const tables = Object.keys(subgraph.schema);
@@ -2547,7 +2591,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
         const { rows } = await sql3.raw(`SELECT n_live_tup AS count FROM pg_stat_user_tables WHERE schemaname = '${schemaName}' AND relname = '${table}'`).execute(route.dataDb);
         const count = Number(rows[0]?.count ?? 0);
         if (count >= 1e7) {
-          logger5.warn("Subgraph table exceeds 10M rows (estimate)", {
+          logger6.warn("Subgraph table exceeds 10M rows (estimate)", {
             subgraph: subgraphName,
             table,
             count
@@ -2555,7 +2599,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
         }
       }
     } catch (err) {
-      logger5.debug("Row count sample failed", {
+      logger6.debug("Row count sample failed", {
         subgraph: subgraphName,
         error: err instanceof Error ? err.message : String(err)
       });
@@ -2645,11 +2689,11 @@ import {
   recordSubgraphProcessed as recordSubgraphProcessed2,
   updateSubgraphStatus as updateSubgraphStatus2
 } from "@secondlayer/shared/db/queries/subgraphs";
-import { logger as logger7 } from "@secondlayer/shared/logger";
+import { logger as logger8 } from "@secondlayer/shared/logger";
 
 // src/runtime/reindex-notify.ts
 import { getErrorMessage as getErrorMessage2 } from "@secondlayer/shared";
-import { logger as logger6 } from "@secondlayer/shared/logger";
+import { logger as logger7 } from "@secondlayer/shared/logger";
 async function notifyReindexComplete(db, subgraphName, stats) {
   try {
     const subgraph = await db.selectFrom("subgraphs").select(["account_id"]).where("name", "=", subgraphName).executeTakeFirst();
@@ -2660,7 +2704,7 @@ async function notifyReindexComplete(db, subgraphName, stats) {
       return;
     const resendKey = process.env.RESEND_API_KEY;
     if (!resendKey) {
-      logger6.warn("RESEND_API_KEY unset — skipping reindex-complete email", {
+      logger7.warn("RESEND_API_KEY unset — skipping reindex-complete email", {
         subgraph: subgraphName
       });
       return;
@@ -2682,14 +2726,14 @@ async function notifyReindexComplete(db, subgraphName, stats) {
     });
     if (!res.ok) {
       const text = await res.text().catch(() => "");
-      logger6.warn("reindex-complete email failed", {
+      logger7.warn("reindex-complete email failed", {
         subgraph: subgraphName,
         status: res.status,
         body: text.slice(0, 200)
       });
     }
   } catch (err) {
-    logger6.warn("reindex-complete email threw", {
+    logger7.warn("reindex-complete email threw", {
       subgraph: subgraphName,
       error: getErrorMessage2(err)
     });
@@ -2801,7 +2845,7 @@ async function processBlockRange(def, opts) {
   while (currentHeight <= toBlock) {
     if (opts.signal?.aborted) {
       aborted = true;
-      logger7.info("Block processing aborted", {
+      logger8.info("Block processing aborted", {
         subgraph: subgraphName,
         currentBlock: currentHeight,
         reason: String(opts.signal.reason ?? "unknown")
@@ -2850,7 +2894,7 @@ async function processBlockRange(def, opts) {
         });
       } catch (err) {
         const errorMsg = getErrorMessage3(err);
-        logger7.error("Block processing failed persistently", {
+        logger8.error("Block processing failed persistently", {
           subgraph: subgraphName,
           blockHeight: height,
           error: errorMsg
@@ -2896,7 +2940,7 @@ async function processBlockRange(def, opts) {
         lastProgressFlushAt = now;
       }
       if (blocksProcessed % LOG_INTERVAL === 0) {
-        logger7.info(`${status === "reindexing" ? "Reindex" : "Backfill"} progress`, {
+        logger8.info(`${status === "reindexing" ? "Reindex" : "Backfill"} progress`, {
           subgraph: subgraphName,
           processed: blocksProcessed,
           total: totalBlocks,
@@ -2916,7 +2960,7 @@ async function processBlockRange(def, opts) {
     if (batchFailedBlocks.length > 0 && opts.subgraphId) {
       const gaps = coalesceFailedBlocks(batchFailedBlocks);
       await recordGapBatch(targetDb, opts.subgraphId, subgraphName, gaps).catch((err) => {
-        logger7.warn("Failed to record subgraph gaps", {
+        logger8.warn("Failed to record subgraph gaps", {
           subgraph: subgraphName,
           error: err instanceof Error ? err.message : String(err)
         });
@@ -2933,7 +2977,7 @@ async function processBlockRange(def, opts) {
         } else {
           await updateSubgraphStatus2(targetDb, subgraphName, status, jumpTo - 1);
         }
-        logger7.info("Sparse skip", {
+        logger8.info("Sparse skip", {
           subgraph: subgraphName,
           from: batchEnd + 1,
           to: jumpTo - 1,
@@ -2973,11 +3017,11 @@ async function reindexSubgraph(def, opts) {
   const subgraphName = def.name;
   const schemaName = opts?.schemaName ?? pgSchemaName(subgraphName);
   await updateSubgraphStatus2(targetDb, subgraphName, "reindexing");
-  logger7.info("Reindex starting", { subgraph: subgraphName });
+  logger8.info("Reindex starting", { subgraph: subgraphName });
   try {
     const { fromBlock, toBlock } = await resolveBlockRange(source, def, opts);
     if (fromBlock > toBlock) {
-      logger7.info("No blocks to reindex", {
+      logger8.info("No blocks to reindex", {
         subgraph: subgraphName,
         fromBlock,
         toBlock
@@ -2991,7 +3035,7 @@ async function reindexSubgraph(def, opts) {
       await client.unsafe(stmt);
     }
     await updateSubgraphStatus2(targetDb, subgraphName, "reindexing", Math.max(0, fromBlock - 1));
-    logger7.info("Schema recreated for reindex", {
+    logger8.info("Schema recreated for reindex", {
       subgraph: subgraphName,
       cursorResetTo: Math.max(0, fromBlock - 1)
     });
@@ -3005,7 +3049,7 @@ async function reindexSubgraph(def, opts) {
       last_error_at: null,
       updated_at: new Date
     }).where("name", "=", subgraphName).execute();
-    logger7.info("Reindexing blocks", {
+    logger8.info("Reindexing blocks", {
       subgraph: subgraphName,
       fromBlock,
       toBlock,
@@ -3027,9 +3071,9 @@ async function reindexSubgraph(def, opts) {
       if (reason === "user-cancelled") {
         await updateSubgraphStatus2(targetDb, subgraphName, "active");
         await clearReindexMetadata(targetDb, subgraphName);
-        logger7.info("Reindex cancelled by user", { subgraph: subgraphName });
+        logger8.info("Reindex cancelled by user", { subgraph: subgraphName });
       } else {
-        logger7.info("Reindex interrupted by shutdown, will resume", {
+        logger8.info("Reindex interrupted by shutdown, will resume", {
           subgraph: subgraphName
         });
       }
@@ -3037,7 +3081,7 @@ async function reindexSubgraph(def, opts) {
     }
     await updateSubgraphStatus2(targetDb, subgraphName, "active", toBlock);
     await clearReindexMetadata(targetDb, subgraphName);
-    logger7.info("Reindex complete", {
+    logger8.info("Reindex complete", {
       subgraph: subgraphName,
       blocks: result.blocksProcessed,
       events: result.totalEventsProcessed,
@@ -3050,7 +3094,7 @@ async function reindexSubgraph(def, opts) {
     });
     return { processed: result.blocksProcessed };
   } catch (err) {
-    logger7.error("Reindex failed", {
+    logger8.error("Reindex failed", {
       subgraph: subgraphName,
       error: getErrorMessage3(err)
     });
@@ -3072,7 +3116,7 @@ async function resumeReindex(def, opts) {
   const fromBlock = resolveReindexResumeBlock(row);
   const toBlock = Number(row.reindex_to_block);
   if (fromBlock == null) {
-    logger7.info("No reindex metadata, starting fresh reindex", {
+    logger8.info("No reindex metadata, starting fresh reindex", {
       subgraph: subgraphName
     });
     return reindexSubgraph(def, {
@@ -3081,12 +3125,12 @@ async function resumeReindex(def, opts) {
     });
   }
   if (fromBlock > toBlock) {
-    logger7.info("Resume: no remaining blocks", { subgraph: subgraphName });
+    logger8.info("Resume: no remaining blocks", { subgraph: subgraphName });
     await updateSubgraphStatus2(targetDb, subgraphName, "active", toBlock);
     await clearReindexMetadata(targetDb, subgraphName);
     return { processed: 0 };
   }
-  logger7.info("Resuming reindex", {
+  logger8.info("Resuming reindex", {
     subgraph: subgraphName,
     fromBlock,
     toBlock,
@@ -3108,9 +3152,9 @@ async function resumeReindex(def, opts) {
       if (reason === "user-cancelled") {
         await updateSubgraphStatus2(targetDb, subgraphName, "active");
         await clearReindexMetadata(targetDb, subgraphName);
-        logger7.info("Resume cancelled by user", { subgraph: subgraphName });
+        logger8.info("Resume cancelled by user", { subgraph: subgraphName });
       } else {
-        logger7.info("Resume interrupted by shutdown, will resume again", {
+        logger8.info("Resume interrupted by shutdown, will resume again", {
           subgraph: subgraphName
         });
       }
@@ -3118,13 +3162,13 @@ async function resumeReindex(def, opts) {
     }
     await updateSubgraphStatus2(targetDb, subgraphName, "active", toBlock);
     await clearReindexMetadata(targetDb, subgraphName);
-    logger7.info("Resumed reindex complete", {
+    logger8.info("Resumed reindex complete", {
       subgraph: subgraphName,
       blocks: result.blocksProcessed
     });
     return { processed: result.blocksProcessed };
   } catch (err) {
-    logger7.error("Resumed reindex failed", {
+    logger8.error("Resumed reindex failed", {
       subgraph: subgraphName,
       error: getErrorMessage3(err)
     });
@@ -3135,7 +3179,7 @@ async function resumeReindex(def, opts) {
 async function backfillSubgraph(def, opts) {
   const targetDb = getTargetDb2();
   const subgraphName = def.name;
-  logger7.info("Backfill starting", {
+  logger8.info("Backfill starting", {
     subgraph: subgraphName,
     from: opts.fromBlock,
     to: opts.toBlock
@@ -3153,17 +3197,17 @@ async function backfillSubgraph(def, opts) {
       signal: opts.signal
     });
     if (result.aborted) {
-      logger7.info("Backfill aborted", { subgraph: subgraphName });
+      logger8.info("Backfill aborted", { subgraph: subgraphName });
       return { processed: result.blocksProcessed };
     }
     const resolved = await resolveGaps(targetDb, subgraphName, opts.fromBlock, opts.toBlock).catch(() => 0);
     if (resolved > 0) {
-      logger7.info("Resolved subgraph gaps via backfill", {
+      logger8.info("Resolved subgraph gaps via backfill", {
         subgraph: subgraphName,
         resolved
       });
     }
-    logger7.info("Backfill complete", {
+    logger8.info("Backfill complete", {
       subgraph: subgraphName,
       blocks: result.blocksProcessed,
       events: result.totalEventsProcessed,
@@ -3171,7 +3215,7 @@ async function backfillSubgraph(def, opts) {
     });
     return { processed: result.blocksProcessed };
   } catch (err) {
-    logger7.error("Backfill failed", {
+    logger8.error("Backfill failed", {
       subgraph: subgraphName,
       error: getErrorMessage3(err)
     });
@@ -3182,7 +3226,34 @@ async function backfillSubgraph(def, opts) {
 // src/runtime/catchup.ts
 import { getTargetDb as getTargetDb3 } from "@secondlayer/shared/db";
 import { getSubgraph } from "@secondlayer/shared/db/queries/subgraphs";
-import { logger as logger8 } from "@secondlayer/shared/logger";
+import { logger as logger9 } from "@secondlayer/shared/logger";
+
+// src/runtime/catchup-leader.ts
+import {
+  SUBGRAPH_CATCHUP_LOCK_KEY,
+  createPostgresLeaderBackend,
+  withLeaderLock
+} from "@secondlayer/shared/leader";
+import { targetListenerUrl } from "@secondlayer/shared/queue/listener";
+var catchUpLeader = false;
+function isCatchUpLeader() {
+  return catchUpLeader;
+}
+function startCatchUpLeader(opts = {}) {
+  return withLeaderLock(SUBGRAPH_CATCHUP_LOCK_KEY, async () => {
+    catchUpLeader = true;
+    await opts.onAcquire?.();
+    return () => {
+      catchUpLeader = false;
+    };
+  }, {
+    pollMs: opts.pollMs,
+    heartbeatMs: opts.heartbeatMs,
+    createBackend: opts.createBackend ?? (() => createPostgresLeaderBackend(targetListenerUrl()))
+  });
+}
+
+// src/runtime/catchup.ts
 var LOG_INTERVAL2 = 1000;
 var STANDARD_CATCHUP_BATCH_CONFIG = {
   defaultBatchSize: 500,
@@ -3289,7 +3360,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
     const subgraphStart = Number(subgraphRow.start_block) || 1;
     const startBlock = Math.max(lastProcessedBlock + 1, subgraphStart);
     const totalBlocks = chainTip - lastProcessedBlock;
-    logger8.info("Subgraph catch-up starting", {
+    logger9.info("Subgraph catch-up starting", {
       subgraph: subgraphName,
       from: startBlock,
       to: chainTip,
@@ -3304,9 +3375,16 @@ async function catchUpSubgraph(subgraph, subgraphName) {
     let prefetchedBatchEnd = Math.min(currentHeight + batchSize - 1, chainTip);
     let nextBatchPromise = batchConfig.prefetch ? source.loadBlockRange(currentHeight, prefetchedBatchEnd) : undefined;
     while (currentHeight <= chainTip) {
+      if (!isCatchUpLeader()) {
+        logger9.info("Lost catch-up leadership, stopping catch-up", {
+          subgraph: subgraphName,
+          processed
+        });
+        break;
+      }
       const currentRow = await getSubgraph(targetDb, subgraphName);
       if (!currentRow || currentRow.status !== "active") {
-        logger8.info("Subgraph status changed, stopping catch-up", {
+        logger9.info("Subgraph status changed, stopping catch-up", {
           subgraph: subgraphName,
           status: currentRow?.status ?? "deleted"
         });
@@ -3335,7 +3413,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
           blockData = (await source.loadBlockRange(height, height)).get(height);
         }
         if (!blockData) {
-          logger8.warn("Block missing during catch-up, deferring to next tick", {
+          logger9.warn("Block missing during catch-up, deferring to next tick", {
             subgraph: subgraphName,
             blockHeight: height
           });
@@ -3355,12 +3433,12 @@ async function catchUpSubgraph(subgraph, subgraphName) {
           });
         } catch (err) {
           if (err instanceof ReorgEpochChangedError) {
-            logger8.info("Reorg detected mid catch-up, aborting walk without writing further progress", { subgraph: subgraphName, blockHeight: height });
+            logger9.info("Reorg detected mid catch-up, aborting walk without writing further progress", { subgraph: subgraphName, blockHeight: height });
             stopCatchup = true;
             break;
           }
           const errorMsg = err instanceof Error ? err.message : String(err);
-          logger8.error("Block processing failed persistently during catch-up", {
+          logger9.error("Block processing failed persistently during catch-up", {
             subgraph: subgraphName,
             blockHeight: height,
             error: errorMsg
@@ -3379,7 +3457,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
           }
         }
         if (processed % LOG_INTERVAL2 === 0) {
-          logger8.info("Subgraph catch-up progress", {
+          logger9.info("Subgraph catch-up progress", {
             subgraph: subgraphName,
             processed,
             total: totalBlocks,
@@ -3395,7 +3473,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
       currentHeight = batchEnd + 1;
     }
     await stats.flush(targetDb);
-    logger8.info("Subgraph catch-up complete", {
+    logger9.info("Subgraph catch-up complete", {
       subgraph: subgraphName,
       processed
     });
@@ -3412,13 +3490,14 @@ import {
   listSubgraphs,
   resolveSubgraphRawClient
 } from "@secondlayer/shared/db/queries/subgraphs";
-import { logger as logger9 } from "@secondlayer/shared/logger";
+import { logger as logger10 } from "@secondlayer/shared/logger";
+import { sql as sql4 } from "kysely";
 async function handleSubgraphReorg(blockHeight, loadSubgraphDef) {
   const targetDb = getTargetDb4();
   const activeSubgraphs = (await listSubgraphs(targetDb)).filter((v) => v.status === "active");
   if (activeSubgraphs.length === 0)
     return;
-  logger9.info("Propagating reorg to subgraphs", {
+  logger10.info("Propagating reorg to subgraphs", {
     blockHeight,
     subgraphCount: activeSubgraphs.length
   });
@@ -3429,100 +3508,13 @@ async function handleSubgraphReorg(blockHeight, loadSubgraphDef) {
         continue;
       bumpReorgEpoch(sg.name);
       await withSubgraphBlockLock(sg.name, async () => {
-        const schemaName = sg.schema_name ?? pgSchemaName(sg.name);
-        const client = resolveSubgraphRawClient(sg);
-        const tableNames = Object.keys(schema);
-        const revertedByTable = {};
-        for (const tableName of tableNames) {
-          const rows = await client.unsafe(`SELECT * FROM "${schemaName}"."${tableName}" WHERE "_block_height" >= $1 LIMIT 1000`, [blockHeight]);
-          if (rows.length > 0)
-            revertedByTable[tableName] = rows;
-        }
-        const hasJournal = (await client.unsafe(`SELECT to_regclass('"${schemaName}"."_journal"') AS r`))[0]?.r;
-        if (hasJournal) {
-          await client.begin(async (tx) => {
-            for (const tableName of tableNames) {
-              const earliest = `
-								SELECT DISTINCT ON (row_key) row_key, prev_row
-								FROM "${schemaName}"."_journal"
-								WHERE block_height >= $1 AND table_name = $2
-								ORDER BY row_key, _jid ASC`;
-              await tx.unsafe(`DELETE FROM "${schemaName}"."${tableName}" t USING (${earliest}) e WHERE to_jsonb(t.*) @> e.row_key`, [blockHeight, tableName]);
-              await tx.unsafe(`DELETE FROM "${schemaName}"."${tableName}" WHERE "_block_height" >= $1`, [blockHeight]);
-              await tx.unsafe(`INSERT INTO "${schemaName}"."${tableName}"
-								 SELECT r.* FROM (${earliest}) e
-								 CROSS JOIN LATERAL jsonb_populate_record(NULL::"${schemaName}"."${tableName}", e.prev_row) r
-								 WHERE e.prev_row IS NOT NULL`, [blockHeight, tableName]);
-            }
-            await tx.unsafe(`DELETE FROM "${schemaName}"."_journal" WHERE block_height >= $1`, [blockHeight]);
-          });
-        } else {
-          logger9.warn("Subgraph has no revert journal — falling back to height delete (accumulator rows may lose history)", { subgraph: sg.name, blockHeight });
-          for (const tableName of tableNames) {
-            await client.unsafe(`DELETE FROM "${schemaName}"."${tableName}" WHERE "_block_height" >= $1`, [blockHeight]);
-          }
-        }
-        await client.unsafe(`DO $$ BEGIN
-						IF to_regclass('"${schemaName}"."_factory_addresses"') IS NOT NULL THEN
-							DELETE FROM "${schemaName}"."_factory_addresses" WHERE block_height >= ${Number(blockHeight)};
-						END IF;
-					END $$`);
-        for (const [tableName, rows] of Object.entries(revertedByTable)) {
-          if (rows.length === 0)
-            continue;
-          await targetDb.insertInto("subscription_outbox").columns([
-            "subscription_id",
-            "subgraph_name",
-            "table_name",
-            "block_height",
-            "event_type",
-            "payload",
-            "dedup_key",
-            "row_pk",
-            "status"
-          ]).expression((eb) => eb.selectFrom("subscriptions").select((eb2) => [
-            "id as subscription_id",
-            eb2.val(sg.name).as("subgraph_name"),
-            eb2.val(tableName).as("table_name"),
-            eb2.val(blockHeight).as("block_height"),
-            eb2.val(`${sg.name}.${tableName}.reverted`).as("event_type"),
-            eb2.val(JSON.stringify({
-              subgraph: sg.name,
-              table: tableName,
-              reorgFromHeight: blockHeight,
-              rows
-            })).as("payload"),
-            eb2.val(`reorg:${sg.name}:${tableName}:${blockHeight}`).as("dedup_key"),
-            eb2.val({
-              subgraph: sg.name,
-              table: tableName,
-              reorgRoot: blockHeight
-            }).as("row_pk"),
-            eb2.val("pending").as("status")
-          ]).where("subgraph_name", "=", sg.name).where("table_name", "=", tableName).where("status", "=", "active")).onConflict((oc) => oc.columns(["subscription_id", "dedup_key"]).doNothing()).execute().catch((err) => {
-            logger9.error("Failed to emit revert event for subscriptions", {
-              event: "reorg_revert_emit_dropped",
-              subgraph: sg.name,
-              table: tableName,
-              blockHeight,
-              error: getErrorMessage4(err)
-            });
-          });
-        }
-        logger9.info("Subgraph reorg cleanup done", {
-          subgraph: sg.name,
-          blockHeight,
-          tablesAffected: Object.keys(revertedByTable).length
-        });
-        const def = await loadSubgraphDef(sg);
-        await processBlock(def, sg.name, blockHeight);
-        logger9.info("Subgraph reorg reprocessed", {
-          subgraph: sg.name,
-          blockHeight
+        await getTargetDb4().transaction().execute(async (lockTx) => {
+          await sql4`SELECT pg_advisory_xact_lock(hashtext(${`subgraph-reorg:${sg.name}`}))`.execute(lockTx);
+          await reorgOneSubgraph(sg, schema, blockHeight, loadSubgraphDef);
         });
       });
     } catch (err) {
-      logger9.error("Subgraph reorg handling failed", {
+      logger10.error("Subgraph reorg handling failed", {
         subgraph: sg.name,
         blockHeight,
         error: getErrorMessage4(err)
@@ -3530,6 +3522,100 @@ async function handleSubgraphReorg(blockHeight, loadSubgraphDef) {
     }
   }
 }
+async function reorgOneSubgraph(sg, schema, blockHeight, loadSubgraphDef) {
+  const targetDb = getTargetDb4();
+  const schemaName = sg.schema_name ?? pgSchemaName(sg.name);
+  const client = resolveSubgraphRawClient(sg);
+  const tableNames = Object.keys(schema);
+  const revertedByTable = {};
+  for (const tableName of tableNames) {
+    const rows = await client.unsafe(`SELECT * FROM "${schemaName}"."${tableName}" WHERE "_block_height" >= $1 LIMIT 1000`, [blockHeight]);
+    if (rows.length > 0)
+      revertedByTable[tableName] = rows;
+  }
+  const hasJournal = (await client.unsafe(`SELECT to_regclass('"${schemaName}"."_journal"') AS r`))[0]?.r;
+  if (hasJournal) {
+    await client.begin(async (tx) => {
+      for (const tableName of tableNames) {
+        const earliest = `
+					SELECT DISTINCT ON (row_key) row_key, prev_row
+					FROM "${schemaName}"."_journal"
+					WHERE block_height >= $1 AND table_name = $2
+					ORDER BY row_key, _jid ASC`;
+        await tx.unsafe(`DELETE FROM "${schemaName}"."${tableName}" t USING (${earliest}) e WHERE to_jsonb(t.*) @> e.row_key`, [blockHeight, tableName]);
+        await tx.unsafe(`DELETE FROM "${schemaName}"."${tableName}" WHERE "_block_height" >= $1`, [blockHeight]);
+        await tx.unsafe(`INSERT INTO "${schemaName}"."${tableName}"
+					 SELECT r.* FROM (${earliest}) e
+					 CROSS JOIN LATERAL jsonb_populate_record(NULL::"${schemaName}"."${tableName}", e.prev_row) r
+					 WHERE e.prev_row IS NOT NULL`, [blockHeight, tableName]);
+      }
+      await tx.unsafe(`DELETE FROM "${schemaName}"."_journal" WHERE block_height >= $1`, [blockHeight]);
+    });
+  } else {
+    logger10.warn("Subgraph has no revert journal — falling back to height delete (accumulator rows may lose history)", { subgraph: sg.name, blockHeight });
+    for (const tableName of tableNames) {
+      await client.unsafe(`DELETE FROM "${schemaName}"."${tableName}" WHERE "_block_height" >= $1`, [blockHeight]);
+    }
+  }
+  await client.unsafe(`DO $$ BEGIN
+			IF to_regclass('"${schemaName}"."_factory_addresses"') IS NOT NULL THEN
+				DELETE FROM "${schemaName}"."_factory_addresses" WHERE block_height >= ${Number(blockHeight)};
+			END IF;
+		END $$`);
+  for (const [tableName, rows] of Object.entries(revertedByTable)) {
+    if (rows.length === 0)
+      continue;
+    await targetDb.insertInto("subscription_outbox").columns([
+      "subscription_id",
+      "subgraph_name",
+      "table_name",
+      "block_height",
+      "event_type",
+      "payload",
+      "dedup_key",
+      "row_pk",
+      "status"
+    ]).expression((eb) => eb.selectFrom("subscriptions").select((eb2) => [
+      "id as subscription_id",
+      eb2.val(sg.name).as("subgraph_name"),
+      eb2.val(tableName).as("table_name"),
+      eb2.val(blockHeight).as("block_height"),
+      eb2.val(`${sg.name}.${tableName}.reverted`).as("event_type"),
+      eb2.val(JSON.stringify({
+        subgraph: sg.name,
+        table: tableName,
+        reorgFromHeight: blockHeight,
+        rows
+      })).as("payload"),
+      eb2.val(`reorg:${sg.name}:${tableName}:${blockHeight}`).as("dedup_key"),
+      eb2.val({
+        subgraph: sg.name,
+        table: tableName,
+        reorgRoot: blockHeight
+      }).as("row_pk"),
+      eb2.val("pending").as("status")
+    ]).where("subgraph_name", "=", sg.name).where("table_name", "=", tableName).where("status", "=", "active")).onConflict((oc) => oc.columns(["subscription_id", "dedup_key"]).doNothing()).execute().catch((err) => {
+      logger10.error("Failed to emit revert event for subscriptions", {
+        event: "reorg_revert_emit_dropped",
+        subgraph: sg.name,
+        table: tableName,
+        blockHeight,
+        error: getErrorMessage4(err)
+      });
+    });
+  }
+  logger10.info("Subgraph reorg cleanup done", {
+    subgraph: sg.name,
+    blockHeight,
+    tablesAffected: Object.keys(revertedByTable).length
+  });
+  const def = await loadSubgraphDef(sg);
+  await processBlock(def, sg.name, blockHeight, { reorgRewind: true });
+  logger10.info("Subgraph reorg reprocessed", {
+    subgraph: sg.name,
+    blockHeight
+  });
+}
 
 // src/runtime/processor.ts
 import { randomUUID } from "node:crypto";
@@ -3555,42 +3641,17 @@ import {
   pgSchemaName as pgSchemaName2,
   updateSubgraphStatus as updateSubgraphStatus3
 } from "@secondlayer/shared/db/queries/subgraphs";
-import { logger as logger11 } from "@secondlayer/shared/logger";
+import { logger as logger12 } from "@secondlayer/shared/logger";
 import {
   listen,
   sourceListenerUrl,
   targetListenerUrl as targetListenerUrl2
 } from "@secondlayer/shared/queue/listener";
 
-// src/runtime/catchup-leader.ts
-import {
-  SUBGRAPH_CATCHUP_LOCK_KEY,
-  createPostgresLeaderBackend,
-  withLeaderLock
-} from "@secondlayer/shared/leader";
-import { targetListenerUrl } from "@secondlayer/shared/queue/listener";
-var catchUpLeader = false;
-function isCatchUpLeader() {
-  return catchUpLeader;
-}
-function startCatchUpLeader(opts = {}) {
-  return withLeaderLock(SUBGRAPH_CATCHUP_LOCK_KEY, async () => {
-    catchUpLeader = true;
-    await opts.onAcquire?.();
-    return () => {
-      catchUpLeader = false;
-    };
-  }, {
-    pollMs: opts.pollMs,
-    heartbeatMs: opts.heartbeatMs,
-    createBackend: opts.createBackend ?? (() => createPostgresLeaderBackend(targetListenerUrl()))
-  });
-}
-
 // src/runtime/streams-reorg-poll.ts
 import { getErrorMessage as getErrorMessage5 } from "@secondlayer/shared";
 import { IndexHttpClient as IndexHttpClient2 } from "@secondlayer/shared/index-http";
-import { logger as logger10 } from "@secondlayer/shared/logger";
+import { logger as logger11 } from "@secondlayer/shared/logger";
 var POLL_MS = Number(process.env.SUBGRAPH_REORG_POLL_MS) || 15000;
 var STARTUP_MARGIN_MS = 60 * 60 * 1000;
 async function pollReorgsOnce(http2, cursor, onReorg, handled) {
@@ -3598,13 +3659,13 @@ async function pollReorgsOnce(http2, cursor, onReorg, handled) {
   const sorted = [...reorgs].sort((a, b) => a.fork_point_height - b.fork_point_height);
   for (const r of sorted) {
     if (handled && r.id && handled.has(r.id)) {
-      logger10.info("Streams reorg already handled — skipping", {
+      logger11.info("Streams reorg already handled — skipping", {
         forkPointHeight: r.fork_point_height,
         reorgId: r.id
       });
       continue;
     }
-    logger10.info("Streams reorg — rewinding", {
+    logger11.info("Streams reorg — rewinding", {
       forkPointHeight: r.fork_point_height
     });
     await onReorg(r.fork_point_height);
@@ -3632,7 +3693,7 @@ function startStreamsReorgPoll(onReorg) {
     try {
       since = await pollReorgsOnce(http2, since, onReorg, handled);
     } catch (err) {
-      logger10.error("Streams reorg poll failed", {
+      logger11.error("Streams reorg poll failed", {
         error: getErrorMessage5(err)
       });
     }
@@ -3640,7 +3701,7 @@ function startStreamsReorgPoll(onReorg) {
       timer = setTimeout(tick, POLL_MS);
   };
   timer = setTimeout(tick, POLL_MS);
-  logger10.info("Streams reorg poll started", { pollMs: POLL_MS });
+  logger11.info("Streams reorg poll started", { pollMs: POLL_MS });
   return () => {
     running = false;
     if (timer)
@@ -3671,7 +3732,7 @@ async function catchUpAll(subgraphs, db, concurrency) {
         if (isHandlerNotFoundError(err)) {
           await updateSubgraphStatus3(db, sg.name, "error");
         }
-        logger11.error("Subgraph catch-up failed", {
+        logger12.error("Subgraph catch-up failed", {
           subgraph: sg.name,
           error: msg
         });
@@ -3711,7 +3772,7 @@ async function loadSubgraphDefinition(sg) {
   definitionCache.set(sg.name, def);
   if (prevVersion && prevVersion !== sg.version) {
     invalidateSubgraphRoute(sg.name);
-    logger11.info("Subgraph handler reloaded", {
+    logger12.info("Subgraph handler reloaded", {
       subgraph: sg.name,
       from: prevVersion,
       to: sg.version
@@ -3745,7 +3806,7 @@ async function synthesizeLegacyReindexOperations() {
         fromBlock: sg.reindex_from_block == null ? undefined : Number(sg.reindex_from_block),
         toBlock: sg.reindex_to_block == null ? undefined : Number(sg.reindex_to_block)
       });
-      logger11.info("Queued legacy reindex resume operation", {
+      logger12.info("Queued legacy reindex resume operation", {
         subgraph: sg.name
       });
     } catch (err) {
@@ -3808,7 +3869,7 @@ async function startSubgraphOperationRunner(opts) {
   const activeRuns = new Map;
   let running = true;
   let draining = false;
-  logger11.info("Starting subgraph operation runner", { concurrency, lockedBy });
+  logger12.info("Starting subgraph operation runner", { concurrency, lockedBy });
   try {
     const stranded = await db.selectFrom("subgraphs").select(["id", "name", "account_id"]).where("status", "=", "reindexing").where("reindex_from_block", "is not", null).where("reindex_to_block", "is not", null).where(({ not, exists, selectFrom }) => not(exists(selectFrom("subgraph_operations").select("id").whereRef("subgraph_id", "=", "subgraphs.id").where("status", "in", ["queued", "running"])))).execute();
     for (const row of stranded) {
@@ -3819,14 +3880,14 @@ async function startSubgraphOperationRunner(opts) {
           accountId: row.account_id,
           kind: "reindex"
         });
-        logger11.info("Re-enqueued stranded reindex", { subgraph: row.name });
+        logger12.info("Re-enqueued stranded reindex", { subgraph: row.name });
       } catch (err) {
         if (!isActiveSubgraphOperationConflict(err))
           throw err;
       }
     }
   } catch (err) {
-    logger11.warn("Stranded-reindex sweep failed", {
+    logger12.warn("Stranded-reindex sweep failed", {
       error: getErrorMessage6(err)
     });
   }
@@ -3837,7 +3898,7 @@ async function startSubgraphOperationRunner(opts) {
       if (!running)
         return;
       heartbeatSubgraphOperation(db, operation.id, lockedBy).catch((err) => {
-        logger11.warn("Subgraph operation heartbeat failed", {
+        logger12.warn("Subgraph operation heartbeat failed", {
           operationId: operation.id,
           error: getErrorMessage6(err)
         });
@@ -3849,7 +3910,7 @@ async function startSubgraphOperationRunner(opts) {
           controller.abort("user-cancelled");
         }
       }).catch((err) => {
-        logger11.warn("Subgraph operation cancel poll failed", {
+        logger12.warn("Subgraph operation cancel poll failed", {
           operationId: operation.id,
           error: getErrorMessage6(err)
         });
@@ -3866,14 +3927,14 @@ async function startSubgraphOperationRunner(opts) {
         const reason = String(controller.signal.reason ?? "");
         if (controller.signal.aborted && reason === "user-cancelled") {
           await cancelSubgraphOperation(db, operation.id, lockedBy, processed);
-          logger11.info("Subgraph operation cancelled", {
+          logger12.info("Subgraph operation cancelled", {
             operationId: operation.id,
             subgraph: operation.subgraph_name
           });
           return;
         }
         if (controller.signal.aborted) {
-          logger11.info("Subgraph operation interrupted", {
+          logger12.info("Subgraph operation interrupted", {
             operationId: operation.id,
             subgraph: operation.subgraph_name,
             reason
@@ -3881,7 +3942,7 @@ async function startSubgraphOperationRunner(opts) {
           return;
         }
         await completeSubgraphOperation(db, operation.id, lockedBy, processed);
-        logger11.info("Subgraph operation completed", {
+        logger12.info("Subgraph operation completed", {
           operationId: operation.id,
           subgraph: operation.subgraph_name,
           processed
@@ -3889,7 +3950,7 @@ async function startSubgraphOperationRunner(opts) {
       } catch (err) {
         const reason = String(controller.signal.reason ?? "");
         if (controller.signal.aborted && reason === "shutdown") {
-          logger11.info("Subgraph operation interrupted by shutdown", {
+          logger12.info("Subgraph operation interrupted by shutdown", {
             operationId: operation.id,
             subgraph: operation.subgraph_name
           });
@@ -3900,7 +3961,7 @@ async function startSubgraphOperationRunner(opts) {
           return;
         }
         await failSubgraphOperation(db, operation.id, lockedBy, getErrorMessage6(err), processed);
-        logger11.error("Subgraph operation failed", {
+        logger12.error("Subgraph operation failed", {
           operationId: operation.id,
           subgraph: operation.subgraph_name,
           error: getErrorMessage6(err)
@@ -3947,13 +4008,13 @@ async function startSubgraphOperationRunner(opts) {
       controller.abort("shutdown");
     }
     await Promise.allSettled(activeRuns.values());
-    logger11.info("Subgraph operation runner stopped");
+    logger12.info("Subgraph operation runner stopped");
   };
 }
 async function startSubgraphProcessor(opts) {
   const concurrency = opts?.concurrency ?? DEFAULT_CONCURRENCY;
   let running = true;
-  logger11.info("Starting subgraph processor", { concurrency });
+  logger12.info("Starting subgraph processor", { concurrency });
   const stopOperations = await startSubgraphOperationRunner({
     concurrency: Number.parseInt(process.env.SUBGRAPH_OPERATION_CONCURRENCY ?? String(DEFAULT_OPERATION_CONCURRENCY))
   });
@@ -3979,7 +4040,7 @@ async function startSubgraphProcessor(opts) {
         await handleSubgraphReorg(blockHeight, loadSubgraphDefinition);
       }
     } catch (err) {
-      logger11.error("Subgraph reorg handling failed", {
+      logger12.error("Subgraph reorg handling failed", {
         error: getErrorMessage6(err)
       });
     }
@@ -3988,7 +4049,7 @@ async function startSubgraphProcessor(opts) {
     runCatchUp();
   }, POLL_INTERVAL_MS);
   const stopStreamsReorgPoll = process.env.SUBGRAPH_SOURCE === "streams-index" ? startStreamsReorgPoll((forkHeight) => handleSubgraphReorg(forkHeight, loadSubgraphDefinition)) : undefined;
-  logger11.info("Subgraph processor ready");
+  logger12.info("Subgraph processor ready");
   return async () => {
     running = false;
     clearInterval(pollInterval);
@@ -3997,21 +4058,21 @@ async function startSubgraphProcessor(opts) {
     await stopReorgListening();
     stopStreamsReorgPoll?.();
     await stopOperations();
-    logger11.info("Subgraph processor stopped");
+    logger12.info("Subgraph processor stopped");
   };
 }
 
 // src/service.ts
 import { assertDbSplit, getDb } from "@secondlayer/shared/db";
-import { logger as logger12 } from "@secondlayer/shared/logger";
-import { sql as sql4 } from "kysely";
+import { logger as logger13 } from "@secondlayer/shared/logger";
+import { sql as sql5 } from "kysely";
 var HEARTBEAT_INTERVAL_MS2 = 30000;
 var SERVICE_NAME = "subgraph-processor";
 async function writeHeartbeat() {
   try {
-    await getDb().insertInto("service_heartbeats").values({ name: SERVICE_NAME }).onConflict((oc) => oc.column("name").doUpdateSet({ updated_at: sql4`now()` })).execute();
+    await getDb().insertInto("service_heartbeats").values({ name: SERVICE_NAME }).onConflict((oc) => oc.column("name").doUpdateSet({ updated_at: sql5`now()` })).execute();
   } catch (err) {
-    logger12.warn("subgraph-processor heartbeat write failed", {
+    logger13.warn("subgraph-processor heartbeat write failed", {
       error: err instanceof Error ? err.message : String(err)
     });
   }
@@ -4023,7 +4084,7 @@ var processor = await startSubgraphProcessor({
 await writeHeartbeat();
 var heartbeatInterval = setInterval(writeHeartbeat, HEARTBEAT_INTERVAL_MS2);
 var shutdown = async () => {
-  logger12.info("Shutting down subgraph processor...");
+  logger13.info("Shutting down subgraph processor...");
   clearInterval(heartbeatInterval);
   await processor();
   process.exit(0);
@@ -4031,5 +4092,5 @@ var shutdown = async () => {
 process.on("SIGINT", shutdown);
 process.on("SIGTERM", shutdown);
 
-//# debugId=12163624A2820BC464756E2164756E21
+//# debugId=77535A6AB51F4C4C64756E2164756E21
 //# sourceMappingURL=service.js.map