@bsv/wallet-toolbox-client 2.2.0 → 2.3.1

package/out/src/storage/methods/reviewStatusIdb.js

@@ -1,74 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reviewStatusIdb = reviewStatusIdb;
-const provenTxReqStatusesSafeForInputRestore = new Set(['invalid', 'doubleSpend']);
 /**
+ * Looks for unpropagated state:
+ *
  * 1. set transactions to 'failed' if not already failed and provenTxReq with matching txid has status of 'invalid'.
+ * 2. sets transactions to 'completed' if provenTx with matching txid exists and current provenTxId is null.
+ * 3. sets outputs to spendable true, spentBy undefined if spentBy is a transaction with status 'failed'.
+ *
+ * @param storage
+ * @param args
+ * @returns
  */
-async function failTransactionsForInvalidReqs(storage, r) {
+async function reviewStatusIdb(storage, args) {
+    const r = { log: '' };
+    // 1. set transactions to 'failed' if not already failed and provenTxReq with matching txid has status of 'invalid'.
     const invalidTxids = [];
-    await storage.filterProvenTxReqs({ partial: { status: 'invalid' } }, txReq => {
+    await storage.filterProvenTxReqs({ partial: { status: 'invalid' }, trx: args.trx }, txReq => {
         invalidTxids.push(txReq.txid);
     });
     for (const txid of invalidTxids) {
-        const txs = await storage.findTransactions({ partial: { txid } });
+        const txs = await storage.findTransactions({ partial: { txid }, trx: args.trx });
         for (const tx of txs) {
             if (tx.status !== 'failed') {
                 r.log += `transaction ${tx.transactionId} updated to status of 'failed' was ${tx.status}\n`;
-                await storage.updateTransactionStatus('failed', tx.transactionId);
+                await storage.updateTransactionStatus('failed', tx.transactionId, undefined, undefined, args.trx);
             }
         }
     }
-}
-/**
- * Partitions failed transactions into all failed ids and the subset that is safe for input restore
- * (terminal failure: no blocking ProvenTxReq, i.e. all reqs are 'invalid'/'doubleSpend').
- */
-async function collectFailedTransactionIds(storage) {
-    const failedTxs = await storage.findTransactions({ partial: { status: 'failed' }, noRawTx: true });
-    const failedTransactionIds = new Set();
-    const safeFailedTransactionIds = new Set();
+    // 2. sets transactions to 'completed' if provenTx with matching txid exists and current provenTxId is null.
+    const provenTxs = {};
+    await storage.filterProvenTxs({ partial: {}, trx: args.trx }, provenTx => {
+        provenTxs[provenTx.txid] = provenTx.provenTxId;
+    });
+    for (const [txid, provenTxId] of Object.entries(provenTxs)) {
+        const txs = await storage.findTransactions({ partial: { txid }, trx: args.trx });
+        for (const tx of txs) {
+            if (tx.provenTxId == null) {
+                r.log += `transaction ${tx.transactionId} updated to status of 'completed' with provenTxId ${provenTxId}\n`;
+                await storage.updateTransaction(tx.transactionId, { status: 'completed', provenTxId }, args.trx);
+            }
+        }
+    }
+    // 3. sets outputs to spendable true, spentBy undefined if spentBy is a transaction with status 'failed'.
+    const failedTxs = await storage.findTransactions({ partial: { status: 'failed' }, trx: args.trx });
     for (const tx of failedTxs) {
-        failedTransactionIds.add(tx.transactionId);
-        let hasBlockingReq = false;
+        let blocked = false;
         if (tx.txid != null && tx.txid !== '') {
-            const reqs = await storage.findProvenTxReqs({ partial: { txid: tx.txid } });
-            hasBlockingReq = reqs.some(req => !provenTxReqStatusesSafeForInputRestore.has(req.status));
+            const reqs = await storage.findProvenTxReqs({ partial: { txid: tx.txid }, trx: args.trx });
+            blocked = reqs.some(req => !['invalid', 'doubleSpend'].includes(req.status));
         }
-        if (!hasBlockingReq)
-            safeFailedTransactionIds.add(tx.transactionId);
-    }
-    return { failedTransactionIds, safeFailedTransactionIds };
-}
-/**
- * Looks for unpropagated state:
- *
- * 1. set transactions to 'failed' if not already failed and provenTxReq with matching txid has status of 'invalid'.
- * 2. sets outputs to spendable true, spentBy undefined if spentBy is a terminal failed transaction.
- * 3. sets outputs generated by terminal failed transactions to spendable false, spentBy undefined.
- *
- * @param storage
- * @param args
- * @returns
- */
-async function reviewStatusIdb(storage, args) {
-    const r = { log: '' };
-    await failTransactionsForInvalidReqs(storage, r);
-    const { failedTransactionIds, safeFailedTransactionIds } = await collectFailedTransactionIds(storage);
-    const outputs = await storage.findOutputs({ partial: {}, trx: args.trx });
-    for (const output of outputs) {
-        // An output generated by any failed tx (even one still reconcilable from an active req) is
-        // not a valid input to restore, matching the SQL `source.status = 'failed'` guard.
-        const generatedByFailedTx = failedTransactionIds.has(output.transactionId);
-        const generatedBySafeFailedTx = safeFailedTransactionIds.has(output.transactionId);
-        const spentBySafeFailedTx = output.spentBy != null && safeFailedTransactionIds.has(output.spentBy);
-        if (spentBySafeFailedTx && !generatedByFailedTx) {
+        if (blocked)
+            continue;
+        const outputs = await storage.findOutputs({ partial: { userId: tx.userId, spentBy: tx.transactionId }, trx: args.trx });
+        for (const output of outputs) {
             await storage.updateOutput(output.outputId, { spendable: true, spentBy: undefined }, args.trx);
-            r.log += `output ${output.outputId} updated to spendable because spentBy is failed\n`;
-        }
-        if (generatedBySafeFailedTx && (output.spendable || output.spentBy != null)) {
-            await storage.updateOutput(output.outputId, { spendable: false, spentBy: undefined }, args.trx);
-            r.log += `output ${output.outputId} updated to not spendable because transaction is failed\n`;
+            r.log += `output ${output.outputId} released from failed transaction ${tx.transactionId}\n`;
         }
     }
     return r;

package/out/src/storage/methods/reviewStatusIdb.js.map

@@ -1 +1 @@
-{"version":3,"file":"reviewStatusIdb.js","sourceRoot":"","sources":["../../../../../src/storage/methods/reviewStatusIdb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reviewStatusIdb.js","sourceRoot":"","sources":["../../../../../src/storage/methods/reviewStatusIdb.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox-client",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "Client only Wallet Storage",
   "main": "./out/src/index.client.js",
   "types": "./out/src/index.client.d.ts",
@@ -25,7 +25,7 @@
     "idb": "^8.0.2"
   },
   "peerDependencies": {
-    "@bsv/sdk": "^2"
+    "@bsv/sdk": "^2.1.6"
   },
   "peerDependenciesMeta": {
     "@bsv/sdk": {