@secondlayer/subgraphs 3.19.2 → 3.19.3

package/dist/src/service.js

@@ -2862,6 +2862,52 @@ var STANDARD_CATCHUP_BATCH_CONFIG = {
   prefetch: true
 };
 var catchingUp = new Set;
+var subgraphBlockLockHeld = new Set;
+var subgraphBlockLockWaiters = new Map;
+var reorgEpoch = new Map;
+async function acquireSubgraphBlockLock(name) {
+  if (!subgraphBlockLockHeld.has(name)) {
+    subgraphBlockLockHeld.add(name);
+    return () => releaseSubgraphBlockLock(name);
+  }
+  return new Promise((resolve) => {
+    const waiters = subgraphBlockLockWaiters.get(name) ?? [];
+    waiters.push(() => resolve(() => releaseSubgraphBlockLock(name)));
+    subgraphBlockLockWaiters.set(name, waiters);
+  });
+}
+function releaseSubgraphBlockLock(name) {
+  const waiters = subgraphBlockLockWaiters.get(name);
+  if (waiters && waiters.length > 0) {
+    const next = waiters.shift();
+    if (waiters.length === 0)
+      subgraphBlockLockWaiters.delete(name);
+    next();
+    return;
+  }
+  subgraphBlockLockHeld.delete(name);
+}
+async function withSubgraphBlockLock(name, fn) {
+  const release = await acquireSubgraphBlockLock(name);
+  try {
+    return await fn();
+  } finally {
+    release();
+  }
+}
+function bumpReorgEpoch(name) {
+  reorgEpoch.set(name, (reorgEpoch.get(name) ?? 0) + 1);
+}
+function getReorgEpoch(name) {
+  return reorgEpoch.get(name) ?? 0;
+}
+
+class ReorgEpochChangedError extends Error {
+  constructor(name) {
+    super(`reorg epoch changed for ${name} mid catch-up`);
+    this.name = "ReorgEpochChangedError";
+  }
+}
 function parsePositiveInt2(value) {
   if (value == null || value.trim() === "")
     return;
@@ -2925,6 +2971,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
     const batchConfig = resolveCatchupBatchConfig();
     let batchSize = batchConfig.defaultBatchSize;
     let currentHeight = startBlock;
+    const walkEpoch = getReorgEpoch(subgraphName);
     let prefetchedBatchEnd = Math.min(currentHeight + batchSize - 1, chainTip);
     let nextBatchPromise = batchConfig.prefetch ? source.loadBlockRange(currentHeight, prefetchedBatchEnd) : undefined;
     while (currentHeight <= chainTip) {
@@ -2966,12 +3013,23 @@ async function catchUpSubgraph(subgraph, subgraphName) {
           stopCatchup = true;
           break;
         }
+        const preloaded = blockData;
         let result;
         try {
-          result = await processBlockWithRetry(subgraph, subgraphName, height, {
-            preloaded: blockData
+          result = await withSubgraphBlockLock(subgraphName, async () => {
+            if (getReorgEpoch(subgraphName) !== walkEpoch) {
+              throw new ReorgEpochChangedError(subgraphName);
+            }
+            return processBlockWithRetry(subgraph, subgraphName, height, {
+              preloaded
+            });
           });
         } catch (err) {
+          if (err instanceof ReorgEpochChangedError) {
+            logger8.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", {
             subgraph: subgraphName,
@@ -3040,85 +3098,88 @@ async function handleSubgraphReorg(blockHeight, loadSubgraphDef) {
       const schema = sg.definition.schema;
       if (!schema)
         continue;
-      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) => {
+      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) {
-            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 client.unsafe(`DELETE FROM "${schemaName}"."${tableName}" WHERE "_block_height" >= $1`, [blockHeight]);
           }
-          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]);
         }
-      }
-      for (const [tableName, rows] of Object.entries(revertedByTable)) {
-        if (rows.length === 0)
-          continue;
-        await targetDb.insertInto("subscription_outbox").columns([
-          "subscription_id",
-          "event_type",
-          "payload",
-          "dedup_key",
-          "row_pk",
-          "status"
-        ]).expression((eb) => eb.selectFrom("subscriptions").select((eb2) => [
-          "id as subscription_id",
-          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.column("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)
+        for (const [tableName, rows] of Object.entries(revertedByTable)) {
+          if (rows.length === 0)
+            continue;
+          await targetDb.insertInto("subscription_outbox").columns([
+            "subscription_id",
+            "event_type",
+            "payload",
+            "dedup_key",
+            "row_pk",
+            "status"
+          ]).expression((eb) => eb.selectFrom("subscriptions").select((eb2) => [
+            "id as subscription_id",
+            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.column("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
         });
-      }
-      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
       });
     } catch (err) {
       logger9.error("Subgraph reorg handling failed", {
@@ -3618,5 +3679,5 @@ var shutdown = async () => {
 process.on("SIGINT", shutdown);
 process.on("SIGTERM", shutdown);
 
-//# debugId=B77FB9197239A7EB64756E2164756E21
+//# debugId=2031C35EBA87F8DD64756E2164756E21
 //# sourceMappingURL=service.js.map