@secondlayer/subgraphs 4.1.5 → 4.2.0

package/dist/src/runtime/reorg.js

@@ -1212,7 +1212,7 @@ function matchSources(sources, transactions, events, traitContracts = new Map, f
 
 // src/runtime/runner.ts
 import { getErrorMessage } from "@secondlayer/shared";
-import { logger as logger3 } from "@secondlayer/shared/logger";
+import { logger as logger4 } from "@secondlayer/shared/logger";
 import {
   clarityValueToJS,
   deserializeCV as deserializeCV4,
@@ -1226,6 +1226,19 @@ import {
 function camelizeDataKey(str) {
   return str.replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase());
 }
+function camelizeKeys(obj) {
+  if (obj === null || obj === undefined)
+    return obj;
+  if (typeof obj !== "object")
+    return obj;
+  if (Array.isArray(obj))
+    return obj.map(camelizeKeys);
+  const result = {};
+  for (const [k, v] of Object.entries(obj)) {
+    result[camelizeDataKey(k)] = camelizeKeys(v);
+  }
+  return result;
+}
 function cvToTree(cv) {
   switch (cv.type) {
     case "uint":
@@ -1550,6 +1563,58 @@ function inferPrintTopics(samples) {
   return out.sort((a, b) => b.count - a.count);
 }
 
+// src/runtime/materialize.ts
+function resolveColumn(col, event, tx, block) {
+  if ("fromTx" in col) {
+    return { ok: true, value: tx[col.fromTx] };
+  }
+  if ("fromBlock" in col) {
+    return { ok: true, value: block[col.fromBlock] };
+  }
+  const data = event.data;
+  const dataObj = data !== null && typeof data === "object" && !Array.isArray(data) ? data : undefined;
+  if (dataObj && Object.prototype.hasOwnProperty.call(dataObj, col.from)) {
+    return { ok: true, value: dataObj[col.from] };
+  }
+  if (col.from === "topic" && "topic" in event) {
+    return { ok: true, value: event.topic };
+  }
+  if (Object.prototype.hasOwnProperty.call(event, col.from)) {
+    return { ok: true, value: event[col.from] };
+  }
+  return { ok: false, missing: col.from };
+}
+function buildMaterializeRow(spec, event, ctx, tableColumns) {
+  const row = {};
+  for (const [colName, mapping] of Object.entries(spec.columns)) {
+    const resolved = resolveColumn(mapping, event, ctx.tx, ctx.block);
+    if (!resolved.ok) {
+      const colDef = tableColumns[colName];
+      if (colDef?.nullable) {
+        row[colName] = null;
+        continue;
+      }
+      return {
+        ok: false,
+        reason: `required materialize field "${resolved.missing}" missing for column "${colName}"`
+      };
+    }
+    row[colName] = resolved.value ?? null;
+  }
+  return { ok: true, row };
+}
+function applyMaterializeInsert(spec, event, ctx, schema) {
+  const table = schema[spec.table];
+  if (!table) {
+    return { ok: false, reason: `materialize table "${spec.table}" missing` };
+  }
+  const built = buildMaterializeRow(spec, event, ctx, table.columns);
+  if (!built.ok)
+    return built;
+  ctx.insert(spec.table, built.row);
+  return { ok: true };
+}
+
 // src/runtime/print-validate.ts
 var COLUMN_TYPES = new Set([
   "text",
@@ -1629,21 +1694,62 @@ function validatePrintPayload(prints, topic, data) {
   return matchesTopic(declared, data);
 }
 
-// src/runtime/runner.ts
-var DEFAULT_ERROR_THRESHOLD = 50;
-function camelizeKeys(obj) {
-  if (obj === null || obj === undefined)
-    return obj;
-  if (typeof obj !== "object")
-    return obj;
-  if (Array.isArray(obj))
-    return obj.map(camelizeKeys);
-  const result = {};
-  for (const [k, v] of Object.entries(obj)) {
-    result[camelizeDataKey(k)] = camelizeKeys(v);
+// src/runtime/violations.ts
+import { getTargetDb } from "@secondlayer/shared/db";
+import { logger as logger3 } from "@secondlayer/shared/logger";
+import { sql as sql2 } from "kysely";
+var VIOLATIONS_CAP_PER_SUBGRAPH = 100;
+function jsonSafe2(value) {
+  if (typeof value === "bigint")
+    return value.toString();
+  if (value === null || value === undefined)
+    return value;
+  if (Array.isArray(value))
+    return value.map(jsonSafe2);
+  if (typeof value === "object") {
+    const out = {};
+    for (const [k, v] of Object.entries(value)) {
+      out[k] = jsonSafe2(v);
+    }
+    return out;
   }
-  return result;
+  return value;
 }
+async function defaultRecordPrintViolation(input) {
+  try {
+    const db = getTargetDb();
+    const sample = jsonSafe2(input.samplePayload);
+    await db.insertInto("subgraph_violations").values({
+      subgraph_name: input.subgraphName,
+      source_name: input.sourceName,
+      block_height: input.blockHeight,
+      tx_id: input.txId,
+      reason: input.reason,
+      sample_payload: sample
+    }).execute();
+    await sql2`
+			DELETE FROM subgraph_violations
+			WHERE id IN (
+				SELECT id FROM subgraph_violations
+				WHERE subgraph_name = ${input.subgraphName}
+				ORDER BY seen_at DESC
+				OFFSET ${VIOLATIONS_CAP_PER_SUBGRAPH}
+			)
+		`.execute(db);
+  } catch (err) {
+    logger3.warn("Failed to record print violation", {
+      subgraph: input.subgraphName,
+      error: err instanceof Error ? err.message : String(err)
+    });
+  }
+}
+var recorder = defaultRecordPrintViolation;
+async function recordPrintViolation(input) {
+  await recorder(input);
+}
+
+// src/runtime/runner.ts
+var DEFAULT_ERROR_THRESHOLD = 50;
 function decodeFunctionArgs2(args) {
   let parsed = args;
   if (typeof parsed === "string") {
@@ -1891,16 +1997,18 @@ 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) {
-      logger3.error("Subgraph error threshold reached, skipping remaining events", {
+      logger4.error("Subgraph error threshold reached, skipping remaining events", {
         subgraph: subgraph.name,
         errors,
         threshold
       });
       return { processed, errors, ...skipped > 0 ? { skipped } : {} };
     }
+    const filter = filterLookup.get(sourceName);
+    const materialize = filter && "materialize" in filter && filter.materialize !== undefined ? filter.materialize : undefined;
     const handler = subgraph.handlers[sourceName] ?? subgraph.handlers["*"] ?? null;
-    if (!handler) {
-      logger3.warn("No handler found for source", {
+    if (!handler && !materialize) {
+      logger4.warn("No handler found for source", {
         subgraph: subgraph.name,
         sourceName,
         txId: tx.tx_id
@@ -1915,7 +2023,6 @@ async function runHandlers(subgraph, matched, ctx, opts) {
       contractId: tx.contract_id ?? null,
       functionName: tx.function_name ?? null
     });
-    const filter = filterLookup.get(sourceName);
     const checkpoint = ctx.opsCheckpoint();
     try {
       let payload;
@@ -1957,22 +2064,48 @@ async function runHandlers(subgraph, matched, ctx, opts) {
         const verdict = validatePrintPayload(filter.prints, printPayload.topic ?? "", printPayload.data ?? {});
         if (!verdict.ok) {
           skipped++;
-          logger3.warn("Print payload does not match declared prints schema", {
+          logger4.warn("Print payload does not match declared prints schema", {
             subgraph: subgraph.name,
             sourceName,
             topic: printPayload.topic,
             txId: tx.tx_id,
             reason: verdict.reason
           });
+          recordPrintViolation({
+            subgraphName: subgraph.name,
+            sourceName,
+            blockHeight: ctx.block.height,
+            txId: tx.tx_id,
+            reason: verdict.reason,
+            samplePayload: {
+              topic: printPayload.topic ?? "",
+              data: printPayload.data ?? {}
+            }
+          });
+          continue;
+        }
+      }
+      if (materialize) {
+        const result = applyMaterializeInsert(materialize, payload, ctx, subgraph.schema);
+        if (!result.ok) {
+          skipped++;
+          logger4.warn("Materialize skipped: required field missing", {
+            subgraph: subgraph.name,
+            sourceName,
+            txId: tx.tx_id,
+            reason: result.reason
+          });
           continue;
         }
+        processed++;
+      } else if (handler) {
+        await handler(payload, ctx);
+        processed++;
       }
-      await handler(payload, ctx);
-      processed++;
     } catch (err) {
       ctx.rollbackTo(checkpoint);
       errors++;
-      logger3.error("Subgraph handler error", {
+      logger4.error("Subgraph handler error", {
         subgraph: subgraph.name,
         sourceName,
         txId: tx.tx_id,
@@ -1985,7 +2118,7 @@ async function runHandlers(subgraph, matched, ctx, opts) {
 }
 
 // src/runtime/block-processor.ts
-import { getTargetDb } from "@secondlayer/shared/db";
+import { getTargetDb as getTargetDb2 } from "@secondlayer/shared/db";
 import { resolveTraitContractIds } from "@secondlayer/shared/db/queries/contracts";
 import { recordGapBatch } from "@secondlayer/shared/db/queries/subgraph-gaps";
 import { advanceOperationCursor } from "@secondlayer/shared/db/queries/subgraph-operations";
@@ -1996,15 +2129,15 @@ import {
   rewindLiveProgress,
   updateSubgraphStatus
 } from "@secondlayer/shared/db/queries/subgraphs";
-import { logger as logger7 } from "@secondlayer/shared/logger";
-import { sql as sql3 } from "kysely";
+import { logger as logger8 } from "@secondlayer/shared/logger";
+import { sql as sql4 } from "kysely";
 
 // src/runtime/block-source.ts
 import { getSourceDb as getSourceDb2 } from "@secondlayer/shared/db";
 import {
   createInternalIndexHttpClient
 } from "@secondlayer/shared/index-http";
-import { logger as logger4 } from "@secondlayer/shared/logger";
+import { logger as logger5 } from "@secondlayer/shared/logger";
 
 // src/runtime/batch-loader.ts
 async function loadBlockRange(db, fromHeight, toHeight) {
@@ -2491,7 +2624,7 @@ class FallbackBlockSource {
     try {
       return await this.primary.getTip();
     } catch (err) {
-      logger4.warn("block source primary getTip failed — using DB tap", {
+      logger5.warn("block source primary getTip failed — using DB tap", {
         error: err instanceof Error ? err.message : String(err)
       });
       return this.fallback.getTip();
@@ -2501,7 +2634,7 @@ class FallbackBlockSource {
     try {
       return await this.primary.loadBlockRange(fromHeight, toHeight);
     } catch (err) {
-      logger4.warn("block source primary loadBlockRange failed — using DB tap", {
+      logger5.warn("block source primary loadBlockRange failed — using DB tap", {
         from: fromHeight,
         to: toHeight,
         error: err instanceof Error ? err.message : String(err)
@@ -2538,7 +2671,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) {
-    logger4.debug("Subgraph not streams-index eligible, using DB tap", {
+    logger5.debug("Subgraph not streams-index eligible, using DB tap", {
       subgraph: subgraph.name
     });
   }
@@ -2547,7 +2680,7 @@ function resolveBlockSource(subgraph) {
 
 // src/runtime/outbox-emit.ts
 import { createHash as createHash2 } from "node:crypto";
-import { logger as logger5 } from "@secondlayer/shared/logger";
+import { logger as logger6 } from "@secondlayer/shared/logger";
 var loggedKillSwitch = false;
 var OP_VERB = {
   insert: "created",
@@ -2571,7 +2704,7 @@ function stableStringify(obj) {
 async function emitSubscriptionOutbox(tx, subgraphName, manifest, matcher, blockHeight) {
   if (!isEmitOutboxEnabled()) {
     if (!loggedKillSwitch) {
-      logger5.warn("SECONDLAYER_EMIT_OUTBOX=false — outbox emission bypassed");
+      logger6.warn("SECONDLAYER_EMIT_OUTBOX=false — outbox emission bypassed");
       loggedKillSwitch = true;
     }
     return 0;
@@ -2616,7 +2749,7 @@ function sandboxEnabled(subgraph) {
 // src/runtime/sandbox/host.ts
 import { tmpdir } from "node:os";
 import { fileURLToPath } from "node:url";
-import { logger as logger6 } from "@secondlayer/shared/logger";
+import { logger as logger7 } from "@secondlayer/shared/logger";
 
 // src/runtime/sandbox/bundle.ts
 import esbuild from "esbuild";
@@ -2696,7 +2829,7 @@ function spawnSandboxProcess() {
           break;
         const text = decoder.decode(value, { stream: true });
         if (text.trim()) {
-          logger6.warn("Sandbox subprocess stderr", { stderr: text.trim() });
+          logger7.warn("Sandbox subprocess stderr", { stderr: text.trim() });
         }
       }
     } catch {}
@@ -2754,7 +2887,7 @@ async function ensureSandboxProcess(subgraphName, version, handlerCode) {
     try {
       await initSandboxProcess(existing.proc, subgraphName, version, handlerCode);
       existing.version = version;
-      logger6.info("Sandbox subprocess handler reloaded", {
+      logger7.info("Sandbox subprocess handler reloaded", {
         subgraph: subgraphName,
         version
       });
@@ -2762,7 +2895,7 @@ async function ensureSandboxProcess(subgraphName, version, handlerCode) {
     } catch (err) {
       existing.proc.kill();
       pool.delete(subgraphName);
-      logger6.warn("Sandbox subprocess re-init failed; respawning", {
+      logger7.warn("Sandbox subprocess re-init failed; respawning", {
         subgraph: subgraphName,
         error: err instanceof Error ? err.message : String(err)
       });
@@ -2845,7 +2978,7 @@ async function runBlockThroughProcess(entry, subgraphName, hostCtx, block, match
     return result;
   } catch (err) {
     evictSandboxWorker(subgraphName);
-    logger6.warn("Sandbox subprocess run failed; subprocess evicted", {
+    logger7.warn("Sandbox subprocess run failed; subprocess evicted", {
       subgraph: subgraphName,
       blockHeight: block.height,
       error: err instanceof Error ? err.message : String(err)
@@ -2916,7 +3049,7 @@ async function answerRead(hostCtx, msg) {
 
 // src/runtime/subscription-state.ts
 import { listSubscriptions } from "@secondlayer/shared/db/queries/subscriptions";
-import { sql as sql2 } from "kysely";
+import { sql as sql3 } from "kysely";
 
 // src/runtime/emitter-matcher.ts
 function isPrimitive(v) {
@@ -3080,7 +3213,7 @@ class SubscriptionMatcher {
 // src/runtime/subscription-state.ts
 var matcher = new SubscriptionMatcher;
 async function refreshMatcher(db) {
-  const rows = await sql2`
+  const rows = await sql3`
 		SELECT * FROM subscriptions WHERE status = 'active'
 	`.execute(db);
   matcher.setAll(rows.rows);
@@ -3102,7 +3235,7 @@ async function resolveRoute(subgraphName, targetDb) {
     version: row?.version ?? ""
   };
   routeCache.set(subgraphName, route);
-  logger7.info("subgraph handler dispatch path resolved", {
+  logger8.info("subgraph handler dispatch path resolved", {
     subgraph: subgraphName,
     path: sandboxEnabled({ sandbox_workers: route.sandboxWorkers }) ? "sandbox" : "in-process"
   });
@@ -3126,8 +3259,8 @@ async function resolveFactoryContracts(subgraph, blockHeight, schemaName, db, tx
   for (const [discoveringSource, factory] of factories) {
     const known = new Set;
     try {
-      const rows = await sql3`
-				SELECT address FROM ${sql3.raw(`"${schemaName}"."_factory_addresses"`)}
+      const rows = await sql4`
+				SELECT address FROM ${sql4.raw(`"${schemaName}"."_factory_addresses"`)}
 				WHERE source_name = ${discoveringSource} AND block_height <= ${blockHeight}
 			`.execute(db);
       for (const row of rows.rows)
@@ -3155,8 +3288,8 @@ async function persistFactoryDiscoveries(schemaName, db, blockHeight, discovered
   if (discovered.length === 0)
     return;
   for (const { sourceName, address } of discovered) {
-    await sql3`
-			INSERT INTO ${sql3.raw(`"${schemaName}"."_factory_addresses"`)}
+    await sql4`
+			INSERT INTO ${sql4.raw(`"${schemaName}"."_factory_addresses"`)}
 				(source_name, address, block_height)
 			VALUES (${sourceName}, ${address}, ${blockHeight})
 			ON CONFLICT (source_name, address) DO NOTHING
@@ -3216,7 +3349,7 @@ async function processBlockWithRetry(subgraph, subgraphName, blockHeight, opts,
       const delay = retryDelaysMs[attempt];
       if (delay === undefined)
         break;
-      logger7.warn("Block processing failed, retrying", {
+      logger8.warn("Block processing failed, retrying", {
         subgraph: subgraphName,
         blockHeight,
         attempt: attempt + 1,
@@ -3229,7 +3362,7 @@ async function processBlockWithRetry(subgraph, subgraphName, blockHeight, opts,
   throw lastError;
 }
 async function processBlock(subgraph, subgraphName, blockHeight, opts) {
-  const targetDb = getTargetDb();
+  const targetDb = getTargetDb2();
   const blockStart = performance.now();
   const result = {
     blockHeight,
@@ -3248,7 +3381,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   } else {
     const data = (await resolveBlockSource(subgraph).loadBlockRange(blockHeight, blockHeight)).get(blockHeight);
     if (!data) {
-      logger7.debug("Block not found or non-canonical for subgraph processing", {
+      logger8.debug("Block not found or non-canonical for subgraph processing", {
         subgraph: subgraphName,
         blockHeight
       });
@@ -3314,7 +3447,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
           { start: blockHeight, end: blockHeight, reason: "processing_error" }
         ]);
       } else {
-        logger7.warn("Block errors not recorded as a gap — no subgraphId", {
+        logger8.warn("Block errors not recorded as a gap — no subgraphId", {
           subgraph: subgraphName,
           blockHeight,
           errors: rr.errors
@@ -3387,7 +3520,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     });
   } catch (err) {
     if (err instanceof CursorRaceLostError || err instanceof LiveCursorRaceLostError) {
-      logger7.warn("cursor race lost — block already covered", {
+      logger8.warn("cursor race lost — block already covered", {
         subgraph: subgraphName,
         blockHeight,
         error: err.message
@@ -3412,10 +3545,10 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     try {
       const tables = Object.keys(subgraph.schema);
       for (const table of tables) {
-        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 { rows } = await sql4.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) {
-          logger7.warn("Subgraph table exceeds 10M rows (estimate)", {
+          logger8.warn("Subgraph table exceeds 10M rows (estimate)", {
             subgraph: subgraphName,
             table,
             count
@@ -3423,13 +3556,13 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
         }
       }
     } catch (err) {
-      logger7.debug("Row count sample failed", {
+      logger8.debug("Row count sample failed", {
         subgraph: subgraphName,
         error: err instanceof Error ? err.message : String(err)
       });
     }
     if (journalEnabled(opts)) {
-      await sql3.raw(`DELETE FROM "${schemaName}"."_journal" WHERE "block_height" < ${blockHeight - JOURNAL_RETENTION_BLOCKS}`).execute(route.dataDb).catch(() => {});
+      await sql4.raw(`DELETE FROM "${schemaName}"."_journal" WHERE "block_height" < ${blockHeight - JOURNAL_RETENTION_BLOCKS}`).execute(route.dataDb).catch(() => {});
     }
   }
   return result;
@@ -3499,9 +3632,9 @@ class StatsAccumulator {
 }
 
 // src/runtime/catchup.ts
-import { getTargetDb as getTargetDb2, sql as sql4 } from "@secondlayer/shared/db";
+import { getTargetDb as getTargetDb3, sql as sql5 } 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 {
@@ -3631,8 +3764,8 @@ async function withSubgraphBlockLock(name, fn) {
   }
 }
 async function withSubgraphBlockAdvisoryLock(name, fn) {
-  return getTargetDb2().transaction().execute(async (lockTx) => {
-    await sql4`SELECT pg_advisory_xact_lock(hashtext(${`subgraph-block:${name}`}))`.execute(lockTx);
+  return getTargetDb3().transaction().execute(async (lockTx) => {
+    await sql5`SELECT pg_advisory_xact_lock(hashtext(${`subgraph-block:${name}`}))`.execute(lockTx);
     return fn();
   });
 }
@@ -3693,7 +3826,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
   catchingUp.add(subgraphName);
   try {
     const source = resolveBlockSource(subgraph);
-    const targetDb = getTargetDb2();
+    const targetDb = getTargetDb3();
     const subgraphRow = await getSubgraph(targetDb, subgraphName);
     if (!subgraphRow)
       return 0;
@@ -3705,7 +3838,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
     if (usesDecodedIndexPlane(subgraph)) {
       const bound = await boundSourceTip(rawTip, decoderNamesForSubgraph(subgraph));
       if (!bound.ok) {
-        logger8.warn("Subgraph catch-up stalled: missing decoder checkpoint", {
+        logger9.warn("Subgraph catch-up stalled: missing decoder checkpoint", {
           event: "subgraph_catchup_decoder_stall",
           subgraph: subgraphName,
           missing: bound.missing
@@ -3713,7 +3846,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
         return 0;
       }
       if (bound.floor !== null && bound.floor < rawTip) {
-        logger8.debug("Subgraph catch-up tip bounded by decoder progress", {
+        logger9.debug("Subgraph catch-up tip bounded by decoder progress", {
           event: "subgraph_catchup_decoder_floor",
           subgraph: subgraphName,
           rawTip,
@@ -3728,7 +3861,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,
@@ -3744,7 +3877,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
     let nextBatchPromise = batchConfig.prefetch ? source.loadBlockRange(currentHeight, prefetchedBatchEnd) : undefined;
     while (currentHeight <= chainTip) {
       if (!isCatchUpLeader()) {
-        logger8.info("Lost catch-up leadership, stopping catch-up", {
+        logger9.info("Lost catch-up leadership, stopping catch-up", {
           subgraph: subgraphName,
           processed
         });
@@ -3752,7 +3885,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
       }
       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"
         });
@@ -3781,7 +3914,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
           });
@@ -3802,12 +3935,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
@@ -3826,7 +3959,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
           }
         }
         if (processed % LOG_INTERVAL === 0) {
-          logger8.info("Subgraph catch-up progress", {
+          logger9.info("Subgraph catch-up progress", {
             subgraph: subgraphName,
             processed,
             total: totalBlocks,
@@ -3842,7 +3975,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
     });
@@ -3854,16 +3987,16 @@ async function catchUpSubgraph(subgraph, subgraphName) {
 
 // src/runtime/reorg.ts
 import { getErrorMessage as getErrorMessage2 } from "@secondlayer/shared";
-import { getRawClient, getTargetDb as getTargetDb3 } from "@secondlayer/shared/db";
+import { getRawClient, getTargetDb as getTargetDb4 } from "@secondlayer/shared/db";
 import { listSubgraphs } from "@secondlayer/shared/db/queries/subgraphs";
-import { logger as logger9 } from "@secondlayer/shared/logger";
-import { sql as sql5 } from "kysely";
+import { logger as logger10 } from "@secondlayer/shared/logger";
+import { sql as sql6 } from "kysely";
 async function handleSubgraphReorg(blockHeight, loadSubgraphDef) {
-  const targetDb = getTargetDb3();
+  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
   });
@@ -3874,13 +4007,13 @@ async function handleSubgraphReorg(blockHeight, loadSubgraphDef) {
         continue;
       bumpReorgEpoch(sg.name);
       await withSubgraphBlockLock(sg.name, async () => {
-        await getTargetDb3().transaction().execute(async (lockTx) => {
-          await sql5`SELECT pg_advisory_xact_lock(hashtext(${`subgraph-reorg:${sg.name}`}))`.execute(lockTx);
+        await getTargetDb4().transaction().execute(async (lockTx) => {
+          await sql6`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: getErrorMessage2(err)
@@ -3889,7 +4022,7 @@ async function handleSubgraphReorg(blockHeight, loadSubgraphDef) {
   }
 }
 async function reorgOneSubgraph(sg, schema, blockHeight, loadSubgraphDef) {
-  const targetDb = getTargetDb3();
+  const targetDb = getTargetDb4();
   const schemaName = sg.schema_name ?? pgSchemaName(sg.name);
   const client = getRawClient("target");
   const tableNames = Object.keys(schema);
@@ -3918,7 +4051,7 @@ async function reorgOneSubgraph(sg, schema, blockHeight, loadSubgraphDef) {
       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 });
+    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]);
     }
@@ -3928,6 +4061,7 @@ async function reorgOneSubgraph(sg, schema, blockHeight, loadSubgraphDef) {
 				DELETE FROM "${schemaName}"."_factory_addresses" WHERE block_height >= ${Number(blockHeight)};
 			END IF;
 		END $$`);
+  await targetDb.deleteFrom("subgraph_violations").where("subgraph_name", "=", sg.name).where("block_height", ">=", blockHeight).execute();
   for (const [tableName, rows] of Object.entries(revertedByTable)) {
     if (rows.length === 0)
       continue;
@@ -3961,7 +4095,7 @@ async function reorgOneSubgraph(sg, schema, blockHeight, loadSubgraphDef) {
       }).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", {
+      logger10.error("Failed to emit revert event for subscriptions", {
         event: "reorg_revert_emit_dropped",
         subgraph: sg.name,
         table: tableName,
@@ -3970,14 +4104,14 @@ async function reorgOneSubgraph(sg, schema, blockHeight, loadSubgraphDef) {
       });
     });
   }
-  logger9.info("Subgraph reorg cleanup done", {
+  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 });
-  logger9.info("Subgraph reorg reprocessed", {
+  logger10.info("Subgraph reorg reprocessed", {
     subgraph: sg.name,
     blockHeight
   });
@@ -3986,5 +4120,5 @@ export {
   handleSubgraphReorg
 };
 
-//# debugId=CCDDEB49D7B7E7B464756E2164756E21
+//# debugId=C83516F4FE20D8A864756E2164756E21
 //# sourceMappingURL=reorg.js.map