@bopen-io/wallet-toolbox 2.6.2-brc153.5 → 2.14.6

package/out/src/monitor/tasks/TaskReviewUtxos.js

@@ -2,27 +2,44 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskReviewUtxos = void 0;
 const sdk_1 = require("../../sdk");
+const managedChange_1 = require("../../storage/methods/managedChange");
+const reviewUtxoOutputs_1 = require("../../storage/methods/reviewUtxoOutputs");
+const utilityHelpers_1 = require("../../utility/utilityHelpers");
 const WalletMonitorTask_1 = require("./WalletMonitorTask");
+const monitorValidation_1 = require("../monitorValidation");
+const REVIEW_PAGE_DEFAULT_LIMIT = 20;
+const REVIEW_PAGE_MAX_LIMIT = 250;
 /**
- * Use the reviewByIdentityKey method to review the utxos of a specific user by their identityKey.
+ * Use the reviewByIdentityKey method to scan the UTXOs of a specific user by
+ * identity key. The scan is read-only unless the caller explicitly requests
+ * release, and release remains blocked if any provider result is inconclusive.
+ * Operator UIs should use reviewPageByIdentityKey: it bounds each provider
+ * round-trip and may explicitly release only the conclusive spent subset while
+ * reporting unknowns.
  *
  * The task itself is disabled and will not run on a schedule; review must be triggered manually by calling reviewByIdentityKey.
  */
 class TaskReviewUtxos extends WalletMonitorTask_1.WalletMonitorTask {
+    static taskName = 'ReviewUtxos';
+    static checkNowRequested = false;
+    static get checkNow() {
+        return this.checkNowRequested;
+    }
+    static set checkNow(value) {
+        if (typeof value !== 'boolean')
+            throw new TypeError('checkNow must be boolean');
+        this.checkNowRequested = value;
+    }
     triggerMsecs;
     userLimit;
     userOffset;
     tags;
-    static taskName = 'ReviewUtxos';
-    static checkNowRequested = false;
-    static get checkNow() { return this.checkNowRequested; }
-    static set checkNow(value) { this.checkNowRequested = value; }
-    constructor(monitor, triggerMsecs = 0, userLimit = 10, userOffset = 0, tags = ['release', 'all']) {
+    constructor(monitor, triggerMsecs = 0, userLimit = 10, userOffset = 0, tags = ['all']) {
         super(monitor, TaskReviewUtxos.taskName);
-        this.triggerMsecs = triggerMsecs;
-        this.userLimit = userLimit;
-        this.userOffset = userOffset;
-        this.tags = tags;
+        this.triggerMsecs = (0, monitorValidation_1.requireMonitorInteger)(triggerMsecs, 'triggerMsecs', 0, monitorValidation_1.MAX_MONITOR_INTERVAL_MSECS);
+        this.userLimit = (0, monitorValidation_1.requireMonitorInteger)(userLimit, 'userLimit', 1, monitorValidation_1.MAX_MONITOR_PAGE_SIZE);
+        this.userOffset = (0, monitorValidation_1.requireMonitorInteger)(userOffset, 'userOffset', 0, monitorValidation_1.MAX_MONITOR_OFFSET);
+        this.tags = (0, monitorValidation_1.copyMonitorTags)(tags);
     }
     trigger(_nowMsecsSinceEpoch) {
         return {
@@ -33,8 +50,13 @@ class TaskReviewUtxos extends WalletMonitorTask_1.WalletMonitorTask {
         TaskReviewUtxos.checkNow = false;
         return 'TaskReviewUtxos is disabled; use reviewByIdentityKey instead.\n';
     }
-    async reviewByIdentityKey(identityKey, mode = 'all') {
-        const tags = ['release', ...(mode === 'all' ? ['all'] : [])];
+    async reviewByIdentityKey(identityKey, mode = 'all', release = false) {
+        identityKey = (0, monitorValidation_1.normalizeMonitorIdentityKey)(identityKey);
+        if (mode !== 'all' && mode !== 'change')
+            throw new TypeError("mode must be 'all' or 'change'");
+        if (typeof release !== 'boolean')
+            throw new TypeError('release must be boolean');
+        const tags = [...(release ? ['release'] : []), ...(mode === 'all' ? ['all'] : [])];
         const vargs = {
             basket: sdk_1.specOpInvalidChange,
             tags,
@@ -63,8 +85,162 @@ class TaskReviewUtxos extends WalletMonitorTask_1.WalletMonitorTask {
             return this.toUserLog(user, result.outputs, result.totalOutputs, total, tags);
         });
     }
+    async reviewPageByIdentityKey(identityKey, mode = 'all', release = false, pageLimit = REVIEW_PAGE_DEFAULT_LIMIT, offset = 0) {
+        identityKey = (0, monitorValidation_1.normalizeMonitorIdentityKey)(identityKey);
+        if (mode !== 'all' && mode !== 'change')
+            throw new TypeError("mode must be 'all' or 'change'");
+        if (typeof release !== 'boolean')
+            throw new TypeError('release must be boolean');
+        pageLimit = (0, monitorValidation_1.requireMonitorInteger)(pageLimit, 'pageLimit', 1, REVIEW_PAGE_MAX_LIMIT);
+        offset = (0, monitorValidation_1.requireMonitorInteger)(offset, 'offset', 0, monitorValidation_1.MAX_MONITOR_OFFSET - pageLimit);
+        return await this.storage.runAsStorageProvider(async (sp) => {
+            const user = (await sp.findUsers({ partial: { identityKey } }))[0];
+            if (!user) {
+                return {
+                    found: false,
+                    identityKey,
+                    mode,
+                    release,
+                    offset,
+                    pageLimit,
+                    sourceScanned: 0,
+                    complete: true,
+                    checked: 0,
+                    confirmedUnspent: 0,
+                    confirmedSpent: 0,
+                    unknown: 0,
+                    confirmedSpentSatoshis: 0,
+                    released: 0,
+                    releasedSatoshis: 0,
+                    providers: [],
+                    providerCount: 0,
+                    providersTruncated: false,
+                    log: `identityKey ${identityKey} was not found\n`
+                };
+            }
+            let basketId;
+            if (mode === 'change') {
+                basketId = (await sp.findOutputBaskets({
+                    partial: { userId: user.userId, name: 'default' }
+                }))[0]?.basketId;
+                if (basketId == null) {
+                    return this.emptyPage(user, mode, release, pageLimit, offset);
+                }
+            }
+            const sourceOutputs = await sp.findOutputs({
+                partial: {
+                    userId: user.userId,
+                    spendable: true,
+                    ...(basketId != null ? { basketId } : {})
+                },
+                txStatus: ['completed', 'unproven', 'nosend', 'sending'],
+                noScript: true,
+                paged: { limit: pageLimit, offset }
+            });
+            const candidates = sourceOutputs.filter(output => output.basketId != null);
+            const auth = { userId: user.userId, identityKey: user.identityKey };
+            const review = await (0, reviewUtxoOutputs_1.reviewUtxoOutputs)(sp, auth, candidates, release ? 'conclusive' : 'none');
+            const complete = sourceOutputs.length < pageLimit;
+            const nextOffset = complete ? undefined : offset + sourceOutputs.length - review.diagnostics.released;
+            const target = mode === 'all' ? 'spendable utxos' : 'spendable change utxos';
+            const action = release ? 'released' : 'found';
+            let log = `userId ${user.userId}: page checked ${review.diagnostics.checked} ${target}; ` +
+                `${review.diagnostics.confirmedSpent} confirmed spent, ${review.diagnostics.confirmedUnspent} confirmed unspent, ` +
+                `${review.diagnostics.unknown} unknown; ${action} ${review.diagnostics.released}, ${user.identityKey}\n`;
+            for (const output of review.confirmedSpentOutputs) {
+                log += `  ${output.txid}.${output.vout} ${output.satoshis} now ${output.spendable ? 'spendable' : 'spent'}\n`;
+            }
+            if (review.unknownOutputs.length > 0) {
+                log += `  ${review.unknownOutputs.length} output(s) quarantined from release pending a conclusive provider result\n`;
+            }
+            if (nextOffset != null)
+                log += `  continue at offset ${nextOffset}\n`;
+            return {
+                found: true,
+                userId: user.userId,
+                identityKey: user.identityKey,
+                mode,
+                release,
+                offset,
+                pageLimit,
+                sourceScanned: sourceOutputs.length,
+                complete,
+                ...(nextOffset != null ? { nextOffset } : {}),
+                ...review.diagnostics,
+                log
+            };
+        });
+    }
+    emptyPage(user, mode, release, pageLimit, offset) {
+        return {
+            found: true,
+            userId: user.userId,
+            identityKey: user.identityKey,
+            mode,
+            release,
+            offset,
+            pageLimit,
+            sourceScanned: 0,
+            complete: true,
+            checked: 0,
+            confirmedUnspent: 0,
+            confirmedSpent: 0,
+            unknown: 0,
+            confirmedSpentSatoshis: 0,
+            released: 0,
+            releasedSatoshis: 0,
+            providers: [],
+            providerCount: 0,
+            providersTruncated: false,
+            log: `userId ${user.userId}: no invalid utxos found, ${user.identityKey}\n`
+        };
+    }
+    /**
+     * Report managed-change liquidity without changing it. Monitor deliberately
+     * has no signing authority; progressive migration occurs only during a
+     * caller-authorized createAction.
+     */
+    async reviewManagedChangeByIdentityKey(identityKey) {
+        identityKey = (0, monitorValidation_1.normalizeMonitorIdentityKey)(identityKey);
+        return await this.storage.runAsStorageProvider(async (sp) => {
+            const user = (await sp.findUsers({ partial: { identityKey } }))[0];
+            if (user == null)
+                return `identityKey ${identityKey} was not found\n`;
+            const basket = (0, utilityHelpers_1.verifyOne)(await sp.findOutputBaskets({ partial: { userId: user.userId, name: 'default' } }));
+            const outputQuery = {
+                partial: { userId: user.userId, basketId: basket.basketId, spendable: true, ...managedChange_1.managedChangeOutputFields },
+                txStatus: ['completed', 'unproven', 'sending'],
+                noScript: true
+            };
+            const candidateCount = await sp.countOutputs(outputQuery);
+            if (!Number.isSafeInteger(candidateCount) || candidateCount < 0 || candidateCount > reviewUtxoOutputs_1.MAX_UTXO_REVIEW_CANDIDATES) {
+                throw new Error(`Managed-change review is limited to ${reviewUtxoOutputs_1.MAX_UTXO_REVIEW_CANDIDATES} candidate outputs; use bounded storage diagnostics.`);
+            }
+            const outputs = (await sp.findOutputs(outputQuery)).filter(managedChange_1.isAutoSpendableChangeOutput);
+            const reserved = new Set(await sp.findReservedActionBatchOutputIds(outputs.map(output => output.outputId)));
+            const statuses = await sp.findTransactionStatusesByIds(user.userId, outputs.map(output => output.transactionId));
+            const preferred = Math.max(1, basket.minimumDesiredUTXOValue);
+            const healthy = outputs.filter(output => output.satoshis >= preferred);
+            const undersized = outputs.filter(output => output.satoshis < preferred);
+            const countStatus = (status) => outputs.filter(output => statuses.get(output.transactionId) === status).length;
+            let satoshis = 0;
+            for (const output of outputs) {
+                if (!Number.isSafeInteger(output.satoshis) || output.satoshis < 0 || output.satoshis > 21e14) {
+                    throw new Error('Managed-change output has an invalid satoshi value.');
+                }
+                satoshis += output.satoshis;
+                if (!Number.isSafeInteger(satoshis) || satoshis > 21e14) {
+                    throw new Error('Managed-change output total exceeds the maximum monetary supply.');
+                }
+            }
+            return (`userId ${user.userId}: managed change ${outputs.length}/${basket.numberOfDesiredUTXOs}, ` +
+                `healthy ${healthy.length}, undersized ${undersized.length}, reserved ${reserved.size}, ` +
+                `completed ${countStatus('completed')}, unproven ${countStatus('unproven')}, ` +
+                `sending ${countStatus('sending')}, satoshis ${satoshis}, preferred minimum ${preferred}\n`);
+        });
+    }
     toUserLog(user, outputs, totalOutputs, total, tags) {
-        const action = tags.includes('release') ? 'updated to unspendable' : 'found';
+        const action = tags.includes('release') ? 'confirmed spent and updated to unspendable' : 'confirmed spent';
         const target = tags.includes('all') ? 'spendable utxos' : 'spendable change utxos';
         let log = `userId ${user.userId}: ${totalOutputs} ${target} ${action}, total ${total}, ${user.identityKey}\n`;
         for (const output of outputs) {

package/out/src/monitor/tasks/TaskReviewUtxos.js.map

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

package/out/src/monitor/tasks/TaskSendWaiting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskSendWaiting.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskSendWaiting.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAKvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAG/E,qBAAa,eAAgB,SAAQ,iBAAiB;IAiB3C,YAAY;IACZ,SAAS;IACT,YAAY;IACZ,iBAAiB;IACjB,UAAU;IApBnB,MAAM,CAAC,QAAQ,CAAC,QAAQ,iBAAgB;IAExC,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAA;IACjD,cAAc,EAAE,OAAO,CAAO;IAC9B,gBAAgB,EAAE,MAAM,CAAA;IAExB;;;;;;;OAOG;IACH,YACE,OAAO,EAAE,OAAO,EACT,YAAY,SAAwB,EACpC,SAAS,SAAwB,EACjC,YAAY,SAAwB,EACpC,iBAAiB,SAAwB,EACzC,UAAU,SAAM,EAIxB;IAED,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAOrD;IAEK,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC,CAmChC;YAEa,aAAa;IA8B3B,OAAO,CAAC,cAAc;IAuBtB;;;;;;;;;;;;;;;;OAgBG;IACG,aAAa,CAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAe7E;IAED,OAAO,CAAC,qBAAqB;YASf,oBAAoB;YAmCpB,kBAAkB;CAqBjC"}
+{"version":3,"file":"TaskSendWaiting.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskSendWaiting.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAKvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAa/E,qBAAa,eAAgB,SAAQ,iBAAiB;IAiB3C,YAAY;IACZ,SAAS;IACT,YAAY;IACZ,iBAAiB;IACjB,UAAU;IApBnB,MAAM,CAAC,QAAQ,CAAC,QAAQ,iBAAgB;IAExC,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAA;IACjD,cAAc,EAAE,OAAO,CAAO;IAC9B,gBAAgB,EAAE,MAAM,CAAA;IAExB;;;;;;;OAOG;IACH,YACE,OAAO,EAAE,OAAO,EACT,YAAY,SAAwB,EACpC,SAAS,SAAwB,EACjC,YAAY,SAAwB,EACpC,iBAAiB,SAAwB,EACzC,UAAU,SAAM,EASxB;IAED,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAOpD;IAEK,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CA4C/B;YAEa,aAAa;IA+C3B,OAAO,CAAC,cAAc;IAuBtB;;;;;;;;;;;;;;;;OAgBG;IACG,aAAa,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAkB5E;IAED,OAAO,CAAC,qBAAqB;YASf,oBAAoB;YAmCpB,kBAAkB;CA4BjC"}

package/out/src/monitor/tasks/TaskSendWaiting.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskSendWaiting = void 0;
+const validationHelpers_1 = require("@bsv/sdk/wallet/validationHelpers");
 const Monitor_1 = require("../Monitor");
 const WalletMonitorTask_1 = require("./WalletMonitorTask");
 const attemptToPostReqsToNetwork_1 = require("../../storage/methods/attemptToPostReqsToNetwork");
 const aggregateResults_1 = require("../../utility/aggregateResults");
 const utilityHelpers_1 = require("../../utility/utilityHelpers");
 const EntityProvenTxReq_1 = require("../../storage/schema/entities/EntityProvenTxReq");
+const monitorValidation_1 = require("../monitorValidation");
+const WERR_errors_1 = require("../../sdk/WERR_errors");
+const MAX_ATOMIC_BROADCAST_TXIDS = validationHelpers_1.MAXIMUM_SEND_WITH_TRANSACTIONS;
 class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
     triggerMsecs;
     agedMsecs;
@@ -32,6 +36,11 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
         this.sendingMsecs = sendingMsecs;
         this.triggerQuickMsecs = triggerQuickMsecs;
         this.chunkLimit = chunkLimit;
+        (0, monitorValidation_1.requireMonitorInteger)(triggerMsecs, 'triggerMsecs', 0, monitorValidation_1.MAX_MONITOR_INTERVAL_MSECS);
+        (0, monitorValidation_1.requireMonitorInteger)(agedMsecs, 'agedMsecs', 0, monitorValidation_1.MAX_MONITOR_INTERVAL_MSECS);
+        (0, monitorValidation_1.requireMonitorInteger)(sendingMsecs, 'sendingMsecs', 0, monitorValidation_1.MAX_MONITOR_INTERVAL_MSECS);
+        (0, monitorValidation_1.requireMonitorInteger)(triggerQuickMsecs, 'triggerQuickMsecs', 0, monitorValidation_1.MAX_MONITOR_INTERVAL_MSECS);
+        (0, monitorValidation_1.requireMonitorInteger)(chunkLimit, 'chunkLimit', 1, monitorValidation_1.MAX_MONITOR_PAGE_SIZE);
         this.triggerNextMsecs = this.triggerQuickMsecs;
     }
     trigger(nowMsecsSinceEpoch) {
@@ -56,11 +65,21 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
         const count = reqs.length;
         if (count > 0) {
             log += `${count} reqs with status ${status.join(' or ')}\n`;
-            const filteredReqs = await this.expandBatches(reqs, status);
+            const expanded = await this.expandBatches(reqs, status);
+            const filteredReqs = expanded.reqs;
+            if (expanded.oversizedBatches > 0) {
+                log += `  Skipped ${expanded.oversizedBatches} oversized atomic broadcast batch(es); operator recovery is required.\n`;
+            }
+            if (expanded.deferredGroups > 0) {
+                log += `  Deferred ${expanded.deferredGroups} additional request group(s) to preserve the per-run broadcast bound.\n`;
+            }
             const agedReqs = this.filterAgedReqs(filteredReqs, agedLimit);
             log += `  Of those reqs, ${agedReqs.length} where last updated before ${agedLimit.toISOString()}.\n`;
             log += await this.processUnsent(agedReqs, 2);
-            if (count >= this.chunkLimit) {
+            if (filteredReqs.length === 0 && expanded.oversizedBatches > 0) {
+                this.triggerNextMsecs = this.triggerMsecs;
+            }
+            else if (count >= this.chunkLimit || expanded.deferredGroups > 0) {
                 this.triggerNextMsecs = this.triggerQuickMsecs;
             }
             else if (agedReqs.length < filteredReqs.length) {
@@ -80,27 +99,42 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
         const expanded = [];
         const seenReqIds = new Set();
         const seenBatches = new Set();
+        let oversizedBatches = 0;
+        let deferredGroups = 0;
         for (const req of reqs) {
             if (seenReqIds.has(req.provenTxReqId))
                 continue;
-            if (!req.batch || seenBatches.has(req.batch)) {
+            if (!req.batch) {
                 seenReqIds.add(req.provenTxReqId);
-                expanded.push(req);
+                if (expanded.length < MAX_ATOMIC_BROADCAST_TXIDS)
+                    expanded.push(req);
+                else
+                    deferredGroups++;
+                continue;
+            }
+            if (seenBatches.has(req.batch)) {
                 continue;
             }
             seenBatches.add(req.batch);
             const batchReqs = await this.storage.findProvenTxReqs({
                 partial: { batch: req.batch },
-                status
+                status,
+                paged: { limit: MAX_ATOMIC_BROADCAST_TXIDS + 1, offset: 0 }
             });
-            for (const batchReq of batchReqs) {
-                if (seenReqIds.has(batchReq.provenTxReqId))
-                    continue;
+            for (const batchReq of batchReqs)
                 seenReqIds.add(batchReq.provenTxReqId);
-                expanded.push(batchReq);
+            if (batchReqs.length > MAX_ATOMIC_BROADCAST_TXIDS) {
+                oversizedBatches++;
+                continue;
+            }
+            const newBatchReqs = batchReqs.filter(batchReq => !expanded.some(candidate => candidate.provenTxReqId === batchReq.provenTxReqId));
+            if (expanded.length + newBatchReqs.length > MAX_ATOMIC_BROADCAST_TXIDS) {
+                deferredGroups++;
+                continue;
             }
+            expanded.push(...newBatchReqs);
         }
-        return expanded;
+        return { reqs: expanded, oversizedBatches, deferredGroups };
     }
     filterAgedReqs(reqs, agedLimit) {
         const agedReqs = [];
@@ -140,6 +174,9 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
      * @param reqApis
      */
     async processUnsent(reqApis, indent = 0) {
+        if (!Array.isArray(reqApis) || reqApis.length > MAX_ATOMIC_BROADCAST_TXIDS) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('reqApis', `an array of at most ${MAX_ATOMIC_BROADCAST_TXIDS} requests`);
+        }
         const txids = reqApis.map(r => r.txid);
         const logs = this.initializeRequestLogs(reqApis);
         const reqApiIds = new Set(reqApis.map(r => r.provenTxReqId));
@@ -194,8 +231,12 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
         // Process the entire batch together for efficient BEEF generation.
         const batchReqApis = await this.storage.findProvenTxReqs({
             partial: { batch: req.batch },
-            status: this.includeSending ? ['unsent', 'sending'] : ['unsent']
+            status: this.includeSending ? ['unsent', 'sending'] : ['unsent'],
+            paged: { limit: MAX_ATOMIC_BROADCAST_TXIDS + 1, offset: 0 }
         });
+        if (batchReqApis.length > MAX_ATOMIC_BROADCAST_TXIDS) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('batch', `at most ${MAX_ATOMIC_BROADCAST_TXIDS} requests in one atomic broadcast batch`);
+        }
         const reqs = [];
         for (const batchReq of batchReqApis) {
             if (reqApiIds.has(batchReq.provenTxReqId))

package/out/src/monitor/tasks/TaskSendWaiting.js.map

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

package/out/src/monitor/tasks/TaskUnFail.d.ts

@@ -19,6 +19,7 @@ export declare class TaskUnFail extends WalletMonitorTask {
      * Set to true to trigger running this task
      */
     private static checkNowRequested;
+    private readonly authenticatedRequests;
     static get checkNow(): boolean;
     static set checkNow(value: boolean);
     constructor(monitor: Monitor, triggerMsecs?: number);

package/out/src/monitor/tasks/TaskUnFail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskUnFail.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskUnFail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjE;;;;;;;;;GASG;AACH,qBAAa,UAAW,SAAQ,iBAAiB;IAYtC,YAAY;IAXrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,YAAW;IAEnC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,MAAM,KAAK,QAAQ,IAAK,OAAO,CAAkC;IACjE,MAAM,KAAK,QAAQ,CAAE,KAAK,EAAE,OAAO,EAAoC;IAEvE,YACE,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB,EAG7C;IAED,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAMrD;IAEK,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC,CAqBhC;IAEK,MAAM,CAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAiB5E;IAED;;;;;;;;OAQG;IACG,SAAS,CAAE,GAAG,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIxE;CACF"}
+{"version":3,"file":"TaskUnFail.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskUnFail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAKjE;;;;;;;;;GASG;AACH,qBAAa,UAAW,SAAQ,iBAAiB;IAatC,YAAY;IAZrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,YAAW;IAEnC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAmC;IACzE,MAAM,KAAK,QAAQ,IAAK,OAAO,CAAkC;IACjE,MAAM,KAAK,QAAQ,CAAE,KAAK,EAAE,OAAO,EAAoC;IAEvE,YACE,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB,EAG7C;IAED,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAMrD;IAEK,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC,CAsBhC;IAEK,MAAM,CAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAyB5E;IAED;;;;;;;;OAQG;IACG,SAAS,CAAE,GAAG,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOxE;CACF"}

package/out/src/monitor/tasks/TaskUnFail.js

@@ -4,6 +4,10 @@ exports.TaskUnFail = void 0;
 const Monitor_1 = require("../Monitor");
 const WalletMonitorTask_1 = require("./WalletMonitorTask");
 const entities_1 = require("../../storage/schema/entities");
+const validateMerklePathResult_1 = require("../../services/validateMerklePathResult");
+const utilityHelpers_1 = require("../../utility/utilityHelpers");
+const utilityHelpers_noBuffer_1 = require("../../utility/utilityHelpers.noBuffer");
+const WERR_errors_1 = require("../../sdk/WERR_errors");
 /**
  * Setting provenTxReq status to 'unfail' when 'invalid' will attempt to find a merklePath, and if successful:
  *
@@ -21,6 +25,7 @@ class TaskUnFail extends WalletMonitorTask_1.WalletMonitorTask {
      * Set to true to trigger running this task
      */
     static checkNowRequested = false;
+    authenticatedRequests = new WeakSet();
     static get checkNow() { return this.checkNowRequested; }
     static set checkNow(value) { this.checkNowRequested = value; }
     constructor(monitor, triggerMsecs = Monitor_1.Monitor.oneMinute * 10) {
@@ -37,12 +42,14 @@ class TaskUnFail extends WalletMonitorTask_1.WalletMonitorTask {
         let log = '';
         TaskUnFail.checkNow = false;
         const limit = 100;
-        let offset = 0;
         for (;;) {
             const reqs = await this.storage.findProvenTxReqs({
                 partial: {},
                 status: ['unfail'],
-                paged: { limit, offset }
+                // Every successfully processed row leaves the 'unfail' set, so keep
+                // reading its first page. Advancing an offset here skips rows after
+                // the preceding page is updated.
+                paged: { limit, offset: 0 }
             });
             if (reqs.length === 0)
                 break;
@@ -51,7 +58,6 @@ class TaskUnFail extends WalletMonitorTask_1.WalletMonitorTask {
             log += `${r.log}\n`;
             if (reqs.length < limit)
                 break;
-            offset += limit;
         }
         return log;
     }
@@ -62,15 +68,24 @@ class TaskUnFail extends WalletMonitorTask_1.WalletMonitorTask {
             log += ' '.repeat(indent);
             log += `reqId ${reqApi.provenTxReqId} txid ${reqApi.txid}: `;
             const r = await this.monitor.services.getMerklePath(req.txid);
-            if (r.merklePath != null) {
-                log += 'unfailed. status is now \'unmined\'\n';
-                log += await this.unfailReq(req, indent + 2);
+            try {
+                if (r.merklePath == null || r.header == null)
+                    throw new Error('No proof was returned.');
+                if (req.rawTx == null || (0, utilityHelpers_noBuffer_1.asString)((0, utilityHelpers_1.doubleSha256BE)(req.rawTx)) !== req.txid.toLowerCase()) {
+                    throw new Error('The request transaction bytes do not match its txid.');
+                }
+                await (0, validateMerklePathResult_1.authenticateMerklePathResult)(req.txid, r, this.monitor.chaintracks, false, false);
             }
-            else {
+            catch {
                 req.status = 'invalid';
-                log += 'returned to status \'invalid\'\n';
+                req.addHistoryNote({ what: 'unfailProofRejected' }, true);
+                log += 'proof unavailable or rejected; returned to status \'invalid\'\n';
                 await req.updateStorageDynamicProperties(this.storage);
+                continue;
             }
+            this.authenticatedRequests.add(req);
+            log += 'authenticated and unfailed. status is now \'unmined\'\n';
+            log += await this.unfailReq(req, indent + 2);
         }
         return { log };
     }
@@ -84,6 +99,9 @@ class TaskUnFail extends WalletMonitorTask_1.WalletMonitorTask {
      * @returns
      */
     async unfailReq(req, indent) {
+        if (!this.authenticatedRequests.delete(req)) {
+            throw new WERR_errors_1.WERR_INVALID_OPERATION('Unfail requires a proof authenticated for this exact request.');
+        }
         return await this.storage.runAsStorageProvider(async (sp) => await sp.unfailTransactionsForProof(req, indent, { status: 'unmined', attempts: 0 }));
     }
 }

package/out/src/monitor/tasks/TaskUnFail.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskUnFail.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskUnFail.ts"],"names":[],"mappings":";;;AAAA,wCAAoC;AACpC,2DAAuD;AAEvD,4DAAiE;AACjE;;;;;;;;;GASG;AACH,gBAAwB,SAAQ,qCAAiB;IAYtC,YAAY;IAXrB,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAA;IAEnC;;OAEG;IACK,MAAM,CAAC,iBAAiB,GAAG,KAAK,CAAA;IACxC,MAAM,KAAK,QAAQ,KAAe,OAAO,IAAI,CAAC,iBAAiB,CAAA,CAAC,CAAC;IACjE,MAAM,KAAK,QAAQ,CAAE,KAAc,IAAI,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAA,CAAC,CAAC;IAEvE,YACE,OAAgB,EACT,YAAY,GAAG,iBAAO,CAAC,SAAS,GAAG,EAAE;QAE5C,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAA;4BAF5B,YAAY;IAGrB,CAAC;IAED,OAAO,CAAE,kBAA0B;QACjC,OAAO;YACL,GAAG,EACD,UAAU,CAAC,QAAQ;gBACnB,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY,CAAC;SAClG,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAA;QAE3B,MAAM,KAAK,GAAG,GAAG,CAAA;QACjB,IAAI,MAAM,GAAG,CAAC,CAAA;QACd,SAAS,CAAC;YACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBAC/C,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,CAAC,QAAQ,CAAC;gBAClB,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;aACzB,CAAC,CAAA;YACF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAK;YAC5B,GAAG,IAAI,GAAG,IAAI,CAAC,MAAM,8BAA8B,CAAA;YACnD,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;YACpC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAA;YACnB,IAAI,IAAI,CAAC,MAAM,GAAG,KAAK;gBAAE,MAAK;YAC9B,MAAM,IAAI,KAAK,CAAA;QACjB,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,IAAwB,EAAE,MAAM,GAAG,CAAC;QAChD,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,IAAI,4BAAiB,CAAC,MAAM,CAAC,CAAA;YACzC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACzB,GAAG,IAAI,SAAS,MAAM,CAAC,aAAa,SAAS,MAAM,CAAC,IAAI,IAAI,CAAA;YAC5D,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YAC7D,IAAI,CAAC,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;gBACzB,GAAG,IAAI,uCAAuC,CAAA;gBAC9C,GAAG,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,CAAA;YAC9C,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,GAAG,SAAS,CAAA;gBACtB,GAAG,IAAI,kCAAkC,CAAA;gBACzC,MAAM,GAAG,CAAC,8BAA8B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACxD,CAAC;QACH,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,CAAA;IAChB,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,SAAS,CAAE,GAAsB,EAAE,MAAc;QACrD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE,CACxD,MAAM,EAAE,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CACrF,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"TaskUnFail.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskUnFail.ts"],"names":[],"mappings":"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"}

package/out/src/monitor/tasks/index.all.d.ts

@@ -2,6 +2,7 @@ export * from './WalletMonitorTask';
 export * from './TaskArcSSE';
 export * from './TaskCheckForProofs';
 export * from './TaskCheckNoSends';
+export * from './TaskNoSendExpiry';
 export * from './TaskCleanupActionBatches';
 export * from './TaskClock';
 export * from './TaskFailAbandoned';
@@ -11,6 +12,7 @@ export * from './TaskNewHeader';
 export * from './TaskPurge';
 export * from './TaskReorg';
 export * from './TaskReviewDoubleSpends';
+export * from './TaskReconcilePendingTransactions';
 export * from './TaskReviewProvenTxs';
 export * from './TaskReviewStatus';
 export * from './TaskReviewUtxos';

package/out/src/monitor/tasks/index.all.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.all.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/index.all.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,cAAc,CAAA;AAC5B,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.all.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/index.all.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,cAAc,CAAA;AAC5B,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,0BAA0B,CAAA;AACxC,cAAc,oCAAoC,CAAA;AAClD,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,cAAc,CAAA"}

package/out/src/monitor/tasks/index.all.js

@@ -18,6 +18,7 @@ __exportStar(require("./WalletMonitorTask"), exports);
 __exportStar(require("./TaskArcSSE"), exports);
 __exportStar(require("./TaskCheckForProofs"), exports);
 __exportStar(require("./TaskCheckNoSends"), exports);
+__exportStar(require("./TaskNoSendExpiry"), exports);
 __exportStar(require("./TaskCleanupActionBatches"), exports);
 __exportStar(require("./TaskClock"), exports);
 __exportStar(require("./TaskFailAbandoned"), exports);
@@ -27,6 +28,7 @@ __exportStar(require("./TaskNewHeader"), exports);
 __exportStar(require("./TaskPurge"), exports);
 __exportStar(require("./TaskReorg"), exports);
 __exportStar(require("./TaskReviewDoubleSpends"), exports);
+__exportStar(require("./TaskReconcilePendingTransactions"), exports);
 __exportStar(require("./TaskReviewProvenTxs"), exports);
 __exportStar(require("./TaskReviewStatus"), exports);
 __exportStar(require("./TaskReviewUtxos"), exports);

package/out/src/monitor/tasks/index.all.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.all.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/index.all.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAmC;AACnC,+CAA4B;AAC5B,uDAAoC;AACpC,qDAAkC;AAClC,6DAA0C;AAC1C,8CAA2B;AAC3B,sDAAmC;AACnC,kDAA+B;AAC/B,2DAAwC;AACxC,kDAA+B;AAC/B,8CAA2B;AAC3B,8CAA2B;AAC3B,2DAAwC;AACxC,wDAAqC;AACrC,qDAAkC;AAClC,oDAAiC;AACjC,oDAAiC;AACjC,qDAAkC;AAClC,+CAA4B"}
+{"version":3,"file":"index.all.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/index.all.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAmC;AACnC,+CAA4B;AAC5B,uDAAoC;AACpC,qDAAkC;AAClC,qDAAkC;AAClC,6DAA0C;AAC1C,8CAA2B;AAC3B,sDAAmC;AACnC,kDAA+B;AAC/B,2DAAwC;AACxC,kDAA+B;AAC/B,8CAA2B;AAC3B,8CAA2B;AAC3B,2DAAwC;AACxC,qEAAkD;AAClD,wDAAqC;AACrC,qDAAkC;AAClC,oDAAiC;AACjC,oDAAiC;AACjC,qDAAkC;AAClC,+CAA4B"}