@bsv/wallet-toolbox 2.1.24 → 3.0.0-alpha.0

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

@@ -5,6 +5,7 @@ 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 LeasedMonitorTask_1 = require("../LeasedMonitorTask");
 const WalletMonitorTask_1 = require("./WalletMonitorTask");
 /**
  * `TaskCheckForProofs` is a WalletMonitor task that retreives merkle proofs for
@@ -42,6 +43,33 @@ class TaskCheckForProofs extends WalletMonitorTask_1.WalletMonitorTask {
         if (maxAcceptableHeight === undefined) {
             return log;
         }
+        // monitor_lease: if a the transaction service is available, claim a monitor_lease for this
+        // task so that at most one Monitor instance runs the proof check at a time.
+        // If the lease cannot be acquired the task is skipped for this tick; the
+        // static `checkNow` flag is NOT cleared so that the next tick can retry.
+        const txSvc = await this.storage.runAsStorageProvider(async (sp) => sp.getTransactionService());
+        if (txSvc != null) {
+            const ownerId = this.monitor.instanceId;
+            const ttlMs = 60000; // 60 s — generous enough for a full proof-check pass
+            const helper = new LeasedMonitorTask_1.LeasedMonitorTask(txSvc);
+            let innerLog = '';
+            const { ran } = await helper.run(TaskCheckForProofs.taskName, ownerId, ttlMs, async () => {
+                innerLog = await this._runProofLoop(maxAcceptableHeight, countsAsAttempt);
+            });
+            if (!ran) {
+                // Re-arm checkNow so the next tick retries once the lease is free.
+                TaskCheckForProofs.checkNow = true;
+                return '[LeasedMonitorTask] proof check skipped — lease held by another instance\n';
+            }
+            return innerLog;
+        }
+        // No the transaction service (pre-cutover / IDB) — run without lease guard.
+        log = await this._runProofLoop(maxAcceptableHeight, countsAsAttempt);
+        return log;
+    }
+    /** Inner loop extracted so it can be called with or without a monitor_lease. */
+    async _runProofLoop(maxAcceptableHeight, countsAsAttempt) {
+        let log = '';
         const limit = 100;
         let offset = 0;
         for (;;) {
@@ -53,9 +81,8 @@ class TaskCheckForProofs extends WalletMonitorTask_1.WalletMonitorTask {
             if (reqs.length === 0)
                 break;
             log += `${reqs.length} reqs with status 'callback', 'unmined', 'sending', 'unknown', or 'unconfirmed'\n`;
-            const r = await getProofs(this, reqs, 2, countsAsAttempt, false, maxAcceptableHeight);
+            const r = await getProofs(this, reqs, maxAcceptableHeight, 2, countsAsAttempt, false);
             log += `${r.log}\n`;
-            //console.log(log);
             if (reqs.length < limit)
                 break;
             offset += limit;
@@ -85,7 +112,8 @@ TaskCheckForProofs.checkNow = false;
  * @param reqs
  * @returns reqs partitioned by status
  */
-async function getProofs(task, reqs, indent = 0, countsAsAttempt = false, ignoreStatus = false, maxAcceptableHeight) {
+async function getProofs(task, reqs, maxAcceptableHeight, indent = 0, countsAsAttempt = false, ignoreStatus = false) {
+    var _a, _b;
     const proven = [];
     const invalid = [];
     let log = '';
@@ -119,7 +147,7 @@ async function getProofs(task, reqs, indent = 0, countsAsAttempt = false, ignore
                 reqIsValid = true;
         }
         if (!reqIsValid) {
-            log += ` rawTx doesn't hash to txid. status => invalid.\n`;
+            log += ' rawTx doesn\'t hash to txid. status => invalid.\n';
             req.notified = false;
             req.status = 'invalid';
             await req.updateStorageDynamicProperties(task.storage);
@@ -130,11 +158,25 @@ async function getProofs(task, reqs, indent = 0, countsAsAttempt = false, ignore
             ? task.monitor.options.unprovenAttemptsLimitMain
             : task.monitor.options.unprovenAttemptsLimitTest;
         if (!ignoreStatus && req.attempts > limit) {
-            log += ` too many failed attempts ${req.attempts}\n`;
-            req.notified = false;
-            req.status = 'invalid';
-            await req.updateStorageDynamicProperties(task.storage);
-            invalid.push(reqApi);
+            const maxRebroadcast = (_a = task.monitor.options.maxRebroadcastAttempts) !== null && _a !== void 0 ? _a : 0;
+            const wasBroadcast = req.wasBroadcast;
+            const timedOutAttempts = req.attempts;
+            const timeout = req.applyProofTimeout(maxRebroadcast);
+            if (timeout.action === 'rebroadcast') {
+                log += ` too many failed attempts ${timedOutAttempts}, resetting to unsent for rebroadcast (cycle ${timeout.rebroadcastAttempts})\n`;
+                await req.updateStorageDynamicProperties(task.storage);
+            }
+            else {
+                if (wasBroadcast) {
+                    log += ` too many failed attempts ${timedOutAttempts} and rebroadcast limit ${maxRebroadcast} reached, marking invalid\n`;
+                }
+                else {
+                    // Was never successfully broadcast — correctly mark as invalid
+                    log += ` too many failed attempts ${timedOutAttempts} and tx was never broadcast, marking invalid\n`;
+                }
+                await req.updateStorageDynamicProperties(task.storage);
+                invalid.push(reqApi);
+            }
             continue;
         }
         const since = new Date();
@@ -156,13 +198,13 @@ async function getProofs(task, reqs, indent = 0, countsAsAttempt = false, ignore
         // one more time.
         //
         r = await task.monitor.services.getMerklePath(req.txid);
-        if (r.header && r.header.height > maxAcceptableHeight) {
+        if ((r.header != null) && r.header.height > maxAcceptableHeight) {
             // Ignore proofs from bleeding edge of new blocks as these are the most often re-orged.
             log += ` ignoring possible proof from very new block at height ${r.header.height} ${r.header.hash}\n`;
             continue;
         }
-        ptx = await entities_1.EntityProvenTx.fromReq(req, r, countsAsAttempt && req.status !== 'nosend');
-        if (ptx) {
+        ptx = await entities_1.EntityProvenTx.fromReq(req, r, countsAsAttempt && req.status !== 'nosend', (_b = task.monitor.options.maxRebroadcastAttempts) !== null && _b !== void 0 ? _b : 0);
+        if (ptx != null) {
             // We have a merklePath proof for the request (and a block header)
             await req.updateStorageDynamicProperties(task.storage);
             await req.refreshFromStorage(task.storage);
@@ -186,6 +228,33 @@ async function getProofs(task, reqs, indent = 0, countsAsAttempt = false, ignore
             req.apiHistory = r.history;
             req.provenTxId = r.provenTxId;
             req.notified = true;
+            // transaction-service hook: if the transaction service is available, record the proof in the
+            // new transactions table. This is additive — the legacy proven_txs row
+            // written by updateProvenTxReqWithNewProvenTx above is preserved.
+            // We gate on getTransactionService() != null to skip pre-cutover / IDB storage.
+            await task.storage.runAsStorageProvider(async (sp) => {
+                const txSvc = sp.getTransactionService();
+                if (txSvc == null)
+                    return;
+                try {
+                    const newTx = await txSvc.findByTxid(txid);
+                    if (newTx != null) {
+                        await txSvc.recordProof({
+                            transactionId: newTx.transactionId,
+                            height,
+                            merklePath,
+                            merkleRoot,
+                            blockHash,
+                            expectedFrom: newTx.processing
+                        });
+                    }
+                }
+                catch (txErr) {
+                    // transaction-service recordProof is additive — never disrupt the legacy proof path.
+                    const msg = txErr instanceof Error ? txErr.message : String(txErr);
+                    console.log(`[TaskCheckForProofs] transaction-service recordProof skipped for ${txid}: ${msg}`);
+                }
+            });
             task.monitor.callOnProvenTransaction({
                 txid,
                 txIndex: index,
@@ -195,10 +264,8 @@ async function getProofs(task, reqs, indent = 0, countsAsAttempt = false, ignore
                 merkleRoot
             });
         }
-        else {
-            if (countsAsAttempt && req.status !== 'nosend') {
-                req.attempts++;
-            }
+        else if (countsAsAttempt && ['callback', 'unmined', 'unknown', 'unconfirmed', 'sending'].includes(req.status)) {
+            req.attempts++;
         }
         await req.updateStorageDynamicProperties(task.storage);
         await req.refreshFromStorage(task.storage);

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

@@ -15,7 +15,7 @@ import { WalletMonitorTask } from './WalletMonitorTask';
  */
 export declare class TaskCheckNoSends extends WalletMonitorTask {
     triggerMsecs: number;
-    static taskName: string;
+    static readonly taskName = "CheckNoSends";
     /**
      * An external service such as the chaintracks new block header
      * listener can set this true to cause

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;;;;;;;;;;;;GAYG;AACH,qBAAa,gBAAiB,SAAQ,iBAAiB;IAW5C,YAAY;IAVrB,MAAM,CAAC,QAAQ,SAAiB;IAEhC;;;OAGG;IACH,MAAM,CAAC,QAAQ,UAAQ;gBAGrB,OAAO,EAAE,OAAO,EACT,YAAY,SAAqB;IAK1C;;OAEG;IACH,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAQ/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CA4BjC"}
+{"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;;;;;;;;;;;;GAYG;AACH,qBAAa,gBAAiB,SAAQ,iBAAiB;IAW5C,YAAY;IAVrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,kBAAiB;IAEzC;;;OAGG;IACH,MAAM,CAAC,QAAQ,UAAQ;gBAGrB,OAAO,EAAE,OAAO,EACT,YAAY,SAAqB;IAK1C;;OAEG;IACH,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAQhD,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC;CA2BlC"}

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

@@ -51,9 +51,8 @@ class TaskCheckNoSends extends WalletMonitorTask_1.WalletMonitorTask {
             if (reqs.length === 0)
                 break;
             log += `${reqs.length} reqs with status 'nosend'\n`;
-            const r = await (0, TaskCheckForProofs_1.getProofs)(this, reqs, 2, countsAsAttempt, false, maxAcceptableHeight);
+            const r = await (0, TaskCheckForProofs_1.getProofs)(this, reqs, maxAcceptableHeight, 2, countsAsAttempt, false);
             log += `${r.log}\n`;
-            //console.log(log);
             if (reqs.length < limit)
                 break;
             offset += limit;

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

@@ -1 +1 @@
-{"version":3,"file":"TaskCheckNoSends.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskCheckNoSends.ts"],"names":[],"mappings":";;;AAAA,wCAAoC;AACpC,6DAAgD;AAChD,2DAAuD;AAEvD;;;;;;;;;;;;GAYG;AACH,MAAa,gBAAiB,SAAQ,qCAAiB;IASrD,YACE,OAAgB,EACT,eAAe,iBAAO,CAAC,MAAM,GAAG,CAAC;QAExC,KAAK,CAAC,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QAFlC,iBAAY,GAAZ,YAAY,CAAqB;IAG1C,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,kBAA0B;QAChC,OAAO;YACL,GAAG,EACD,gBAAgB,CAAC,QAAQ;gBACzB,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,MAAM,eAAe,GAAG,gBAAgB,CAAC,QAAQ,CAAA;QACjD,gBAAgB,CAAC,QAAQ,GAAG,KAAK,CAAA;QAEjC,MAAM,mBAAmB,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,aAAa,0CAAE,MAAM,CAAA;QAC9D,IAAI,mBAAmB,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,GAAG,CAAA;QACZ,CAAC;QAED,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,IAAA,8BAAS,EAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAA;YACrF,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAA;YACnB,mBAAmB;YACnB,IAAI,IAAI,CAAC,MAAM,GAAG,KAAK;gBAAE,MAAK;YAC9B,MAAM,IAAI,KAAK,CAAA;QACjB,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;;AAtDH,4CAuDC;AAtDQ,yBAAQ,GAAG,cAAc,CAAA;AAEhC;;;GAGG;AACI,yBAAQ,GAAG,KAAK,CAAA"}
+{"version":3,"file":"TaskCheckNoSends.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskCheckNoSends.ts"],"names":[],"mappings":";;;AAAA,wCAAoC;AACpC,6DAAgD;AAChD,2DAAuD;AAEvD;;;;;;;;;;;;GAYG;AACH,MAAa,gBAAiB,SAAQ,qCAAiB;IASrD,YACE,OAAgB,EACT,eAAe,iBAAO,CAAC,MAAM,GAAG,CAAC;QAExC,KAAK,CAAC,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QAFlC,iBAAY,GAAZ,YAAY,CAAqB;IAG1C,CAAC;IAED;;OAEG;IACH,OAAO,CAAE,kBAA0B;QACjC,OAAO;YACL,GAAG,EACD,gBAAgB,CAAC,QAAQ;gBACzB,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,MAAM,eAAe,GAAG,gBAAgB,CAAC,QAAQ,CAAA;QACjD,gBAAgB,CAAC,QAAQ,GAAG,KAAK,CAAA;QAEjC,MAAM,mBAAmB,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,aAAa,0CAAE,MAAM,CAAA;QAC9D,IAAI,mBAAmB,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,GAAG,CAAA;QACZ,CAAC;QAED,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,IAAA,8BAAS,EAAC,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;YACrF,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAA;YACnB,IAAI,IAAI,CAAC,MAAM,GAAG,KAAK;gBAAE,MAAK;YAC9B,MAAM,IAAI,KAAK,CAAA;QACjB,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;;AArDH,4CAsDC;AArDiB,yBAAQ,GAAG,cAAc,CAAA;AAEzC;;;GAGG;AACI,yBAAQ,GAAG,KAAK,CAAA"}

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

@@ -2,7 +2,7 @@ import { Monitor } from '../Monitor';
 import { WalletMonitorTask } from './WalletMonitorTask';
 export declare class TaskClock extends WalletMonitorTask {
     triggerMsecs: number;
-    static taskName: string;
+    static readonly taskName = "Clock";
     nextMinute: number;
     constructor(monitor: Monitor, triggerMsecs?: number);
     trigger(nowMsecsSinceEpoch: number): {

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

@@ -1 +1 @@
-{"version":3,"file":"TaskClock.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskClock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,qBAAa,SAAU,SAAQ,iBAAiB;IAMrC,YAAY;IALrB,MAAM,CAAC,QAAQ,SAAU;IACzB,UAAU,EAAE,MAAM,CAAA;gBAGhB,OAAO,EAAE,OAAO,EACT,YAAY,SAAwB;IAM7C,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAQ/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAMhC,aAAa,IAAI,MAAM;CAGxB"}
+{"version":3,"file":"TaskClock.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskClock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,qBAAa,SAAU,SAAQ,iBAAiB;IAMrC,YAAY;IALrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,WAAU;IAClC,UAAU,EAAE,MAAM,CAAA;gBAGhB,OAAO,EAAE,OAAO,EACT,YAAY,SAAwB;IAM7C,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAKhD,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC;IAMjC,aAAa,IAAK,MAAM;CAGzB"}

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

@@ -10,7 +10,6 @@ class TaskClock extends WalletMonitorTask_1.WalletMonitorTask {
         this.nextMinute = this.getNextMinute();
     }
     trigger(nowMsecsSinceEpoch) {
-        const s = this.storage;
         const run = Date.now() > this.nextMinute;
         return { run };
     }

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

@@ -1 +1 @@
-{"version":3,"file":"TaskClock.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskClock.ts"],"names":[],"mappings":";;;AAAA,wCAAoC;AACpC,2DAAuD;AAEvD,MAAa,SAAU,SAAQ,qCAAiB;IAI9C,YACE,OAAgB,EACT,eAAe,CAAC,GAAG,iBAAO,CAAC,SAAS;QAE3C,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;QAF3B,iBAAY,GAAZ,YAAY,CAAwB;QAG3C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;IACxC,CAAC;IAED,OAAO,CAAC,kBAA0B;QAChC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAA;QAEtB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAA;QAExC,OAAO,EAAE,GAAG,EAAE,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,EAAE,CAAA;QACxD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QACtC,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,iBAAO,CAAC,SAAS,CAAC,GAAG,iBAAO,CAAC,SAAS,CAAA;IACtE,CAAC;;AA5BH,8BA6BC;AA5BQ,kBAAQ,GAAG,OAAO,CAAA"}
+{"version":3,"file":"TaskClock.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskClock.ts"],"names":[],"mappings":";;;AAAA,wCAAoC;AACpC,2DAAuD;AAEvD,MAAa,SAAU,SAAQ,qCAAiB;IAI9C,YACE,OAAgB,EACT,eAAe,CAAC,GAAG,iBAAO,CAAC,SAAS;QAE3C,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;QAF3B,iBAAY,GAAZ,YAAY,CAAwB;QAG3C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;IACxC,CAAC;IAED,OAAO,CAAE,kBAA0B;QACjC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAA;QACxC,OAAO,EAAE,GAAG,EAAE,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,EAAE,CAAA;QACxD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QACtC,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,iBAAO,CAAC,SAAS,CAAC,GAAG,iBAAO,CAAC,SAAS,CAAA;IACtE,CAAC;;AAzBH,8BA0BC;AAzBiB,kBAAQ,GAAG,OAAO,CAAA"}

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

@@ -10,7 +10,7 @@ import { WalletMonitorTask } from './WalletMonitorTask';
  */
 export declare class TaskFailAbandoned extends WalletMonitorTask {
     triggerMsecs: number;
-    static taskName: string;
+    static readonly taskName = "FailAbandoned";
     constructor(monitor: Monitor, triggerMsecs?: number);
     trigger(nowMsecsSinceEpoch: number): {
         run: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"TaskFailAbandoned.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskFailAbandoned.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;GAOG;AAEH,qBAAa,iBAAkB,SAAQ,iBAAiB;IAK7C,YAAY;IAJrB,MAAM,CAAC,QAAQ,SAAkB;gBAG/B,OAAO,EAAE,OAAO,EACT,YAAY,SAAgB;IAKrC,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAM/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAyBjC"}
+{"version":3,"file":"TaskFailAbandoned.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskFailAbandoned.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;GAOG;AAEH,qBAAa,iBAAkB,SAAQ,iBAAiB;IAK7C,YAAY;IAJrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,mBAAkB;gBAGxC,OAAO,EAAE,OAAO,EACT,YAAY,SAAgB;IAKrC,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAMhD,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC;CAyBlC"}

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

@@ -1 +1 @@
-{"version":3,"file":"TaskFailAbandoned.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskFailAbandoned.ts"],"names":[],"mappings":";;;AACA,2DAAuD;AAEvD;;;;;;;GAOG;AAEH,MAAa,iBAAkB,SAAQ,qCAAiB;IAGtD,YACE,OAAgB,EACT,eAAe,IAAI,GAAG,EAAE,GAAG,CAAC;QAEnC,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QAFnC,iBAAY,GAAZ,YAAY,CAAgB;IAGrC,CAAC;IAED,OAAO,CAAC,kBAA0B;QAChC,OAAO;YACL,GAAG,EAAE,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY;SAC1E,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,MAAM,KAAK,GAAG,GAAG,CAAA;QACjB,IAAI,MAAM,GAAG,CAAC,CAAA;QACd,SAAS,CAAC;YACR,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;YACtB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;YAC/E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gBAC9D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAAC;oBACvC,OAAO,EAAE,EAAE;oBACX,MAAM,EAAE,CAAC,aAAa,EAAE,UAAU,CAAC;oBACnC,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;iBACzB,CAAC,CAAA;gBACF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;gBACxE,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;oBACrB,MAAM,EAAE,CAAC,uBAAuB,CAAC,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAC,CAAA;oBAC5D,GAAG,IAAI,cAAc,EAAE,CAAC,aAAa,uBAAuB,CAAA;gBAC9D,CAAC;gBACD,OAAO,GAAG,CAAC,MAAM,GAAG,KAAK,CAAA;YAC3B,CAAC,CAAC,CAAA;YACF,IAAI,IAAI;gBAAE,MAAK;YACf,MAAM,IAAI,KAAK,CAAA;QACjB,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;;AAxCH,8CAyCC;AAxCQ,0BAAQ,GAAG,eAAe,CAAA"}
+{"version":3,"file":"TaskFailAbandoned.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskFailAbandoned.ts"],"names":[],"mappings":";;;AACA,2DAAuD;AAEvD;;;;;;;GAOG;AAEH,MAAa,iBAAkB,SAAQ,qCAAiB;IAGtD,YACE,OAAgB,EACT,eAAe,IAAI,GAAG,EAAE,GAAG,CAAC;QAEnC,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QAFnC,iBAAY,GAAZ,YAAY,CAAgB;IAGrC,CAAC;IAED,OAAO,CAAE,kBAA0B;QACjC,OAAO;YACL,GAAG,EAAE,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY;SAC1E,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,MAAM,KAAK,GAAG,GAAG,CAAA;QACjB,IAAI,MAAM,GAAG,CAAC,CAAA;QACd,SAAS,CAAC;YACR,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;YACtB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;YAC/E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gBAC9D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAAC;oBACvC,OAAO,EAAE,EAAE;oBACX,MAAM,EAAE,CAAC,aAAa,EAAE,UAAU,CAAC;oBACnC,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;iBACzB,CAAC,CAAA;gBACF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;gBACxE,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;oBACrB,MAAM,EAAE,CAAC,uBAAuB,CAAC,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAC,CAAA;oBAC5D,GAAG,IAAI,cAAc,EAAE,CAAC,aAAa,uBAAuB,CAAA;gBAC9D,CAAC;gBACD,OAAO,GAAG,CAAC,MAAM,GAAG,KAAK,CAAA;YAC3B,CAAC,CAAC,CAAA;YACF,IAAI,IAAI;gBAAE,MAAK;YACf,MAAM,IAAI,KAAK,CAAA;QACjB,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;;AAxCH,8CAyCC;AAxCiB,0BAAQ,GAAG,eAAe,CAAA"}

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

@@ -2,7 +2,7 @@ import { Monitor } from '../Monitor';
 import { WalletMonitorTask } from './WalletMonitorTask';
 export declare class TaskMineBlock extends WalletMonitorTask {
     triggerMsecs: number;
-    static taskName: string;
+    static readonly taskName = "MineBlock";
     static mineNow: boolean;
     constructor(monitor: Monitor, triggerMsecs?: number);
     trigger(nowMsecsSinceEpoch: number): {

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

@@ -1 +1 @@
-{"version":3,"file":"TaskMineBlock.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskMineBlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAGvD,qBAAa,aAAc,SAAQ,iBAAiB;IAMzC,YAAY;IALrB,MAAM,CAAC,QAAQ,SAAc;IAC7B,MAAM,CAAC,OAAO,UAAQ;gBAGpB,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB;IAK9C,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAM/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAOjC"}
+{"version":3,"file":"TaskMineBlock.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskMineBlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAGvD,qBAAa,aAAc,SAAQ,iBAAiB;IAMzC,YAAY;IALrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,eAAc;IACtC,MAAM,CAAC,OAAO,UAAQ;gBAGpB,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB;IAK9C,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAMhD,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC;CAOlC"}

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

@@ -1 +1 @@
-{"version":3,"file":"TaskMineBlock.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskMineBlock.ts"],"names":[],"mappings":";;;AAAA,wCAAoC;AACpC,2DAAuD;AAGvD,MAAa,aAAc,SAAQ,qCAAiB;IAIlD,YACE,OAAgB,EACT,eAAe,EAAE,GAAG,iBAAO,CAAC,SAAS;QAE5C,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAA;QAF/B,iBAAY,GAAZ,YAAY,CAAyB;IAG9C,CAAC;IAED,OAAO,CAAC,kBAA0B;QAChC,IAAI,aAAa,CAAC,OAAO;YAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;QAC/C,IAAI,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,IAAI,IAAI,CAAC,YAAY;YAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;QAC/F,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,aAAa,CAAC,OAAO,GAAG,KAAK,CAAA;QAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAmC,CAAA;QACrE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,CAAA;QAC7C,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;QAC1C,OAAO,eAAe,MAAM,CAAC,MAAM,SAAS,MAAM,CAAC,IAAI,EAAE,CAAA;IAC3D,CAAC;;AAvBH,sCAwBC;AAvBQ,sBAAQ,GAAG,WAAW,CAAA;AACtB,qBAAO,GAAG,KAAK,CAAA"}
+{"version":3,"file":"TaskMineBlock.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskMineBlock.ts"],"names":[],"mappings":";;;AAAA,wCAAoC;AACpC,2DAAuD;AAGvD,MAAa,aAAc,SAAQ,qCAAiB;IAIlD,YACE,OAAgB,EACT,eAAe,EAAE,GAAG,iBAAO,CAAC,SAAS;QAE5C,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAA;QAF/B,iBAAY,GAAZ,YAAY,CAAyB;IAG9C,CAAC;IAED,OAAO,CAAE,kBAA0B;QACjC,IAAI,aAAa,CAAC,OAAO;YAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;QAC/C,IAAI,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,IAAI,IAAI,CAAC,YAAY;YAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;QAC/F,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,aAAa,CAAC,OAAO,GAAG,KAAK,CAAA;QAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAmC,CAAA;QACrE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,CAAA;QAC7C,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;QAC1C,OAAO,eAAe,MAAM,CAAC,MAAM,SAAS,MAAM,CAAC,IAAI,EAAE,CAAA;IAC3D,CAAC;;AAvBH,sCAwBC;AAvBiB,sBAAQ,GAAG,WAAW,CAAA;AAC/B,qBAAO,GAAG,KAAK,CAAA"}

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

@@ -2,7 +2,7 @@ import { Monitor } from '../Monitor';
 import { WalletMonitorTask } from './WalletMonitorTask';
 export declare class TaskMonitorCallHistory extends WalletMonitorTask {
     triggerMsecs: number;
-    static taskName: string;
+    static readonly taskName = "MonitorCallHistory";
     constructor(monitor: Monitor, triggerMsecs?: number);
     trigger(nowMsecsSinceEpoch: number): {
         run: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"TaskMonitorCallHistory.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskMonitorCallHistory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,qBAAa,sBAAuB,SAAQ,iBAAiB;IAKlD,YAAY;IAJrB,MAAM,CAAC,QAAQ,SAAuB;gBAGpC,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB;IAK9C,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAM/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAKjC"}
+{"version":3,"file":"TaskMonitorCallHistory.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskMonitorCallHistory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,qBAAa,sBAAuB,SAAQ,iBAAiB;IAKlD,YAAY;IAJrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,wBAAuB;gBAG7C,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB;IAK9C,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAMhD,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC;CAKlC"}

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

@@ -14,7 +14,7 @@ class TaskMonitorCallHistory extends WalletMonitorTask_1.WalletMonitorTask {
         };
     }
     async runTask() {
-        const r = await this.monitor.services.getServicesCallHistory(true);
+        const r = this.monitor.services.getServicesCallHistory(true);
         const log = JSON.stringify(r);
         return log;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"TaskMonitorCallHistory.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskMonitorCallHistory.ts"],"names":[],"mappings":";;;AACA,wCAAoC;AACpC,2DAAuD;AAEvD,MAAa,sBAAuB,SAAQ,qCAAiB;IAG3D,YACE,OAAgB,EACT,eAAe,iBAAO,CAAC,SAAS,GAAG,EAAE;QAE5C,KAAK,CAAC,OAAO,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CAAA;QAFxC,iBAAY,GAAZ,YAAY,CAAyB;IAG9C,CAAC;IAED,OAAO,CAAC,kBAA0B;QAChC,OAAO;YACL,GAAG,EAAE,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY;SAC1E,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAA;QAClE,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAC7B,OAAO,GAAG,CAAA;IACZ,CAAC;;AApBH,wDAqBC;AApBQ,+BAAQ,GAAG,oBAAoB,CAAA"}
+{"version":3,"file":"TaskMonitorCallHistory.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskMonitorCallHistory.ts"],"names":[],"mappings":";;;AAAA,wCAAoC;AACpC,2DAAuD;AAEvD,MAAa,sBAAuB,SAAQ,qCAAiB;IAG3D,YACE,OAAgB,EACT,eAAe,iBAAO,CAAC,SAAS,GAAG,EAAE;QAE5C,KAAK,CAAC,OAAO,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CAAA;QAFxC,iBAAY,GAAZ,YAAY,CAAyB;IAG9C,CAAC;IAED,OAAO,CAAE,kBAA0B;QACjC,OAAO;YACL,GAAG,EAAE,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY;SAC1E,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAA;QAC5D,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAC7B,OAAO,GAAG,CAAA;IACZ,CAAC;;AApBH,wDAqBC;AApBiB,+BAAQ,GAAG,oBAAoB,CAAA"}

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

@@ -15,7 +15,7 @@ import { WalletMonitorTask } from './WalletMonitorTask';
  */
 export declare class TaskNewHeader extends WalletMonitorTask {
     triggerMsecs: number;
-    static taskName: string;
+    static readonly taskName = "NewHeader";
     /**
      * This is always the most recent chain tip header returned from the chaintracker.
      */
@@ -29,7 +29,7 @@ export declare class TaskNewHeader extends WalletMonitorTask {
     constructor(monitor: Monitor, triggerMsecs?: number);
     getHeader(): Promise<BlockHeader>;
     /**
-     * TODO: This is a temporary incomplete solution for which a full chaintracker
+     * This is a temporary incomplete solution for which a full chaintracker
      * with new header and reorg event notification is required.
      *
      * New header events drive retrieving merklePaths for newly mined transactions.

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

@@ -1 +1 @@
-{"version":3,"file":"TaskNewHeader.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskNewHeader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;;;;GAWG;AACH,qBAAa,aAAc,SAAQ,iBAAiB;IAezC,YAAY;IAdrB,MAAM,CAAC,QAAQ,SAAc;IAC7B;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB;;;OAGG;IACH,YAAY,CAAC,EAAE,WAAW,CAAA;IAC1B,gBAAgB,CAAC,EAAE,IAAI,CAAA;gBAGrB,OAAO,EAAE,OAAO,EACT,YAAY,SAAwB;IAKvC,SAAS,IAAI,OAAO,CAAC,WAAW,CAAC;IAIvC;;;;;;;;;;;;OAYG;IACY,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAE1C,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAK/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAgCjC"}
+{"version":3,"file":"TaskNewHeader.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskNewHeader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;;;;GAWG;AACH,qBAAa,aAAc,SAAQ,iBAAiB;IAezC,YAAY;IAdrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,eAAc;IACtC;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB;;;OAGG;IACH,YAAY,CAAC,EAAE,WAAW,CAAA;IAC1B,gBAAgB,CAAC,EAAE,IAAI,CAAA;gBAGrB,OAAO,EAAE,OAAO,EACT,YAAY,SAAwB;IAKvC,SAAS,IAAK,OAAO,CAAC,WAAW,CAAC;IAIxC;;;;;;;;;;;;OAYG;IACY,UAAU,IAAK,OAAO,CAAC,IAAI,CAAC;IAI3C,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAKhD,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC;CAgClC"}

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

@@ -24,7 +24,7 @@ class TaskNewHeader extends WalletMonitorTask_1.WalletMonitorTask {
         return await this.monitor.chaintracks.findChainTipHeader();
     }
     /**
-     * TODO: This is a temporary incomplete solution for which a full chaintracker
+     * This is a temporary incomplete solution for which a full chaintracker
      * with new header and reorg event notification is required.
      *
      * New header events drive retrieving merklePaths for newly mined transactions.
@@ -36,7 +36,9 @@ class TaskNewHeader extends WalletMonitorTask_1.WalletMonitorTask {
      * and sometimes which block. In the case of coinbase transactions, a transaction may
      * also fail after a reorg.
      */
-    async asyncSetup() { }
+    async asyncSetup() {
+        // No async setup required for this task
+    }
     trigger(nowMsecsSinceEpoch) {
         const run = true;
         return { run };
@@ -46,7 +48,7 @@ class TaskNewHeader extends WalletMonitorTask_1.WalletMonitorTask {
         const oldHeader = this.header;
         this.header = await this.getHeader();
         let isNew = true;
-        if (!oldHeader) {
+        if (oldHeader == null) {
             log = `first header: ${this.header.height} ${this.header.hash}`;
         }
         else if (oldHeader.height > this.header.height) {
@@ -69,9 +71,9 @@ class TaskNewHeader extends WalletMonitorTask_1.WalletMonitorTask {
             this.queuedHeader = this.header;
             this.queuedHeaderWhen = new Date();
         }
-        else if (this.queuedHeader) {
+        else if (this.queuedHeader != null) {
             // Only process new block header if it has remained the chain tip for a full cycle
-            const delay = (new Date().getTime() - this.queuedHeaderWhen.getTime()) / 1000; // seconds
+            const delay = (Date.now() - this.queuedHeaderWhen.getTime()) / 1000; // seconds
             log = `process header: ${this.header.height} ${this.header.hash} delayed ${delay.toFixed(1)} secs`;
             this.monitor.processNewBlockHeader(this.queuedHeader);
             this.queuedHeader = undefined;

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

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

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

@@ -31,7 +31,7 @@ export interface TaskPurgeParams extends PurgeParams {
 export declare class TaskPurge extends WalletMonitorTask {
     params: TaskPurgeParams;
     triggerMsecs: number;
-    static taskName: string;
+    static readonly taskName = "Purge";
     /**
      * Set to true to trigger running this task
      */

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

@@ -1 +1 @@
-{"version":3,"file":"TaskPurge.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskPurge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAA;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,WAAW,eAAgB,SAAQ,WAAW;CAAG;AAEvD,qBAAa,SAAU,SAAQ,iBAAiB;IAUrC,MAAM,EAAE,eAAe;IACvB,YAAY;IAVrB,MAAM,CAAC,QAAQ,SAAU;IAEzB;;OAEG;IACH,MAAM,CAAC,QAAQ,UAAQ;gBAGrB,OAAO,EAAE,OAAO,EACT,MAAM,EAAE,eAAe,EACvB,YAAY,SAAI;IAKzB,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAQ/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAYjC"}
+{"version":3,"file":"TaskPurge.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskPurge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAA;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,WAAW,eAAgB,SAAQ,WAAW;CAAG;AAEvD,qBAAa,SAAU,SAAQ,iBAAiB;IAUrC,MAAM,EAAE,eAAe;IACvB,YAAY;IAVrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,WAAU;IAElC;;OAEG;IACH,MAAM,CAAC,QAAQ,UAAQ;gBAGrB,OAAO,EAAE,OAAO,EACT,MAAM,EAAE,eAAe,EACvB,YAAY,SAAI;IAKzB,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAQhD,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC;CAYlC"}

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

@@ -1 +1 @@
-{"version":3,"file":"TaskPurge.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskPurge.ts"],"names":[],"mappings":";;;AAEA,2DAAuD;AA6BvD,MAAa,SAAU,SAAQ,qCAAiB;IAQ9C,YACE,OAAgB,EACT,MAAuB,EACvB,eAAe,CAAC;QAEvB,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;QAH3B,WAAM,GAAN,MAAM,CAAiB;QACvB,iBAAY,GAAZ,YAAY,CAAI;IAGzB,CAAC;IAED,OAAO,CAAC,kBAA0B;QAChC,OAAO;YACL,GAAG,EACD,SAAS,CAAC,QAAQ;gBAClB,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,SAAS,CAAC,QAAQ,GAAG,KAAK,CAAA;QAE1B,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3D,OAAO,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACxC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC;YAAE,GAAG,GAAG,GAAG,CAAC,CAAC,KAAK,iCAAiC,CAAC,CAAC,GAAG,EAAE,CAAA;QAEzE,OAAO,GAAG,CAAA;IACZ,CAAC;;AAnCH,8BAoCC;AAnCQ,kBAAQ,GAAG,OAAO,CAAA;AAEzB;;GAEG;AACI,kBAAQ,GAAG,KAAK,CAAA"}
+{"version":3,"file":"TaskPurge.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskPurge.ts"],"names":[],"mappings":";;;AAEA,2DAAuD;AA6BvD,MAAa,SAAU,SAAQ,qCAAiB;IAQ9C,YACE,OAAgB,EACT,MAAuB,EACvB,eAAe,CAAC;QAEvB,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;QAH3B,WAAM,GAAN,MAAM,CAAiB;QACvB,iBAAY,GAAZ,YAAY,CAAI;IAGzB,CAAC;IAED,OAAO,CAAE,kBAA0B;QACjC,OAAO;YACL,GAAG,EACD,SAAS,CAAC,QAAQ;gBAClB,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,SAAS,CAAC,QAAQ,GAAG,KAAK,CAAA;QAE1B,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3D,OAAO,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACxC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC;YAAE,GAAG,GAAG,GAAG,CAAC,CAAC,KAAK,iCAAiC,CAAC,CAAC,GAAG,EAAE,CAAA;QAEzE,OAAO,GAAG,CAAA;IACZ,CAAC;;AAnCH,8BAoCC;AAnCiB,kBAAQ,GAAG,OAAO,CAAA;AAElC;;GAEG;AACI,kBAAQ,GAAG,KAAK,CAAA"}

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

@@ -27,7 +27,7 @@ import { WalletMonitorTask } from './WalletMonitorTask';
 export declare class TaskReorg extends WalletMonitorTask {
     agedMsecs: number;
     maxRetries: number;
-    static taskName: string;
+    static readonly taskName = "Reorg";
     process: DeactivedHeader[];
     constructor(monitor: Monitor, agedMsecs?: number, maxRetries?: number);
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"TaskReorg.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReorg.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,SAAU,SAAQ,iBAAiB;IAOrC,SAAS;IACT,UAAU;IAPnB,MAAM,CAAC,QAAQ,SAAU;IAEzB,OAAO,EAAE,eAAe,EAAE,CAAK;gBAG7B,OAAO,EAAE,OAAO,EACT,SAAS,SAAyB,EAClC,UAAU,SAAI;IAKvB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAa/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CA4BjC"}
+{"version":3,"file":"TaskReorg.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReorg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,SAAU,SAAQ,iBAAiB;IAOrC,SAAS;IACT,UAAU;IAPnB,MAAM,CAAC,QAAQ,CAAC,QAAQ,WAAU;IAElC,OAAO,EAAE,eAAe,EAAE,CAAK;gBAG7B,OAAO,EAAE,OAAO,EACT,SAAS,SAAyB,EAClC,UAAU,SAAI;IAKvB;;;;OAIG;IACH,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAahD,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC;CA4BlC"}

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

@@ -56,7 +56,7 @@ class TaskReorg extends WalletMonitorTask_1.WalletMonitorTask {
         for (;;) {
             // Loop over deactivated headers to process
             const header = this.process.shift();
-            if (!header)
+            if (header == null)
                 break;
             const r = await this.storage.reproveHeader(header.header.hash);
             log += r.log;
@@ -65,7 +65,7 @@ class TaskReorg extends WalletMonitorTask_1.WalletMonitorTask {
                     log += `      maximum retries ${this.maxRetries} exceeded\n`;
                 }
                 else {
-                    log += `    retrying...\n`;
+                    log += '    retrying...\n';
                     this.monitor.deactivatedHeaders.push({
                         header: header.header,
                         whenMsecs: Date.now(),

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

@@ -1 +1 @@
-{"version":3,"file":"TaskReorg.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReorg.ts"],"names":[],"mappings":";;;AAEA,wCAAqD;AACrD,2DAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,SAAU,SAAQ,qCAAiB;IAK9C,YACE,OAAgB,EACT,YAAY,iBAAO,CAAC,SAAS,GAAG,EAAE,EAClC,aAAa,CAAC;QAErB,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;QAH3B,cAAS,GAAT,SAAS,CAAyB;QAClC,eAAU,GAAV,UAAU,CAAI;QALvB,YAAO,GAAsB,EAAE,CAAA;IAQ/B,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,kBAA0B;QAChC,MAAM,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAA;QAClD,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAA;QACzC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YAC/C,iFAAiF;YACjF,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,EAAG,CAAA;YACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC3B,CAAC;QACD,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;SAC7B,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,GAAG,GAAG,EAAE,CAAA;QAEZ,SAAS,CAAC;YACR,2CAA2C;YAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;YACnC,IAAI,CAAC,MAAM;gBAAE,MAAK;YAElB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAE9D,GAAG,IAAI,CAAC,CAAC,GAAG,CAAA;YAEZ,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvD,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACxC,GAAG,IAAI,yBAAyB,IAAI,CAAC,UAAU,aAAa,CAAA;gBAC9D,CAAC;qBAAM,CAAC;oBACN,GAAG,IAAI,mBAAmB,CAAA;oBAC1B,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC;wBACnC,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;wBACrB,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC;qBACxB,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;;AA1DH,8BA2DC;AA1DQ,kBAAQ,GAAG,OAAO,AAAV,CAAU"}
+{"version":3,"file":"TaskReorg.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReorg.ts"],"names":[],"mappings":";;;AAAA,wCAAqD;AACrD,2DAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,SAAU,SAAQ,qCAAiB;IAK9C,YACE,OAAgB,EACT,YAAY,iBAAO,CAAC,SAAS,GAAG,EAAE,EAClC,aAAa,CAAC;QAErB,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;QAH3B,cAAS,GAAT,SAAS,CAAyB;QAClC,eAAU,GAAV,UAAU,CAAI;QALvB,YAAO,GAAsB,EAAE,CAAA;IAQ/B,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAE,kBAA0B;QACjC,MAAM,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAA;QAClD,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAA;QACzC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YAC/C,iFAAiF;YACjF,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,EAAG,CAAA;YACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC3B,CAAC;QACD,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;SAC7B,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,GAAG,GAAG,EAAE,CAAA;QAEZ,SAAS,CAAC;YACR,2CAA2C;YAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;YACnC,IAAI,MAAM,IAAI,IAAI;gBAAE,MAAK;YAEzB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAE9D,GAAG,IAAI,CAAC,CAAC,GAAG,CAAA;YAEZ,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvD,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACxC,GAAG,IAAI,yBAAyB,IAAI,CAAC,UAAU,aAAa,CAAA;gBAC9D,CAAC;qBAAM,CAAC;oBACN,GAAG,IAAI,mBAAmB,CAAA;oBAC1B,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC;wBACnC,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;wBACrB,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC;qBACxB,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;;AA1DH,8BA2DC;AA1DiB,kBAAQ,GAAG,OAAO,AAAV,CAAU"}

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

@@ -9,7 +9,7 @@ export declare class TaskReviewDoubleSpends extends WalletMonitorTask {
     reviewLimit: number;
     minAgeMinutes: number;
     triggerQuickMsecs: number;
-    static taskName: string;
+    static readonly taskName = "ReviewDoubleSpends";
     static checkNow: boolean;
     triggerNextMsecs: number;
     constructor(monitor: Monitor, triggerMsecs?: number, reviewLimit?: number, minAgeMinutes?: number, triggerQuickMsecs?: number);

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

@@ -1 +1 @@
-{"version":3,"file":"TaskReviewDoubleSpends.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReviewDoubleSpends.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAavD;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,iBAAiB;IASlD,YAAY;IACZ,WAAW;IACX,aAAa;IACb,iBAAiB;IAX1B,MAAM,CAAC,QAAQ,SAAuB;IAEtC,MAAM,CAAC,QAAQ,UAAQ;IAEvB,gBAAgB,EAAE,MAAM,CAAA;gBAGtB,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB,EACrC,WAAW,SAAM,EACjB,aAAa,SAAK,EAClB,iBAAiB,SAAwB;IAMlD,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAQ/C,yBAAyB,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,qBAAqB,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IA4B1G,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;YAmDlB,gBAAgB;CA0B/B"}
+{"version":3,"file":"TaskReviewDoubleSpends.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReviewDoubleSpends.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAavD;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,iBAAiB;IASlD,YAAY;IACZ,WAAW;IACX,aAAa;IACb,iBAAiB;IAX1B,MAAM,CAAC,QAAQ,CAAC,QAAQ,wBAAuB;IAE/C,MAAM,CAAC,QAAQ,UAAQ;IAEvB,gBAAgB,EAAE,MAAM,CAAA;gBAGtB,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB,EACrC,WAAW,SAAM,EACjB,aAAa,SAAK,EAClB,iBAAiB,SAAwB;IAMlD,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAQhD,yBAAyB,IAAK,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,qBAAqB,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IA4B3G,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC;YAmDnB,gBAAgB;CA0B/B"}

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

@@ -62,21 +62,21 @@ class TaskReviewDoubleSpends extends WalletMonitorTask_1.WalletMonitorTask {
         this.triggerNextMsecs = reqs.length >= this.reviewLimit ? this.triggerQuickMsecs : this.triggerMsecs;
         const reviewed = [];
         const unfails = [];
-        let log = ``;
+        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 {
+            if (status === 'unknown') {
                 lastRetainedDoubleSpendIndex = reviewed.length - 1;
                 retainedDoubleSpendCount += 1;
             }
+            else {
+                unfails.push(req.provenTxReqId);
+                log += `unfail ${req.provenTxReqId} ${req.txid} status:${status}\n`;
+            }
         }
         if (unfails.length > 0) {
             await this.storage.runAsStorageProvider(async (sp) => {
@@ -97,16 +97,16 @@ class TaskReviewDoubleSpends extends WalletMonitorTask_1.WalletMonitorTask {
     async findReqsToReview(checkpoint, updatedBefore) {
         var _a;
         let offset = (checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.resumeOffset) || 0;
-        if (checkpoint && checkpoint.expectedProvenTxReqId !== undefined) {
+        if ((checkpoint === null || checkpoint === void 0 ? void 0 : 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;
+            if (((_a = verify[0]) === null || _a === void 0 ? void 0 : _a.provenTxReqId) === checkpoint.expectedProvenTxReqId) {
+                offset += 1;
             }
             else {
-                offset += 1;
+                offset = 0;
             }
         }
         const batch = await this.storage.findProvenTxReqs({