@secondlayer/subgraphs 8.0.4 → 8.1.1

package/dist/runtime/replay.js

@@ -12,6 +12,7 @@ import { logger as logger2 } from "@secondlayer/shared/logger";
 
 // src/runtime/block-source.ts
 import { getSourceDb } from "@secondlayer/shared/db";
+import { resolveChainTip } from "@secondlayer/shared/db/queries/integrity";
 import {
   BillingPausedError,
   createInternalIndexHttpClient
@@ -23,7 +24,7 @@ import { createHash } from "node:crypto";
 // package.json
 var package_default = {
   name: "@secondlayer/subgraphs",
-  version: "8.0.4",
+  version: "8.1.1",
   description: "Describe the Stacks data you want as one TypeScript file; it fills itself and survives reorgs.",
   license: "MIT",
   repository: {
@@ -79,7 +80,7 @@ var package_default = {
     prepublishOnly: "bun run build"
   },
   dependencies: {
-    "@secondlayer/shared": "^15.0.2",
+    "@secondlayer/shared": "^15.3.1",
     "@secondlayer/stacks": "^6.5.4",
     "@secondlayer/verify": "^0.6.3",
     esbuild: "^0.28.2",
@@ -928,8 +929,7 @@ class PostgresBlockSource {
     this.feed = feed;
   }
   async getTip() {
-    const progress = await getSourceDb().selectFrom("index_progress").selectAll().where("network", "=", process.env.NETWORK ?? "mainnet").executeTakeFirst();
-    return progress ? Number(progress.highest_seen_block) : 0;
+    return await resolveChainTip(getSourceDb(), "seen") ?? 0;
   }
   loadBlockRange(fromHeight, toHeight) {
     return loadBlockRange(getSourceDb(), fromHeight, toHeight, {
@@ -1153,8 +1153,9 @@ function databaseChainDataReader(db) {
     traitContractIds(trait, asOfBlock) {
       return resolveTraitContractIds(db, trait, asOfBlock);
     },
-    settlementsConfirmedAfter(after) {
-      return db.selectFrom("sbtc_settlements as s").innerJoin("sbtc_events as e", (join) => join.onRef("e.sweep_txid", "=", "s.sweep_txid").on("e.topic", "=", "withdrawal-accept").on("e.canonical", "=", true)).innerJoin("blocks as b", (join) => join.onRef("b.height", "=", "e.block_height").on("b.canonical", "=", true)).where("s.settlement_confirmed", "=", true).where("s.confirmed_at", ">", after).select([
+    async settlementsSince(scan) {
+      const rows = await db.selectFrom("sbtc_settlements as s").innerJoin("sbtc_events as e", (join) => join.onRef("e.sweep_txid", "=", "s.sweep_txid").on("e.topic", "=", "withdrawal-accept").on("e.canonical", "=", true)).innerJoin("blocks as b", (join) => join.onRef("b.height", "=", "e.block_height").on("b.canonical", "=", true)).where("s.settlement_confirmed", "=", true).where((eb) => ("afterSeq" in scan) ? eb("s.seq", ">", scan.afterSeq) : eb("s.confirmed_at", ">", scan.confirmedAfter)).select([
+        "s.seq",
         "s.sweep_txid",
         "s.request_id",
         "s.btc_confirmations",
@@ -1166,7 +1167,8 @@ function databaseChainDataReader(db) {
         "e.sender",
         "b.hash as block_hash",
         "b.timestamp as block_timestamp"
-      ]).execute();
+      ]).orderBy("s.seq").execute();
+      return rows.map((row) => ({ ...row, seq: Number(row.seq) }));
     }
   };
 }
@@ -1248,8 +1250,8 @@ function hostedChainDataReader(client, opts = {}) {
       }
       return ids;
     },
-    async settlementsConfirmedAfter(after) {
-      const withdrawals = oneWithdrawalPerSweep(await client.fetchSettledWithdrawals(after));
+    async settlementsSince(scan) {
+      const withdrawals = oneWithdrawalPerSweep(await client.fetchSettledWithdrawals(scan)).sort((a, b) => Number(a.settlement_seq) - Number(b.settlement_seq));
       const out = [];
       for (const w of withdrawals) {
         const accepts = await client.fetchSbtcEvents(0, THROUGH_TIP, ["withdrawal-accept"], { requestId: w.request_id });
@@ -1260,6 +1262,7 @@ function hostedChainDataReader(client, opts = {}) {
         if (!block)
           continue;
         out.push({
+          seq: Number(w.settlement_seq),
           sweep_txid: w.sweep_txid,
           request_id: w.request_id,
           btc_confirmations: w.btc_confirmations ?? 0,
@@ -1292,7 +1295,7 @@ function chainDataReader(opts) {
   return {
     sbtcEvents: async (...args) => (await reader()).sbtcEvents(...args),
     traitContractIds: async (...args) => (await reader()).traitContractIds(...args),
-    settlementsConfirmedAfter: async (...args) => (await reader()).settlementsConfirmedAfter(...args)
+    settlementsSince: async (...args) => (await reader()).settlementsSince(...args)
   };
 }
 var processHttpClient;
@@ -1818,6 +1821,7 @@ function applyRow(meta, blockHeight, blockHash, txId, eventIndex, event, replayI
     webhook_id: meta.webhookId,
     kind: "chain",
     block_height: blockHeight,
+    block_hash: blockHash,
     tx_id: txId,
     row_pk: clock === "vm" ? { tx_id: txId, event_index: eventIndex, clock } : { tx_id: txId, event_index: eventIndex },
     event_type: `chain.${meta.triggerType}.apply`,
@@ -2044,13 +2048,25 @@ async function replayWebhook(input, opts) {
   });
   try {
     const result = await replayChainWebhook(db, sub, input, opts);
-    await finishScan(db, replayId, {
+    const finished = await finishScan(db, replayId, {
       scanned: result.scannedCount,
       enqueued: result.enqueuedCount
     });
+    if (!finished) {
+      logger2.warn("Replay scan finished but the replay was no longer scanning", {
+        replayId,
+        webhookId: sub.id
+      });
+    }
     return result;
   } catch (err) {
-    await failScan(db, replayId, getErrorMessage(err));
+    const failed = await failScan(db, replayId, getErrorMessage(err));
+    if (!failed) {
+      logger2.warn("Replay scan failed but the replay was no longer scanning", {
+        replayId,
+        webhookId: sub.id
+      });
+    }
     throw err;
   }
 }
@@ -2103,5 +2119,5 @@ export {
   replayWebhook
 };
 
-//# debugId=4E297B6CDCF29B3F64756E2164756E21
+//# debugId=79ADCE67697CFB1864756E2164756E21
 //# sourceMappingURL=replay.js.map