@arkade-os/sdk 0.5.0-rc.2 → 0.5.0-rc.4

package/dist/repositories/sqlite/index.cjs

@@ -1,10 +1,9 @@
 'use strict';
 
-var chunkGMZZQXV5_cjs = require('../../chunk-GMZZQXV5.cjs');
-require('../../chunk-NVZJSKZS.cjs');
-require('../../chunk-43FKNLX4.cjs');
-require('../../chunk-JZWLXNHV.cjs');
-require('../../chunk-5BLDMQED.cjs');
+var chunkZHLYFRYY_cjs = require('../../chunk-ZHLYFRYY.cjs');
+require('../../chunk-SYRQJS5N.cjs');
+require('../../chunk-F7HJO5GT.cjs');
+require('../../chunk-C5Y2R63Z.cjs');
 
 // src/repositories/sqlite/transaction.ts
 var writeChains = /* @__PURE__ */ new WeakMap();
@@ -144,6 +143,25 @@ var SQLiteWalletRepository = class {
         `PRAGMA table_info(${this.tables.vtxos})`
       );
       const scriptCol = cols.find((c) => c.name === "script");
+      const nullableCanonicalColumns = [
+        ["is_swept", "INTEGER"],
+        ["is_preconfirmed", "INTEGER"],
+        ["commitment_txids_json", "TEXT"],
+        ["expires_at", "TEXT"],
+        ["expires_at_height", "INTEGER"]
+      ];
+      let addedCanonicalColumns = false;
+      for (const [name, type] of nullableCanonicalColumns) {
+        if (!cols.some((c) => c.name === name)) {
+          await this.db.run(
+            `ALTER TABLE ${this.tables.vtxos} ADD COLUMN ${name} ${type}`
+          );
+          addedCanonicalColumns = true;
+        }
+      }
+      if (addedCanonicalColumns && cols.some((c) => c.name === "virtual_status_json")) {
+        await this.backfillCanonicalVtxoColumns();
+      }
       if (scriptCol && scriptCol.notnull === 1) {
         return;
       }
@@ -154,7 +172,7 @@ var SQLiteWalletRepository = class {
       for (const row of nullRows) {
         await this.db.run(
           `UPDATE ${this.tables.vtxos} SET script = ? WHERE txid = ? AND vout = ?`,
-          [chunkGMZZQXV5_cjs.scriptFromArkAddress(row.address), row.txid, row.vout]
+          [chunkZHLYFRYY_cjs.scriptFromArkAddress(row.address), row.txid, row.vout]
         );
       }
       const tempName = `${this.tables.vtxos}__migrate_tmp`;
@@ -164,20 +182,58 @@ var SQLiteWalletRepository = class {
                 INSERT INTO ${tempName}
                     (txid, vout, value, address, tap_tree,
                      forfeit_cb, forfeit_s, intent_cb, intent_s,
-                     status_json, virtual_status_json, created_at,
-                     is_unrolled, is_spent, spent_by, settled_by, ark_tx_id,
-                     extra_witness_json, assets_json, script)
+                     status_json, created_at, is_unrolled, is_spent,
+                     is_swept, is_preconfirmed, commitment_txids_json,
+                     expires_at, expires_at_height,
+                     spent_by, settled_by, ark_tx_id, extra_witness_json, assets_json, script)
                 SELECT txid, vout, value, address, tap_tree,
                        forfeit_cb, forfeit_s, intent_cb, intent_s,
-                       status_json, virtual_status_json, created_at,
-                       is_unrolled, is_spent, spent_by, settled_by, ark_tx_id,
-                       extra_witness_json, assets_json, script
+                       status_json, created_at, is_unrolled, is_spent,
+                       is_swept, is_preconfirmed, commitment_txids_json,
+                       expires_at, expires_at_height,
+                       spent_by, settled_by, ark_tx_id, extra_witness_json, assets_json, script
                 FROM ${this.tables.vtxos}
             `);
       await this.db.run(`DROP TABLE ${this.tables.vtxos}`);
       await this.db.run(`ALTER TABLE ${tempName} RENAME TO ${this.tables.vtxos}`);
     });
   }
+  /**
+   * Copy the canonical VTXO facts out of the legacy `virtual_status_json` blob.
+   *
+   * Scoped to rows that still have `is_swept` NULL, which is what "never backfilled" looks
+   * like: the copy writes 0 or 1 to every row it touches, so a second pass — a later column
+   * addition, say — cannot overwrite what an indexer sync has since corrected. Rows whose blob
+   * is missing or corrupt are left alone: a migration must not be stopped by one bad row, and
+   * the next sync repairs it.
+   */
+  async backfillCanonicalVtxoColumns() {
+    const rows = await this.db.all(
+      `SELECT txid, vout, virtual_status_json FROM ${this.tables.vtxos}
+             WHERE virtual_status_json IS NOT NULL AND is_swept IS NULL`
+    );
+    for (const row of rows) {
+      const facts = chunkZHLYFRYY_cjs.legacyVtxoFacts(row.virtual_status_json);
+      if (!facts) continue;
+      await this.db.run(
+        `UPDATE ${this.tables.vtxos}
+                 SET is_swept = ?, is_preconfirmed = ?, commitment_txids_json = ?,
+                     expires_at = ?, expires_at_height = ?,
+                     is_spent = COALESCE(is_spent, ?)
+                 WHERE txid = ? AND vout = ?`,
+        [
+          facts.isSwept ? 1 : 0,
+          facts.isPreconfirmed ? 1 : 0,
+          facts.commitmentTxIds ? JSON.stringify(facts.commitmentTxIds) : null,
+          facts.expiresAt ? facts.expiresAt.toISOString() : null,
+          facts.expiresAtHeight ?? null,
+          facts.isSpent ? 1 : 0,
+          row.txid,
+          row.vout
+        ]
+      );
+    }
+  }
   vtxosCreateSql(tableName) {
     return `CREATE TABLE ${tableName} (
             txid TEXT NOT NULL,
@@ -190,10 +246,14 @@ var SQLiteWalletRepository = class {
             intent_cb TEXT NOT NULL,
             intent_s TEXT NOT NULL,
             status_json TEXT NOT NULL,
-            virtual_status_json TEXT NOT NULL,
             created_at TEXT NOT NULL,
             is_unrolled INTEGER NOT NULL DEFAULT 0,
             is_spent INTEGER,
+            is_swept INTEGER,
+            is_preconfirmed INTEGER,
+            commitment_txids_json TEXT,
+            expires_at TEXT,
+            expires_at_height INTEGER,
             spent_by TEXT,
             settled_by TEXT,
             ark_tx_id TEXT,
@@ -225,19 +285,21 @@ var SQLiteWalletRepository = class {
   async saveVtxos(address, vtxos) {
     await this.ensureInit();
     for (const vtxo of vtxos) {
-      const s = chunkGMZZQXV5_cjs.serializeVtxo(vtxo);
+      const s = chunkZHLYFRYY_cjs.serializeVtxo(vtxo);
       await this.db.run(
         `INSERT OR REPLACE INTO ${this.tables.vtxos}
                     (txid, vout, value, address,
                      tap_tree, forfeit_cb, forfeit_s, intent_cb, intent_s,
-                     status_json, virtual_status_json, created_at,
-                     is_unrolled, is_spent, spent_by, settled_by, ark_tx_id,
-                     extra_witness_json, assets_json, script)
+                     status_json, created_at, is_unrolled, is_spent,
+                     is_swept, is_preconfirmed, commitment_txids_json,
+                     expires_at, expires_at_height,
+                     spent_by, settled_by, ark_tx_id, extra_witness_json, assets_json, script)
                  VALUES (?, ?, ?, ?,
                          ?, ?, ?, ?, ?,
+                         ?, ?, ?, ?,
                          ?, ?, ?,
-                         ?, ?, ?, ?, ?,
-                         ?, ?, ?)`,
+                         ?, ?,
+                         ?, ?, ?, ?, ?, ?)`,
         [
           s.txid,
           s.vout,
@@ -249,10 +311,14 @@ var SQLiteWalletRepository = class {
           s.intentTapLeafScript.cb,
           s.intentTapLeafScript.s,
           JSON.stringify(s.status),
-          JSON.stringify(s.virtualStatus),
           typeof s.createdAt === "string" ? s.createdAt : s.createdAt instanceof Date ? s.createdAt.toISOString() : new Date(s.createdAt).toISOString(),
           s.isUnrolled ? 1 : 0,
           s.isSpent === void 0 ? null : s.isSpent ? 1 : 0,
+          s.isSwept === void 0 ? null : s.isSwept ? 1 : 0,
+          s.isPreconfirmed === void 0 ? null : s.isPreconfirmed ? 1 : 0,
+          s.commitmentTxIds ? JSON.stringify(s.commitmentTxIds) : null,
+          s.expiresAt === void 0 ? null : s.expiresAt instanceof Date ? s.expiresAt.toISOString() : new Date(s.expiresAt).toISOString(),
+          s.expiresAtHeight ?? null,
           s.spentBy ?? null,
           s.settledBy ?? null,
           s.arkTxId ?? null,
@@ -280,7 +346,7 @@ var SQLiteWalletRepository = class {
       throw new Error("SQLiteWalletRepository requires an address");
     }
     for (const vtxo of vtxos) {
-      if (!chunkGMZZQXV5_cjs.isVtxoForScript(vtxo, key.script)) {
+      if (!chunkZHLYFRYY_cjs.isVtxoForScript(vtxo, key.script)) {
         throw new Error(
           `VTXO ${vtxo.txid}:${vtxo.vout} script mismatch: expected ${key.script}, got ${vtxo.script}`
         );
@@ -304,7 +370,7 @@ var SQLiteWalletRepository = class {
   async saveUtxos(address, utxos) {
     await this.ensureInit();
     for (const utxo of utxos) {
-      const s = chunkGMZZQXV5_cjs.serializeUtxo(utxo);
+      const s = chunkZHLYFRYY_cjs.serializeUtxo(utxo);
       await this.db.run(
         `INSERT OR REPLACE INTO ${this.tables.utxos}
                     (txid, vout, value, address,
@@ -360,7 +426,7 @@ var SQLiteWalletRepository = class {
           tx.amount,
           tx.settled ? 1 : 0,
           tx.createdAt,
-          tx.assets ? JSON.stringify(chunkGMZZQXV5_cjs.serializeAssets(tx.assets)) : null
+          tx.assets ? JSON.stringify(chunkZHLYFRYY_cjs.serializeAssets(tx.assets)) : null
         ]
       );
     }
@@ -422,10 +488,14 @@ function vtxoRowToDomain(row) {
       s: row.intent_s
     },
     status: JSON.parse(row.status_json),
-    virtualStatus: JSON.parse(row.virtual_status_json),
     createdAt: new Date(row.created_at),
     isUnrolled: row.is_unrolled === 1,
     isSpent: row.is_spent === null ? void 0 : row.is_spent === 1,
+    isSwept: row.is_swept == null ? void 0 : row.is_swept === 1,
+    isPreconfirmed: row.is_preconfirmed == null ? void 0 : row.is_preconfirmed === 1,
+    commitmentTxIds: row.commitment_txids_json ? JSON.parse(row.commitment_txids_json) : void 0,
+    expiresAt: row.expires_at ? new Date(row.expires_at) : void 0,
+    expiresAtHeight: row.expires_at_height ?? void 0,
     spentBy: row.spent_by ?? void 0,
     settledBy: row.settled_by ?? void 0,
     arkTxId: row.ark_tx_id ?? void 0,
@@ -434,9 +504,9 @@ function vtxoRowToDomain(row) {
     // Post-migration every row has `script`, but the backfill is
     // idempotent: derive from `address` if the legacy column is still
     // null (e.g. the migration hasn't run yet on this handle).
-    script: row.script ?? chunkGMZZQXV5_cjs.scriptFromArkAddress(row.address)
+    script: row.script ?? chunkZHLYFRYY_cjs.scriptFromArkAddress(row.address)
   };
-  return chunkGMZZQXV5_cjs.deserializeVtxo(serialized);
+  return chunkZHLYFRYY_cjs.deserializeVtxo(serialized);
 }
 function utxoRowToDomain(row) {
   const serialized = {
@@ -455,7 +525,7 @@ function utxoRowToDomain(row) {
     status: JSON.parse(row.status_json),
     extraWitness: row.extra_witness_json ? JSON.parse(row.extra_witness_json) : void 0
   };
-  return chunkGMZZQXV5_cjs.deserializeUtxo(serialized);
+  return chunkZHLYFRYY_cjs.deserializeUtxo(serialized);
 }
 function txRowToDomain(row) {
   const tx = {
@@ -470,7 +540,7 @@ function txRowToDomain(row) {
     createdAt: row.created_at
   };
   if (row.assets_json) {
-    tx.assets = chunkGMZZQXV5_cjs.deserializeAssets(JSON.parse(row.assets_json));
+    tx.assets = chunkZHLYFRYY_cjs.deserializeAssets(JSON.parse(row.assets_json));
   }
   return tx;
 }
@@ -743,8 +813,8 @@ var SQLiteIntentRepository = class {
       `SELECT * FROM ${this.t} ORDER BY created_at ASC, intent_tx_id ASC`
     );
     let out = rows.map(rowToIntent);
-    if (filter) out = out.filter((i) => chunkGMZZQXV5_cjs.intentMatchesFilter(i, filter));
-    const { skip, end } = chunkGMZZQXV5_cjs.intentPageBounds(filter, out.length);
+    if (filter) out = out.filter((i) => chunkZHLYFRYY_cjs.intentMatchesFilter(i, filter));
+    const { skip, end } = chunkZHLYFRYY_cjs.intentPageBounds(filter, out.length);
     return out.slice(skip, end);
   }
   async getLockedVtxoOutpoints() {
@@ -752,7 +822,7 @@ var SQLiteIntentRepository = class {
     const rows = await this.db.all(`SELECT * FROM ${this.t}`);
     const out = [];
     for (const r of rows) {
-      if (chunkGMZZQXV5_cjs.isTerminalIntentState(r.state)) continue;
+      if (chunkZHLYFRYY_cjs.isTerminalIntentState(r.state)) continue;
       for (const o of JSON.parse(r.intent_vtxos_json)) out.push(o);
     }
     return out;
@@ -847,7 +917,7 @@ var SQLiteVirtualTxRepository = class {
         const prev = prevByTxid.get(t.txid);
         const psbt = t.psbt ?? prev?.psbt ?? null;
         const expires = t.expiresAt ?? prev?.expires_at ?? null;
-        const type = chunkGMZZQXV5_cjs.mergeChainedTxType(t.type, prev?.type);
+        const type = chunkZHLYFRYY_cjs.mergeChainedTxType(t.type, prev?.type);
         await this.db.run(
           `INSERT OR REPLACE INTO ${this.tTx} (txid, psbt, expires_at, type) VALUES (?, ?, ?, ?)`,
           [t.txid, psbt, expires, type]
@@ -940,7 +1010,7 @@ function sanitizeTablePrefix(p) {
 
 Object.defineProperty(exports, "ChainedTxType", {
   enumerable: true,
-  get: function () { return chunkGMZZQXV5_cjs.ChainedTxType; }
+  get: function () { return chunkZHLYFRYY_cjs.ChainedTxType; }
 });
 exports.SQLiteContractRepository = SQLiteContractRepository;
 exports.SQLiteIntentRepository = SQLiteIntentRepository;