@bsv/wallet-toolbox 2.1.8 → 2.1.10

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

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskReviewDoubleSpends = void 0;
+const Monitor_1 = require("../Monitor");
+const WalletMonitorTask_1 = require("./WalletMonitorTask");
+/**
+ * Review recent reqs in terminal 'doubleSpend' state and move any false positives
+ * back to 'unfail' so existing recovery handling can re-process them.
+ */
+class TaskReviewDoubleSpends extends WalletMonitorTask_1.WalletMonitorTask {
+    constructor(monitor, triggerMsecs = Monitor_1.Monitor.oneMinute * 12, reviewLimit = 100, minAgeMinutes = 60, triggerQuickMsecs = Monitor_1.Monitor.oneMinute * 1) {
+        super(monitor, TaskReviewDoubleSpends.taskName);
+        this.triggerMsecs = triggerMsecs;
+        this.reviewLimit = reviewLimit;
+        this.minAgeMinutes = minAgeMinutes;
+        this.triggerQuickMsecs = triggerQuickMsecs;
+        this.triggerNextMsecs = this.triggerQuickMsecs;
+    }
+    trigger(nowMsecsSinceEpoch) {
+        return {
+            run: TaskReviewDoubleSpends.checkNow ||
+                (this.triggerNextMsecs > 0 && nowMsecsSinceEpoch - this.lastRunMsecsSinceEpoch > this.triggerNextMsecs)
+        };
+    }
+    async getLastReviewedCheckpoint() {
+        let events = [];
+        await this.storage.runAsStorageProvider(async (sp) => {
+            events = await sp.findMonitorEvents({
+                partial: { event: TaskReviewDoubleSpends.taskName },
+                orderDescending: true,
+                paged: { limit: 5 }
+            });
+        });
+        for (const event of events) {
+            if (!event.details)
+                continue;
+            try {
+                const parsed = JSON.parse(event.details);
+                if (typeof parsed.resumeOffset === 'number') {
+                    return {
+                        resumeOffset: parsed.resumeOffset,
+                        expectedProvenTxReqId: parsed.expectedProvenTxReqId
+                    };
+                }
+            }
+            catch (_a) {
+                continue;
+            }
+        }
+        return undefined;
+    }
+    async runTask() {
+        var _a;
+        TaskReviewDoubleSpends.checkNow = false;
+        const checkpoint = await this.getLastReviewedCheckpoint();
+        const updatedBefore = new Date(Date.now() - this.minAgeMinutes * 60 * 1000);
+        const reqs = await this.findReqsToReview(checkpoint, updatedBefore);
+        if (reqs.length === 0) {
+            this.triggerNextMsecs = this.triggerMsecs;
+            return '';
+        }
+        this.triggerNextMsecs = reqs.length >= this.reviewLimit ? this.triggerQuickMsecs : this.triggerMsecs;
+        const reviewed = [];
+        const unfails = [];
+        let log = ``;
+        let lastRetainedDoubleSpendIndex = -1;
+        let retainedDoubleSpendCount = 0;
+        for (const req of reqs) {
+            const gsr = await this.monitor.services.getStatusForTxids([req.txid]);
+            const status = (_a = gsr.results[0]) === null || _a === void 0 ? void 0 : _a.status;
+            reviewed.push(req);
+            if (status !== 'unknown') {
+                unfails.push(req.provenTxReqId);
+                log += `unfail ${req.provenTxReqId} ${req.txid} status:${status}\n`;
+            }
+            else {
+                lastRetainedDoubleSpendIndex = reviewed.length - 1;
+                retainedDoubleSpendCount += 1;
+            }
+        }
+        if (unfails.length > 0) {
+            await this.storage.runAsStorageProvider(async (sp) => {
+                await sp.updateProvenTxReq(unfails, { status: 'unfail' });
+            });
+        }
+        return JSON.stringify({
+            minAgeMinutes: this.minAgeMinutes,
+            reviewed: reviewed.length,
+            unfails: unfails.length,
+            reviewLimit: this.reviewLimit,
+            provenTxReqIds: unfails,
+            resumeOffset: lastRetainedDoubleSpendIndex >= 0 ? reqs.sourceOffset + retainedDoubleSpendCount - 1 : undefined,
+            expectedProvenTxReqId: lastRetainedDoubleSpendIndex >= 0 ? reviewed[lastRetainedDoubleSpendIndex].provenTxReqId : undefined,
+            reviewLog: `${reviewed.length} reqs with status 'doubleSpend'\n${log}`
+        });
+    }
+    async findReqsToReview(checkpoint, updatedBefore) {
+        var _a;
+        let offset = (checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.resumeOffset) || 0;
+        if (checkpoint && checkpoint.expectedProvenTxReqId !== undefined) {
+            const verify = await this.storage.findProvenTxReqs({
+                partial: { status: 'doubleSpend' },
+                paged: { limit: 1, offset: checkpoint.resumeOffset }
+            });
+            if (((_a = verify[0]) === null || _a === void 0 ? void 0 : _a.provenTxReqId) !== checkpoint.expectedProvenTxReqId) {
+                offset = 0;
+            }
+            else {
+                offset += 1;
+            }
+        }
+        const batch = await this.storage.findProvenTxReqs({
+            partial: { status: 'doubleSpend' },
+            paged: { limit: this.reviewLimit, offset }
+        });
+        const reqs = batch.filter(req => req.updated_at <= updatedBefore);
+        reqs.sourceOffset = offset;
+        return reqs;
+    }
+}
+exports.TaskReviewDoubleSpends = TaskReviewDoubleSpends;
+TaskReviewDoubleSpends.taskName = 'ReviewDoubleSpends';
+TaskReviewDoubleSpends.checkNow = false;
+//# sourceMappingURL=TaskReviewDoubleSpends.js.map

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

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

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

@@ -0,0 +1,34 @@
+import { HeightRange } from '../../services/chaintracker/chaintracks/util/HeightRange';
+import { Monitor } from '../Monitor';
+import { WalletMonitorTask } from './WalletMonitorTask';
+export interface ReviewHeightRangeResult {
+    log: string;
+    reviewedHeights: number;
+    mismatchedHeights: number;
+    affectedTransactions: number;
+    updatedTransactions: number;
+}
+/**
+ * Backup verification task for recent proven_txs records.
+ *
+ * Reorg handling should normally be driven by TaskReorg via deactivated-header events.
+ * This task runs a lagged audit over recent heights and only reproves transactions when
+ * the currently canonical merkleRoot at a height no longer matches stored proven_txs roots.
+ */
+export declare class TaskReviewProvenTxs extends WalletMonitorTask {
+    triggerMsecs: number;
+    maxHeightsPerRun: number;
+    minBlockAge: number;
+    triggerQuickMsecs: number;
+    static taskName: string;
+    static checkNow: boolean;
+    triggerNextMsecs: number;
+    constructor(monitor: Monitor, triggerMsecs?: number, maxHeightsPerRun?: number, minBlockAge?: number, triggerQuickMsecs?: number);
+    trigger(nowMsecsSinceEpoch: number): {
+        run: boolean;
+    };
+    runTask(): Promise<string>;
+    reviewHeightRange(range: HeightRange): Promise<ReviewHeightRangeResult>;
+    getLastReviewedHeight(): Promise<number | undefined>;
+}
+//# sourceMappingURL=TaskReviewProvenTxs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TaskReviewProvenTxs.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReviewProvenTxs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0DAA0D,CAAA;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAA;IACX,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,mBAAmB,EAAE,MAAM,CAAA;CAC5B;AAeD;;;;;;GAMG;AACH,qBAAa,mBAAoB,SAAQ,iBAAiB;IAS/C,YAAY;IACZ,gBAAgB;IAChB,WAAW;IACX,iBAAiB;IAX1B,MAAM,CAAC,QAAQ,SAAoB;IAEnC,MAAM,CAAC,QAAQ,UAAQ;IAEvB,gBAAgB,EAAE,MAAM,CAAA;gBAGtB,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB,EACrC,gBAAgB,SAAM,EACtB,WAAW,SAAM,EACjB,iBAAiB,SAAwB;IAMlD,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAQ/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IA8B1B,iBAAiB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAiDvE,qBAAqB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAiC3D"}

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

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskReviewProvenTxs = void 0;
+const HeightRange_1 = require("../../services/chaintracker/chaintracks/util/HeightRange");
+const Monitor_1 = require("../Monitor");
+const WalletMonitorTask_1 = require("./WalletMonitorTask");
+/**
+ * Backup verification task for recent proven_txs records.
+ *
+ * Reorg handling should normally be driven by TaskReorg via deactivated-header events.
+ * This task runs a lagged audit over recent heights and only reproves transactions when
+ * the currently canonical merkleRoot at a height no longer matches stored proven_txs roots.
+ */
+class TaskReviewProvenTxs extends WalletMonitorTask_1.WalletMonitorTask {
+    constructor(monitor, triggerMsecs = Monitor_1.Monitor.oneMinute * 10, maxHeightsPerRun = 100, minBlockAge = 100, triggerQuickMsecs = Monitor_1.Monitor.oneMinute * 1) {
+        super(monitor, TaskReviewProvenTxs.taskName);
+        this.triggerMsecs = triggerMsecs;
+        this.maxHeightsPerRun = maxHeightsPerRun;
+        this.minBlockAge = minBlockAge;
+        this.triggerQuickMsecs = triggerQuickMsecs;
+        this.triggerNextMsecs = this.triggerQuickMsecs;
+    }
+    trigger(nowMsecsSinceEpoch) {
+        return {
+            run: TaskReviewProvenTxs.checkNow ||
+                (this.triggerNextMsecs > 0 && nowMsecsSinceEpoch - this.lastRunMsecsSinceEpoch > this.triggerNextMsecs)
+        };
+    }
+    async runTask() {
+        TaskReviewProvenTxs.checkNow = false;
+        const chaintracks = this.monitor.chaintracksWithEvents || this.monitor.chaintracks;
+        const tipHeight = await chaintracks.currentHeight();
+        const maxEligibleHeight = tipHeight - this.minBlockAge;
+        const lastReviewedHeight = await this.getLastReviewedHeight();
+        const startHeight = lastReviewedHeight === undefined ? 0 : lastReviewedHeight + 1;
+        const endHeight = Math.min(startHeight + this.maxHeightsPerRun - 1, maxEligibleHeight);
+        const range = new HeightRange_1.HeightRange(startHeight, endHeight);
+        if (range.isEmpty)
+            return '';
+        let log = `reviewing heights ${range.minHeight}..${range.maxHeight} tip=${tipHeight} minAge=${this.minBlockAge} maxPerRun=${this.maxHeightsPerRun}\n`;
+        const review = await this.reviewHeightRange(range);
+        log += review.log;
+        return JSON.stringify({
+            tipHeight,
+            minBlockAge: this.minBlockAge,
+            maxHeightsPerRun: this.maxHeightsPerRun,
+            startHeight,
+            reviewedThroughHeight: range.maxHeight,
+            reviewedHeights: review.reviewedHeights,
+            mismatchedHeights: review.mismatchedHeights,
+            affectedTransactions: review.affectedTransactions,
+            updatedTransactions: review.updatedTransactions,
+            reviewLog: log
+        });
+    }
+    async reviewHeightRange(range) {
+        const result = {
+            log: '',
+            reviewedHeights: 0,
+            mismatchedHeights: 0,
+            affectedTransactions: 0,
+            updatedTransactions: 0
+        };
+        if (range.isEmpty) {
+            this.triggerNextMsecs = this.triggerMsecs;
+            return result;
+        }
+        // If there is work to do, trigger a quick follow-up to continue processing the next range.
+        this.triggerNextMsecs = this.triggerQuickMsecs;
+        const chaintracks = this.monitor.chaintracksWithEvents || this.monitor.chaintracks;
+        for (let height = range.minHeight; height <= range.maxHeight; height++) {
+            result.reviewedHeights++;
+            const header = await chaintracks.findHeaderForHeight(height);
+            if (!header) {
+                result.log += `  height ${height} canonical header unavailable\n`;
+                continue;
+            }
+            let staleRoots = [];
+            await this.storage.runAsStorageProvider(async (sp) => {
+                staleRoots = await sp.findStaleMerkleRoots({ height, merkleRoot: header.merkleRoot });
+            });
+            if (staleRoots.length === 0)
+                continue;
+            result.mismatchedHeights++;
+            result.log += `  height ${height} canonical ${header.merkleRoot} stale ${staleRoots.join(',')}\n`;
+            for (const staleRoot of staleRoots) {
+                const reprove = await this.storage.reproveHeightMerkleRoot(height, staleRoot);
+                result.affectedTransactions += reprove.updated.length + reprove.unchanged.length + reprove.unavailable.length;
+                result.updatedTransactions += reprove.updated.length;
+                result.log += reprove.log;
+            }
+        }
+        return result;
+    }
+    async getLastReviewedHeight() {
+        let events = [];
+        await this.storage.runAsStorageProvider(async (sp) => {
+            events = await sp.findMonitorEvents({
+                partial: { event: TaskReviewProvenTxs.taskName },
+                orderDescending: true,
+                paged: { limit: 5 }
+            });
+        });
+        for (const event of events) {
+            if (!event.details)
+                continue;
+            try {
+                const parsed = JSON.parse(event.details);
+                if (typeof parsed.reviewedThroughHeight === 'number') {
+                    return parsed.reviewedThroughHeight;
+                }
+            }
+            catch (_a) {
+                continue;
+            }
+        }
+        let lastReviewedHeight = undefined;
+        await this.storage.runAsStorageProvider(async (sp) => {
+            // Start at height of first proven tx when it appears...
+            const ptxs = await sp.findProvenTxs({ partial: {}, paged: { limit: 1, offset: 0 }, orderDescending: false });
+            if (ptxs.length > 0) {
+                lastReviewedHeight = ptxs[0].height - 1;
+            }
+        });
+        return lastReviewedHeight;
+    }
+}
+exports.TaskReviewProvenTxs = TaskReviewProvenTxs;
+TaskReviewProvenTxs.taskName = 'ReviewProvenTxs';
+TaskReviewProvenTxs.checkNow = false;
+//# sourceMappingURL=TaskReviewProvenTxs.js.map

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

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

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

@@ -0,0 +1,23 @@
+import { Monitor } from '../Monitor';
+import { WalletMonitorTask } from './WalletMonitorTask';
+/**
+ * Use the reviewByIdentityKey method to review the utxos of a specific user by their identityKey.
+ *
+ * The task itself is disabled and will not run on a schedule; review must be triggered manually by calling reviewByIdentityKey.
+ */
+export declare class TaskReviewUtxos extends WalletMonitorTask {
+    triggerMsecs: number;
+    userLimit: number;
+    userOffset: number;
+    tags: string[];
+    static taskName: string;
+    static checkNow: boolean;
+    constructor(monitor: Monitor, triggerMsecs?: number, userLimit?: number, userOffset?: number, tags?: string[]);
+    trigger(_nowMsecsSinceEpoch: number): {
+        run: boolean;
+    };
+    runTask(): Promise<string>;
+    reviewByIdentityKey(identityKey: string, mode?: 'all' | 'change'): Promise<string>;
+    private toUserLog;
+}
+//# sourceMappingURL=TaskReviewUtxos.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TaskReviewUtxos.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReviewUtxos.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,iBAAiB;IAO3C,YAAY;IACZ,SAAS;IACT,UAAU;IACV,IAAI,EAAE,MAAM,EAAE;IATvB,MAAM,CAAC,QAAQ,SAAgB;IAE/B,MAAM,CAAC,QAAQ,UAAQ;gBAGrB,OAAO,EAAE,OAAO,EACT,YAAY,SAAI,EAChB,SAAS,SAAK,EACd,UAAU,SAAI,EACd,IAAI,GAAE,MAAM,EAAuB;IAK5C,OAAO,CAAC,mBAAmB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAMhD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAK1B,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,GAAE,KAAK,GAAG,QAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAkC/F,OAAO,CAAC,SAAS;CAelB"}

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

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskReviewUtxos = void 0;
+const sdk_1 = require("../../sdk");
+const WalletMonitorTask_1 = require("./WalletMonitorTask");
+/**
+ * Use the reviewByIdentityKey method to review the utxos of a specific user by their identityKey.
+ *
+ * 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 {
+    constructor(monitor, triggerMsecs = 0, userLimit = 10, userOffset = 0, tags = ['release', 'all']) {
+        super(monitor, TaskReviewUtxos.taskName);
+        this.triggerMsecs = triggerMsecs;
+        this.userLimit = userLimit;
+        this.userOffset = userOffset;
+        this.tags = tags;
+    }
+    trigger(_nowMsecsSinceEpoch) {
+        return {
+            run: false
+        };
+    }
+    async runTask() {
+        TaskReviewUtxos.checkNow = false;
+        return 'TaskReviewUtxos is disabled; use reviewByIdentityKey instead.\n';
+    }
+    async reviewByIdentityKey(identityKey, mode = 'all') {
+        const tags = ['release', ...(mode === 'all' ? ['all'] : [])];
+        const vargs = {
+            basket: sdk_1.specOpInvalidChange,
+            tags,
+            tagQueryMode: 'all',
+            includeLockingScripts: false,
+            includeTransactions: false,
+            includeCustomInstructions: false,
+            includeTags: false,
+            includeLabels: false,
+            limit: 0,
+            offset: 0,
+            seekPermission: false,
+            knownTxids: []
+        };
+        return await this.storage.runAsStorageProvider(async (sp) => {
+            const user = (await sp.findUsers({ partial: { identityKey } }))[0];
+            if (!user) {
+                return `identityKey ${identityKey} was not found\n`;
+            }
+            const auth = { userId: user.userId, identityKey: user.identityKey };
+            const result = await sp.listOutputs(auth, vargs);
+            if (result.totalOutputs === 0) {
+                return `userId ${user.userId}: no invalid utxos found, ${user.identityKey}\n`;
+            }
+            const total = result.outputs.reduce((sum, output) => sum + output.satoshis, 0);
+            return this.toUserLog(user, result.outputs, result.totalOutputs, total, tags);
+        });
+    }
+    toUserLog(user, outputs, totalOutputs, total, tags) {
+        const action = tags.includes('release') ? 'updated to unspendable' : 'found';
+        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) {
+            log += `  ${output.outpoint} ${output.satoshis} now ${output.spendable ? 'spendable' : 'spent'}\n`;
+        }
+        return log;
+    }
+}
+exports.TaskReviewUtxos = TaskReviewUtxos;
+TaskReviewUtxos.taskName = 'ReviewUtxos';
+TaskReviewUtxos.checkNow = false;
+//# sourceMappingURL=TaskReviewUtxos.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -5,14 +5,27 @@ export declare class TaskSendWaiting extends WalletMonitorTask {
     triggerMsecs: number;
     agedMsecs: number;
     sendingMsecs: number;
+    triggerQuickMsecs: number;
+    chunkLimit: number;
     static taskName: string;
     lastSendingRunMsecsSinceEpoch: number | undefined;
     includeSending: boolean;
-    constructor(monitor: Monitor, triggerMsecs?: number, agedMsecs?: number, sendingMsecs?: number);
+    triggerNextMsecs: number;
+    /**
+     * @param monitor Wallet monitor owning this task.
+     * @param triggerMsecs Normal interval between SendWaiting runs when no backlog remains.
+     * @param agedMsecs Minimum age a request must reach before this task will attempt to send it.
+     * @param sendingMsecs Minimum interval before stale `sending` requests are included again.
+     * @param triggerQuickMsecs Follow-up interval used when a full chunk was consumed and more work may remain.
+     * @param chunkLimit Maximum number of waiting requests to fetch and inspect in a single run.
+     */
+    constructor(monitor: Monitor, triggerMsecs?: number, agedMsecs?: number, sendingMsecs?: number, triggerQuickMsecs?: number, chunkLimit?: number);
     trigger(nowMsecsSinceEpoch: number): {
         run: boolean;
     };
     runTask(): Promise<string>;
+    private expandBatches;
+    private filterAgedReqs;
     /**
      * Process an array of 'unsent' status table.ProvenTxReq
      *

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":"AACA,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;IAQ3C,YAAY;IACZ,SAAS;IACT,YAAY;IATrB,MAAM,CAAC,QAAQ,SAAgB;IAE/B,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAA;IACjD,cAAc,EAAE,OAAO,CAAO;gBAG5B,OAAO,EAAE,OAAO,EACT,YAAY,SAAwB,EACpC,SAAS,SAAwB,EACjC,YAAY,SAAwB;IAK7C,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAS/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAwBhC;;;;;;;;;;;;;;;;OAgBG;IACG,aAAa,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,MAAM,CAAC;CAyD9E"}
+{"version":3,"file":"TaskSendWaiting.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskSendWaiting.ts"],"names":[],"mappings":"AACA,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,SAAgB;IAE/B,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAA;IACjD,cAAc,EAAE,OAAO,CAAO;IAC9B,gBAAgB,EAAE,MAAM,CAAA;IAExB;;;;;;;OAOG;gBAED,OAAO,EAAE,OAAO,EACT,YAAY,SAAwB,EACpC,SAAS,SAAwB,EACjC,YAAY,SAAwB,EACpC,iBAAiB,SAAwB,EACzC,UAAU,SAAM;IAMzB,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAS/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;YAqClB,aAAa;IA8B3B,OAAO,CAAC,cAAc;IAuBtB;;;;;;;;;;;;;;;;OAgBG;IACG,aAAa,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,MAAM,CAAC;CA6D9E"}

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

@@ -8,12 +8,23 @@ const aggregateResults_1 = require("../../utility/aggregateResults");
 const utilityHelpers_1 = require("../../utility/utilityHelpers");
 const EntityProvenTxReq_1 = require("../../storage/schema/entities/EntityProvenTxReq");
 class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
-    constructor(monitor, triggerMsecs = Monitor_1.Monitor.oneSecond * 8, agedMsecs = Monitor_1.Monitor.oneSecond * 7, sendingMsecs = Monitor_1.Monitor.oneMinute * 5) {
+    /**
+     * @param monitor Wallet monitor owning this task.
+     * @param triggerMsecs Normal interval between SendWaiting runs when no backlog remains.
+     * @param agedMsecs Minimum age a request must reach before this task will attempt to send it.
+     * @param sendingMsecs Minimum interval before stale `sending` requests are included again.
+     * @param triggerQuickMsecs Follow-up interval used when a full chunk was consumed and more work may remain.
+     * @param chunkLimit Maximum number of waiting requests to fetch and inspect in a single run.
+     */
+    constructor(monitor, triggerMsecs = Monitor_1.Monitor.oneSecond * 8, agedMsecs = Monitor_1.Monitor.oneSecond * 7, sendingMsecs = Monitor_1.Monitor.oneMinute * 5, triggerQuickMsecs = Monitor_1.Monitor.oneSecond * 1, chunkLimit = 100) {
         super(monitor, TaskSendWaiting.taskName);
         this.triggerMsecs = triggerMsecs;
         this.agedMsecs = agedMsecs;
         this.sendingMsecs = sendingMsecs;
+        this.triggerQuickMsecs = triggerQuickMsecs;
+        this.chunkLimit = chunkLimit;
         this.includeSending = true;
+        this.triggerNextMsecs = this.triggerQuickMsecs;
     }
     trigger(nowMsecsSinceEpoch) {
         this.includeSending =
@@ -21,34 +32,88 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
         if (this.includeSending)
             this.lastSendingRunMsecsSinceEpoch = nowMsecsSinceEpoch;
         return {
-            run: nowMsecsSinceEpoch > this.lastRunMsecsSinceEpoch + this.triggerMsecs
+            run: nowMsecsSinceEpoch > this.lastRunMsecsSinceEpoch + this.triggerNextMsecs
         };
     }
     async runTask() {
         let log = '';
-        const limit = 100;
-        let offset = 0;
-        const agedLimit = new Date(Date.now() - this.agedMsecs);
+        const nowMsecsSinceEpoch = Date.now();
+        const agedLimit = new Date(nowMsecsSinceEpoch - this.agedMsecs);
         const status = this.includeSending ? ['unsent', 'sending'] : ['unsent'];
-        for (;;) {
-            let reqs = await this.storage.findProvenTxReqs({
-                partial: {},
-                status,
-                paged: { limit, offset }
-            });
-            const count = reqs.length;
-            if (reqs.length === 0)
-                break;
-            log += `${reqs.length} reqs with status ${status.join(' or ')}\n`;
-            const agedReqs = reqs.filter(req => (0, utilityHelpers_1.verifyTruthy)(req.updated_at) < agedLimit);
+        const reqs = await this.storage.findProvenTxReqs({
+            partial: {},
+            status,
+            paged: { limit: this.chunkLimit, offset: 0 }
+        });
+        const count = reqs.length;
+        if (count > 0) {
+            log += `${count} reqs with status ${status.join(' or ')}\n`;
+            const filteredReqs = await this.expandBatches(reqs, status);
+            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 < limit)
-                break;
-            offset += limit;
+            if (count >= this.chunkLimit) {
+                this.triggerNextMsecs = this.triggerQuickMsecs;
+            }
+            else if (agedReqs.length < filteredReqs.length) {
+                const ageAllMsecs = Math.max(...filteredReqs.map(req => (0, utilityHelpers_1.verifyTruthy)(req.updated_at).getTime() + this.agedMsecs - nowMsecsSinceEpoch), 0);
+                this.triggerNextMsecs = ageAllMsecs;
+            }
+            else {
+                this.triggerNextMsecs = this.triggerMsecs;
+            }
+        }
+        else {
+            this.triggerNextMsecs = this.triggerMsecs;
         }
         return log;
     }
+    async expandBatches(reqs, status) {
+        const expanded = [];
+        const seenReqIds = new Set();
+        const seenBatches = new Set();
+        for (const req of reqs) {
+            if (seenReqIds.has(req.provenTxReqId))
+                continue;
+            if (!req.batch || seenBatches.has(req.batch)) {
+                seenReqIds.add(req.provenTxReqId);
+                expanded.push(req);
+                continue;
+            }
+            seenBatches.add(req.batch);
+            const batchReqs = await this.storage.findProvenTxReqs({
+                partial: { batch: req.batch },
+                status
+            });
+            for (const batchReq of batchReqs) {
+                if (seenReqIds.has(batchReq.provenTxReqId))
+                    continue;
+                seenReqIds.add(batchReq.provenTxReqId);
+                expanded.push(batchReq);
+            }
+        }
+        return expanded;
+    }
+    filterAgedReqs(reqs, agedLimit) {
+        const agedReqs = [];
+        const seenBatches = new Set();
+        for (const req of reqs) {
+            if (!req.batch) {
+                if ((0, utilityHelpers_1.verifyTruthy)(req.updated_at) < agedLimit)
+                    agedReqs.push(req);
+                continue;
+            }
+            if (seenBatches.has(req.batch))
+                continue;
+            seenBatches.add(req.batch);
+            const batchReqs = reqs.filter(candidate => candidate.batch === req.batch);
+            const youngestUpdatedAt = Math.max(...batchReqs.map(batchReq => (0, utilityHelpers_1.verifyTruthy)(batchReq.updated_at).getTime()));
+            if (youngestUpdatedAt < agedLimit.getTime()) {
+                agedReqs.push(...batchReqs);
+            }
+        }
+        return agedReqs;
+    }
     /**
      * Process an array of 'unsent' status table.ProvenTxReq
      *
@@ -69,12 +134,18 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
     async processUnsent(reqApis, indent = 0) {
         const txids = reqApis.map(r => r.txid);
         const logs = {};
+        const reqApiIds = new Set(reqApis.map(r => r.provenTxReqId));
+        const groupedReqIds = new Set();
         for (let i = 0; i < reqApis.length; i++) {
             const reqApi = reqApis[i];
             logs[reqApi.txid] = `${i} reqId=${reqApi.provenTxReqId} attempts=${reqApi.attempts} txid=${reqApi.txid}:`;
         }
         for (let i = 0; i < reqApis.length; i++) {
             const reqApi = reqApis[i];
+            if (groupedReqIds.has(reqApi.provenTxReqId)) {
+                logs[reqApi.txid] += ` processed with batch`;
+                continue;
+            }
             if (reqApi.status !== 'unsent' && reqApi.status !== 'sending') {
                 logs[reqApi.txid] += ` status now ${reqApi.status}`;
                 continue;
@@ -85,14 +156,12 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
                 logs[reqApi.txid] += ` batch ${req.batch}`;
                 // Make sure wew process entire batch together for efficient beef generation
                 const batchReqApis = await this.storage.findProvenTxReqs({
-                    partial: { batch: req.batch, status: 'unsent' }
+                    partial: { batch: req.batch },
+                    status: this.includeSending ? ['unsent', 'sending'] : ['unsent']
                 });
                 for (const bra of batchReqApis) {
-                    // Remove any matching batchReqApis from reqApis
-                    const index = reqApis.findIndex(ra => ra.provenTxReqId === bra.provenTxReqId);
-                    if (index > -1)
-                        reqApis.slice(index, index + 1);
-                    // And add to reqs being processed now:
+                    if (reqApiIds.has(bra.provenTxReqId))
+                        groupedReqIds.add(bra.provenTxReqId);
                     reqs.push(new EntityProvenTxReq_1.EntityProvenTxReq(bra));
                 }
             }