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

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

@@ -6,7 +6,10 @@ const entities_1 = require("../../storage/schema/entities");
 const EntityProvenTxReq_1 = require("../../storage/schema/entities/EntityProvenTxReq");
 const ArcSSEClient_1 = require("../../services/providers/ArcSSEClient");
 const WalletMonitorTask_1 = require("./WalletMonitorTask");
-const TaskUnFail_1 = require("./TaskUnFail");
+const reconcileFailedTransactionInputs_1 = require("../../storage/methods/reconcileFailedTransactionInputs");
+const arcadeStatus_1 = require("../../services/providers/arcadeStatus");
+const safeDiagnostic_1 = require("../../services/chaintracker/chaintracks/util/safeDiagnostic");
+const getCanonicalMerklePath_1 = require("../../services/getCanonicalMerklePath");
 /**
  * Monitor task that receives transaction status updates from Arcade via SSE
  * and processes them — including fetching merkle proofs directly from Arcade
@@ -20,6 +23,8 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
         super(monitor, TaskArcadeSSE.taskName);
     }
     async asyncSetup() {
+        if (this.sseClient != null)
+            return;
         const callbackToken = this.monitor.options.callbackToken;
         if (callbackToken == null || callbackToken === '') {
             await this.logSetupEvent('no callbackToken configured; SSE disabled');
@@ -40,26 +45,28 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
             lastEventId = await this.monitor.options.loadLastSSEEventId?.();
         }
         catch (e) {
-            await this.logSetupEvent(`failed to load lastEventId: ${stringifyError(e)}`);
+            await this.logSetupEvent(`failed to load lastEventId: ${(0, safeDiagnostic_1.safeDiagnostic)(e)}`);
         }
         const arcadeApiKey = this.monitor.services.options?.arcadeConfig?.apiKey;
-        await this.logSetupEvent(`setting up SSE for arcadeUrl=${arcadeUrl}; lastEventId=${lastEventId ?? '(none)'}`);
+        await this.logSetupEvent('setting up configured Arcade SSE endpoint');
         this.sseClient = new ArcSSEClient_1.ArcSSEClient({
             baseUrl: arcadeUrl,
             callbackToken,
             arcApiKey: arcadeApiKey,
             lastEventId,
             EventSourceClass,
-            onEvent: event => {
-                this.pendingEvents.push(event);
-            },
+            onEvent: async (event) => await new Promise((acknowledge, reject) => {
+                // ArcSSEClient waits for this promise before dispatching the next
+                // event. Keep an independent one-item bound in case a replacement
+                // client violates that contract.
+                if (this.pendingEvents.length > 0) {
+                    reject(new Error('Arcade SSE monitor event capacity was exceeded.'));
+                    return;
+                }
+                this.pendingEvents.push({ event: { ...event }, acknowledge, reject });
+            }),
             onError: err => {
-                void this.logSetupEvent(`SSE error: ${err.message}`);
-            },
-            onLastEventIdChanged: (id) => {
-                this.monitor.options.saveLastSSEEventId?.(id).catch(e => {
-                    void this.logSetupEvent(`failed to persist lastEventId: ${stringifyError(e)}`);
-                });
+                void this.logSetupEvent(`SSE error: ${(0, safeDiagnostic_1.safeDiagnostic)(err)}`);
             }
         });
         this.sseClient.connect();
@@ -76,12 +83,26 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
         return { run: this.pendingEvents.length > 0 };
     }
     async runTask() {
-        const events = this.pendingEvents.splice(0);
-        if (events.length === 0)
+        const eventCount = this.pendingEvents.length;
+        if (eventCount === 0)
             return '';
         let log = '';
-        for (const event of events) {
-            log += await this.processStatusEvent(event);
+        for (let i = 0; i < eventCount; i++) {
+            // Do not remove or acknowledge an event until its storage work succeeds.
+            // A thrown storage error leaves this event at the head for the next run.
+            const pending = this.pendingEvents[0];
+            log += await this.processStatusEvent(pending.event);
+            if (pending.event.eventId != null) {
+                try {
+                    await this.monitor.options.saveLastSSEEventId?.(pending.event.eventId);
+                }
+                catch (e) {
+                    await this.logSetupEvent(`failed to persist lastEventId: ${(0, safeDiagnostic_1.safeDiagnostic)(e)}`);
+                    throw e;
+                }
+            }
+            this.pendingEvents.shift();
+            pending.acknowledge();
         }
         return log;
     }
@@ -90,6 +111,14 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
             return 0;
         return await this.sseClient.fetchEvents();
     }
+    /** Close the live stream and reject any unacknowledged monitor event. */
+    close() {
+        this.sseClient?.close();
+        this.sseClient = null;
+        const error = new Error('Arcade SSE monitor task closed.');
+        for (const pending of this.pendingEvents.splice(0))
+            pending.reject(error);
+    }
     async processStatusEvent(event) {
         let log = `SSE: txid=${event.txid} status=${event.txStatus}\n`;
         const reqs = await this.storage.findProvenTxReqs({
@@ -101,34 +130,30 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
         }
         for (const reqApi of reqs) {
             const req = new EntityProvenTxReq_1.EntityProvenTxReq(reqApi);
-            // Arcade can emit REJECTED before another node accepts the same transaction.
-            // Permit a later positive network observation to heal requests that an older
-            // Monitor version prematurely marked invalid.
-            const canRecoverRejectedRequest = this.canRecoverRejectedRequest(req, event);
-            if (types_1.ProvenTxReqTerminalStatus.includes(req.status) && !canRecoverRejectedRequest) {
+            // A cached in-network label is not stronger than a durable terminal
+            // rejection. Only a mined event, followed by validation of its proof,
+            // may repair an invalid or double-spend request.
+            const canRecoverTerminalRequest = this.canRecoverTerminalRequest(req, event);
+            if (types_1.ProvenTxReqTerminalStatus.includes(req.status) && !canRecoverTerminalRequest) {
                 log += `  req ${req.id} already terminal: ${req.status}\n`;
                 continue;
             }
             const note = {
                 when: new Date().toISOString(),
                 what: 'arcSSE',
-                arcStatus: event.txStatus
+                arcStatus: event.txStatus,
+                ...(event.timestamp !== '' ? { arcTimestamp: event.timestamp } : {}),
+                ...(event.status != null ? { statusCode: event.status } : {}),
+                ...(event.extraInfo != null && event.extraInfo !== '' ? { extraInfo: event.extraInfo.slice(0, 512) } : {})
             };
             log += await this.applyStatusEvent(req, event, note);
         }
         this.monitor.callOnTransactionStatusChanged(event.txid, event.txStatus);
         return log;
     }
-    canRecoverRejectedRequest(req, event) {
-        const acceptedStatuses = [
-            'SENT_TO_NETWORK',
-            'ACCEPTED_BY_NETWORK',
-            'SEEN_ON_NETWORK',
-            'SEEN_MULTIPLE_NODES'
-        ];
+    canRecoverTerminalRequest(req, event) {
         const confirmedStatuses = ['MINED', 'IMMUTABLE'];
-        return req.status === 'invalid' &&
-            (acceptedStatuses.includes(event.txStatus) || confirmedStatuses.includes(event.txStatus));
+        return (req.status === 'invalid' || req.status === 'doubleSpend') && confirmedStatuses.includes(event.txStatus);
     }
     async applyStatusEvent(req, event, note) {
         switch (event.txStatus) {
@@ -141,67 +166,88 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
             case 'IMMUTABLE':
                 return await this.applyMinedStatus(req, note);
             case 'DOUBLE_SPEND_ATTEMPTED':
-                return await this.applyDoubleSpendStatus(req, note);
+            case 'SEEN_IN_ORPHAN_MEMPOOL':
+                return await this.applyDoubleSpendStatus(req, event, note);
             case 'REJECTED':
-                // REJECTED is not a final consensus result: production Arcade has
-                // subsequently reported SEEN_MULTIPLE_NODES for the same txid. Keep
-                // wallet inputs reserved while proof/rebroadcast processing resolves
-                // the transaction authoritatively.
+                return await this.applyRejectedStatus(req, event, note);
+            case 'RECEIVED':
+            case 'PENDING_RETRY':
+            case 'STUMP_PROCESSING':
+            case 'UNKNOWN':
                 req.addHistoryNote(note);
                 await req.updateStorageDynamicProperties(this.storage);
-                return `  req ${req.id} rejection recorded; awaiting resolution\n`;
+                return `  req ${req.id} ${event.txStatus} recorded; awaiting resolution\n`;
             default:
                 return `  req ${req.id} unhandled status: ${event.txStatus}\n`;
         }
     }
     async applyAcceptedStatus(req, note) {
-        if (!['unsent', 'sending', 'callback', 'invalid'].includes(req.status))
+        if (!['unsent', 'sending', 'callback'].includes(req.status))
             return '';
-        const wasInvalid = req.status === 'invalid';
-        let log = '';
-        if (wasInvalid) {
-            // Restore transaction state, re-reserve wallet inputs, and verify output
-            // spendability using the established unfail repair path.
-            log += await new TaskUnFail_1.TaskUnFail(this.monitor).unfailReq(req, 4);
-        }
-        else if (req.notify.transactionIds != null) {
+        if (req.notify.transactionIds != null) {
             await this.storage.runAsStorageProvider(async (sp) => {
                 await sp.updateTransactionsStatus(req.notify.transactionIds ?? [], 'unproven');
             });
         }
-        // Apply event state after recovery because the recovery helper refreshes
-        // the entity from storage before its atomic update.
         req.status = 'unmined';
-        if (wasInvalid)
-            req.attempts = 0;
         req.wasBroadcast = true;
         req.addHistoryNote(note);
         await req.updateStorageDynamicProperties(this.storage);
-        return log + `  req ${req.id} => unmined\n`;
+        return `  req ${req.id} => unmined\n`;
     }
     async applyMinedStatus(req, note) {
-        let log = '';
-        if (req.status === 'invalid') {
-            log += await new TaskUnFail_1.TaskUnFail(this.monitor).unfailReq(req, 4);
-            req.status = 'unmined';
-            req.attempts = 0;
-            req.wasBroadcast = true;
-        }
         req.addHistoryNote(note);
         await req.updateStorageDynamicProperties(this.storage);
-        return log + await this.fetchProofFromServices(req);
+        return await this.fetchProofFromServices(req);
     }
-    async applyDoubleSpendStatus(req, note) {
-        req.status = 'doubleSpend';
-        req.addHistoryNote(note);
-        await req.updateStorageDynamicProperties(this.storage);
-        const ids = req.notify.transactionIds;
-        if (ids != null) {
-            await this.storage.runAsStorageProvider(async (sp) => {
-                await sp.updateTransactionsStatus(ids, 'failed');
+    async applyDoubleSpendStatus(req, event, note) {
+        return await this.applyTerminalFailure(req, note, (0, arcadeStatus_1.classifyArcadeRejection)(event));
+    }
+    classifyRejection(event) {
+        return (0, arcadeStatus_1.classifyArcadeRejection)(event);
+    }
+    async applyRejectedStatus(req, event, note) {
+        const classification = this.classifyRejection(event);
+        if (!classification.terminal) {
+            req.addHistoryNote({
+                ...note,
+                what: 'arcSSERejectionPending',
+                reason: classification.reason
             });
+            await req.updateStorageDynamicProperties(this.storage);
+            return `  req ${req.id} rejection recorded; awaiting resolution\n`;
         }
-        return `  req ${req.id} => doubleSpend\n`;
+        return await this.applyTerminalFailure(req, note, classification);
+    }
+    async applyTerminalFailure(req, note, classification) {
+        let quarantined = { checked: 0, staleConfirmed: 0, staleOutpoints: [] };
+        await this.storage.runAsStorageProvider(async (sp) => {
+            await sp.transaction(async (trx) => {
+                req.status = classification.reqStatus;
+                req.addHistoryNote({
+                    ...note,
+                    what: 'arcSSETerminalRejection',
+                    reason: classification.reason,
+                    inputConflict: classification.inputConflict
+                });
+                await req.updateStorageDynamicProperties(sp, trx);
+                const ids = req.notify.transactionIds;
+                if (ids != null)
+                    await sp.updateTransactionsStatus(ids, 'failed', trx);
+                if (classification.inputConflict) {
+                    quarantined = await (0, reconcileFailedTransactionInputs_1.quarantineReqInputs)(req, sp, trx);
+                    req.addHistoryNote({
+                        when: new Date().toISOString(),
+                        what: 'arcSSEInputQuarantine',
+                        checked: quarantined.checked,
+                        confirmed: quarantined.staleConfirmed,
+                        ...(quarantined.staleOutpoints.length > 0 ? { outpoints: quarantined.staleOutpoints.join(',') } : {})
+                    });
+                    await req.updateStorageDynamicProperties(sp, trx);
+                }
+            });
+        });
+        return `  req ${req.id} => ${classification.reqStatus}; quarantined ${quarantined.staleConfirmed} local input copy/copies\n`;
     }
     /**
      * Complete a MINED/IMMUTABLE status by using the configured proof providers.
@@ -212,8 +258,8 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
         const txid = req.txid;
         let log = `  req ${req.id} MINED/IMMUTABLE — fetching proof from configured services\n`;
         try {
-            const proof = await this.monitor.services.getMerklePath(txid);
-            const ptx = await entities_1.EntityProvenTx.fromReq(req, proof, false, this.monitor.options.maxRebroadcastAttempts ?? 0);
+            const proof = await (0, getCanonicalMerklePath_1.getCanonicalMerklePath)(this.monitor.services, this.monitor.chaintracksWithEvents || this.monitor.chaintracks, txid);
+            const ptx = await entities_1.EntityProvenTx.fromReq(req, proof, false, this.monitor.options.maxRebroadcastAttempts ?? 0, this.monitor.chaintracks);
             if (ptx == null) {
                 log += `    No validated merkle proof available from ${proof.name ?? 'configured services'}\n`;
                 return log;
@@ -253,7 +299,7 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
             log += `    proved by ${proof.name ?? 'configured services'} at height ${height}, index ${index} => ${r.status}\n`;
         }
         catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
+            const msg = (0, safeDiagnostic_1.safeDiagnostic)(err);
             log += `    error fetching proof: ${msg}\n`;
             req.addHistoryNote({ when: new Date().toISOString(), what: 'arcProofError', error: msg });
             await req.updateStorageDynamicProperties(this.storage);
@@ -262,7 +308,4 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
     }
 }
 exports.TaskArcadeSSE = TaskArcadeSSE;
-function stringifyError(error) {
-    return error instanceof Error ? error.message : String(error);
-}
 //# sourceMappingURL=TaskArcSSE.js.map

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

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

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

@@ -1,4 +1,5 @@
 import { TableProvenTxReq } from '../../storage/schema/tables';
+import { ProvenTxReqStatus } from '../../sdk/types';
 import { Monitor } from '../Monitor';
 import { WalletMonitorTask } from './WalletMonitorTask';
 /**
@@ -50,6 +51,10 @@ export declare class TaskCheckForProofs extends WalletMonitorTask {
 export declare function getProofs(task: WalletMonitorTask, reqs: TableProvenTxReq[], maxAcceptableHeight: number, indent?: number, countsAsAttempt?: boolean, ignoreStatus?: boolean): Promise<{
     proven: TableProvenTxReq[];
     invalid: TableProvenTxReq[];
+    processed: Array<{
+        provenTxReqId: number;
+        status: ProvenTxReqStatus;
+    }>;
     log: string;
 }>;
 //# sourceMappingURL=TaskCheckForProofs.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TaskCheckForProofs.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskCheckForProofs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAG9D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;;;;GAWG;AACH,qBAAa,kBAAmB,SAAQ,iBAAiB;IAa9C,YAAY;IAZrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,oBAAmB;IAE3C;;;OAGG;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,SAAI,EAGxB;IAED;;OAEG;IACH,OAAO,CAAC,mBAAmB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAMrD;IAEK,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CA0B/B;CACF;AAoLD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,iBAAiB,EACvB,IAAI,EAAE,gBAAgB,EAAE,EACxB,mBAAmB,EAAE,MAAM,EAC3B,MAAM,SAAI,EACV,eAAe,UAAQ,EACvB,YAAY,UAAQ,GACnB,OAAO,CAAC;IACT,MAAM,EAAE,gBAAgB,EAAE,CAAA;IAC1B,OAAO,EAAE,gBAAgB,EAAE,CAAA;IAC3B,GAAG,EAAE,MAAM,CAAA;CACZ,CAAC,CAoBD"}
+{"version":3,"file":"TaskCheckForProofs.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskCheckForProofs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAInD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;;;;GAWG;AACH,qBAAa,kBAAmB,SAAQ,iBAAiB;IAiB9C,YAAY;IAhBrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,oBAAmB;IAE3C;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,MAAM,KAAK,QAAQ,IAAI,OAAO,CAE7B;IACD,MAAM,KAAK,QAAQ,CAAC,KAAK,EAAE,OAAO,EAEjC;IAED,YACE,OAAO,EAAE,OAAO,EACT,YAAY,SAAI,EAIxB;IAED;;OAEG;IACH,OAAO,CAAC,mBAAmB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAMrD;IAEK,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CA0B/B;CACF;AAmLD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,iBAAiB,EACvB,IAAI,EAAE,gBAAgB,EAAE,EACxB,mBAAmB,EAAE,MAAM,EAC3B,MAAM,SAAI,EACV,eAAe,UAAQ,EACvB,YAAY,UAAQ,GACnB,OAAO,CAAC;IACT,MAAM,EAAE,gBAAgB,EAAE,CAAA;IAC1B,OAAO,EAAE,gBAAgB,EAAE,CAAA;IAC3B,SAAS,EAAE,KAAK,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE,CAAC,CAAA;IACtE,GAAG,EAAE,MAAM,CAAA;CACZ,CAAC,CAeD"}

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

@@ -5,6 +5,8 @@ exports.getProofs = getProofs;
 const entities_1 = require("../../storage/schema/entities");
 const utilityHelpers_1 = require("../../utility/utilityHelpers");
 const utilityHelpers_noBuffer_1 = require("../../utility/utilityHelpers.noBuffer");
+const getCanonicalMerklePath_1 = require("../../services/getCanonicalMerklePath");
+const monitorValidation_1 = require("../monitorValidation");
 const WalletMonitorTask_1 = require("./WalletMonitorTask");
 /**
  * `TaskCheckForProofs` is a WalletMonitor task that retreives merkle proofs for
@@ -26,11 +28,16 @@ class TaskCheckForProofs extends WalletMonitorTask_1.WalletMonitorTask {
      * listener can set this true to cause
      */
     static checkNowRequested = false;
-    static get checkNow() { return this.checkNowRequested; }
-    static set checkNow(value) { this.checkNowRequested = value; }
+    static get checkNow() {
+        return this.checkNowRequested;
+    }
+    static set checkNow(value) {
+        this.checkNowRequested = value;
+    }
     constructor(monitor, triggerMsecs = 0) {
         super(monitor, TaskCheckForProofs.taskName);
         this.triggerMsecs = triggerMsecs;
+        (0, monitorValidation_1.requireMonitorInteger)(triggerMsecs, 'triggerMsecs', 0, monitorValidation_1.MAX_MONITOR_INTERVAL_MSECS);
     }
     /**
      * Normally triggered by checkNow getting set by new block header found event from chaintracks
@@ -65,20 +72,13 @@ class TaskCheckForProofs extends WalletMonitorTask_1.WalletMonitorTask {
             log += `${r.log}\n`;
             if (reqs.length < limit)
                 break;
-            offset += limit;
+            offset += r.processed.filter(req => PROVABLE_STATUSES.has(req.status)).length;
         }
         return log;
     }
 }
 exports.TaskCheckForProofs = TaskCheckForProofs;
-const PROVABLE_STATUSES = new Set([
-    'callback',
-    'unmined',
-    'unknown',
-    'unconfirmed',
-    'nosend',
-    'sending'
-]);
+const PROVABLE_STATUSES = new Set(['callback', 'unmined', 'unknown', 'unconfirmed', 'nosend', 'sending']);
 function requestIsReadyForProof(req, ignoreStatus) {
     return ignoreStatus || PROVABLE_STATUSES.has(req.status);
 }
@@ -90,14 +90,14 @@ async function completeLinkedRequest(task, req, reqApi, log) {
     req.notified = false;
     req.status = 'completed';
     await req.updateStorageDynamicProperties(task.storage);
-    return { log, proven: reqApi };
+    return { log, status: req.status, proven: reqApi };
 }
 async function invalidateMalformedRequest(task, req, reqApi, log) {
     log += " rawTx doesn't hash to txid. status => invalid.\n";
     req.notified = false;
     req.status = 'invalid';
     await req.updateStorageDynamicProperties(task.storage);
-    return { log, invalid: reqApi };
+    return { log, status: req.status, invalid: reqApi };
 }
 async function applyProofTimeout(task, req, reqApi, ignoreStatus, log) {
     const limit = task.monitor.chain === 'main'
@@ -112,13 +112,13 @@ async function applyProofTimeout(task, req, reqApi, ignoreStatus, log) {
     if (timeout.action === 'rebroadcast') {
         log += ` too many failed attempts ${timedOutAttempts}, resetting to unsent for rebroadcast (cycle ${timeout.rebroadcastAttempts})\n`;
         await req.updateStorageDynamicProperties(task.storage);
-        return { log };
+        return { log, status: req.status };
     }
     log += wasBroadcast
         ? ` too many failed attempts ${timedOutAttempts} and rebroadcast limit ${maxRebroadcast} reached, marking invalid\n`
         : ` too many failed attempts ${timedOutAttempts} and tx was never broadcast, marking invalid\n`;
     await req.updateStorageDynamicProperties(task.storage);
-    return { log, invalid: reqApi };
+    return { log, status: req.status, invalid: reqApi };
 }
 async function applyProvenTransaction(task, req, provenTx) {
     await req.updateStorageDynamicProperties(task.storage);
@@ -157,7 +157,7 @@ async function applyProvenTransaction(task, req, provenTx) {
 async function processProofRequest(task, reqApi, maxAcceptableHeight, indent, countsAsAttempt, ignoreStatus) {
     let log = `${' '.repeat(indent)}reqId ${reqApi.provenTxReqId} txid ${reqApi.txid}: `;
     if (!requestIsReadyForProof(reqApi, ignoreStatus)) {
-        return { log: `${log}status of '${reqApi.status}' is not ready to be proven.\n` };
+        return { log: `${log}status of '${reqApi.status}' is not ready to be proven.\n`, status: reqApi.status };
     }
     const req = new entities_1.EntityProvenTxReq(reqApi);
     if (req.provenTxId != null && Number.isInteger(req.provenTxId)) {
@@ -171,24 +171,27 @@ async function processProofRequest(task, reqApi, maxAcceptableHeight, indent, co
     if (timedOut != null)
         return timedOut;
     const since = new Date();
-    const merklePathResult = await task.monitor.services.getMerklePath(req.txid);
-    if (merklePathResult.header != null &&
-        merklePathResult.header.height > maxAcceptableHeight) {
+    const merklePathResult = await (0, getCanonicalMerklePath_1.getCanonicalMerklePath)(task.monitor.services, task.monitor.chaintracksWithEvents || task.monitor.chaintracks, req.txid);
+    if (merklePathResult.header != null && merklePathResult.header.height > maxAcceptableHeight) {
         log += ` ignoring possible proof from very new block at height ${merklePathResult.header.height} ${merklePathResult.header.hash}\n`;
-        return { log };
+        return { log, status: req.status };
     }
-    const provenTx = await entities_1.EntityProvenTx.fromReq(req, merklePathResult, countsAsAttempt && req.status !== 'nosend', task.monitor.options.maxRebroadcastAttempts ?? 0);
+    const attemptsBefore = req.attempts;
+    const provenTx = await entities_1.EntityProvenTx.fromReq(req, merklePathResult, countsAsAttempt && req.status !== 'nosend', task.monitor.options.maxRebroadcastAttempts ?? 0, task.monitor.chaintracks);
     if (provenTx != null) {
         await applyProvenTransaction(task, req, provenTx);
     }
-    else if (countsAsAttempt && ['callback', 'unmined', 'unknown', 'unconfirmed', 'sending'].includes(req.status)) {
-        req.attempts++;
+    else if (countsAsAttempt &&
+        req.attempts === attemptsBefore &&
+        ['callback', 'unmined', 'unknown', 'unconfirmed', 'sending'].includes(req.status)) {
+        req.attempts = Math.min(Number.MAX_SAFE_INTEGER, req.attempts + 1);
     }
     await req.updateStorageDynamicProperties(task.storage);
     await req.refreshFromStorage(task.storage);
     log += req.historyPretty(since, indent + 2) + '\n';
     return {
         log,
+        status: req.status,
         ...(req.status === 'completed' ? { proven: req.api } : {}),
         ...(req.status === 'invalid' ? { invalid: req.api } : {})
     };
@@ -211,6 +214,7 @@ async function processProofRequest(task, reqApi, maxAcceptableHeight, indent, co
 async function getProofs(task, reqs, maxAcceptableHeight, indent = 0, countsAsAttempt = false, ignoreStatus = false) {
     const proven = [];
     const invalid = [];
+    const processed = [];
     let log = '';
     for (const reqApi of reqs) {
         const result = await processProofRequest(task, reqApi, maxAcceptableHeight, indent, countsAsAttempt, ignoreStatus);
@@ -219,7 +223,8 @@ async function getProofs(task, reqs, maxAcceptableHeight, indent = 0, countsAsAt
             proven.push(result.proven);
         if (result.invalid != null)
             invalid.push(result.invalid);
+        processed.push({ provenTxReqId: reqApi.provenTxReqId, status: result.status });
     }
-    return { proven, invalid, log };
+    return { proven, invalid, processed, log };
 }
 //# sourceMappingURL=TaskCheckForProofs.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"TaskCheckNoSends.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskCheckNoSends.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,qBAAa,gBAAiB,SAAQ,iBAAiB;IAuD5C,YAAY;IAtDrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,kBAAiB;IAEzC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,MAAM,KAAK,QAAQ,IAAK,OAAO,CAAkC;IACjE,MAAM,KAAK,QAAQ,CAAE,KAAK,EAAE,OAAO,EAAoC;IAEvE;;;;;;OAMG;IACH,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAAkB;IACrD,MAAM,CAAC,QAAQ,CAAC,oBAAoB,SAAkB;IACtD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SAA2B;IAC3D,MAAM,CAAC,QAAQ,CAAC,eAAe,SAAgC;IAC/D,MAAM,CAAC,QAAQ,CAAC,kBAAkB,KAAO;IACzC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,OAAS;IAC3C,MAAM,CAAC,QAAQ,CAAC,kBAAkB,QAAU;IAE5C;;;;;;OAMG;IACH,MAAM,CAAC,qBAAqB,CAC1B,SAAS,EAAE,IAAI,EACf,KAAK,EAAE,MAAM,EACb,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,GACpB,OAAO,CAaT;IAED,YACE,OAAO,EAAE,OAAO,EACT,YAAY,SAAqB,EAGzC;IAED;;OAEG;IACH,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAMrD;IAEK,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC,CAoDhC;CACF"}
+{"version":3,"file":"TaskCheckNoSends.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskCheckNoSends.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAGpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,qBAAa,gBAAiB,SAAQ,iBAAiB;IA2D5C,YAAY;IA1DrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,kBAAiB;IAEzC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,MAAM,KAAK,QAAQ,IAAI,OAAO,CAE7B;IACD,MAAM,KAAK,QAAQ,CAAC,KAAK,EAAE,OAAO,EAEjC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAAgB;IACnD,MAAM,CAAC,QAAQ,CAAC,oBAAoB,SAAiB;IACrD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SAAsB;IACtD,MAAM,CAAC,QAAQ,CAAC,eAAe,SAA0B;IACzD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,KAAI;IACtC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,OAAM;IACxC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,QAAO;IAEzC;;;;;;OAMG;IACH,MAAM,CAAC,qBAAqB,CAC1B,SAAS,EAAE,IAAI,EACf,KAAK,EAAE,MAAM,EACb,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,GACpB,OAAO,CAaT;IAED,YACE,OAAO,EAAE,OAAO,EACT,YAAY,SAAqB,EAIzC;IAED;;OAEG;IACH,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAMpD;IAEK,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAiD/B;CACF"}

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskCheckNoSends = void 0;
 const Monitor_1 = require("../Monitor");
+const monitorValidation_1 = require("../monitorValidation");
 const TaskCheckForProofs_1 = require("./TaskCheckForProofs");
 const WalletMonitorTask_1 = require("./WalletMonitorTask");
 /**
@@ -61,8 +62,12 @@ class TaskCheckNoSends extends WalletMonitorTask_1.WalletMonitorTask {
      * listener can set this true to cause
      */
     static checkNowRequested = false;
-    static get checkNow() { return this.checkNowRequested; }
-    static set checkNow(value) { this.checkNowRequested = value; }
+    static get checkNow() {
+        return this.checkNowRequested;
+    }
+    static set checkNow(value) {
+        this.checkNowRequested = value;
+    }
     /**
      * Aging-schedule constants for the `checkNow` path. Rows below `tier0FreshSkipMsecs`
      * are never checked via checkNow (batched-tx protection). Rows from tier 0 up
@@ -103,6 +108,7 @@ class TaskCheckNoSends extends WalletMonitorTask_1.WalletMonitorTask {
     constructor(monitor, triggerMsecs = Monitor_1.Monitor.oneDay * 1) {
         super(monitor, TaskCheckNoSends.taskName);
         this.triggerMsecs = triggerMsecs;
+        (0, monitorValidation_1.requireMonitorInteger)(triggerMsecs, 'triggerMsecs', 0, monitorValidation_1.MAX_MONITOR_INTERVAL_MSECS);
     }
     /**
      * Normally triggered by checkNow getting set by new block header found event from chaintracks
@@ -146,13 +152,15 @@ class TaskCheckNoSends extends WalletMonitorTask_1.WalletMonitorTask {
                     log += `aging schedule: skipping ${skipped} of ${reqs.length} reqs on checkNow path (block-triggered)\n`;
                 }
             }
+            let retainedEligible = 0;
             if (eligible.length > 0) {
                 const r = await (0, TaskCheckForProofs_1.getProofs)(this, eligible, maxAcceptableHeight, 2, countsAsAttempt, false);
                 log += `${r.log}\n`;
+                retainedEligible = r.processed.filter(req => req.status === 'nosend').length;
             }
             if (reqs.length < limit)
                 break;
-            offset += limit;
+            offset += reqs.length - eligible.length + retainedEligible;
         }
         return log;
     }