@bopen-io/wallet-toolbox 2.1.21-parity-fix.2 → 2.6.2-brc153.2

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

@@ -28,11 +28,14 @@ const WalletMonitorTask_1 = require("./WalletMonitorTask");
  * createAction fails to verify a generated beef against the chaintracker.
  */
 class TaskReorg extends WalletMonitorTask_1.WalletMonitorTask {
+    agedMsecs;
+    maxRetries;
+    static taskName = 'Reorg';
+    process = [];
     constructor(monitor, agedMsecs = Monitor_1.Monitor.oneMinute * 10, maxRetries = 3) {
         super(monitor, TaskReorg.taskName);
         this.agedMsecs = agedMsecs;
         this.maxRetries = maxRetries;
-        this.process = [];
     }
     /**
      * Shift aged deactivated headers onto `process` array.
@@ -56,7 +59,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 +68,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(),
@@ -78,5 +81,4 @@ class TaskReorg extends WalletMonitorTask_1.WalletMonitorTask {
     }
 }
 exports.TaskReorg = TaskReorg;
-TaskReorg.taskName = 'Reorg';
 //# sourceMappingURL=TaskReorg.js.map

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,eAAuB,SAAQ,qCAAiB;IAOrC,SAAS;IACT,UAAU;IAPnB,MAAM,CAAU,QAAQ,GAAG,OAAO,CAAA;IAElC,OAAO,GAAsB,EAAE,CAAA;IAE/B,YACE,OAAgB,EACT,SAAS,GAAG,iBAAO,CAAC,SAAS,GAAG,EAAE,EAClC,UAAU,GAAG,CAAC;QAErB,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;yBAH3B,SAAS;0BACT,UAAU;IAGnB,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;CACF"}

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

@@ -9,8 +9,10 @@ export declare class TaskReviewDoubleSpends extends WalletMonitorTask {
     reviewLimit: number;
     minAgeMinutes: number;
     triggerQuickMsecs: number;
-    static taskName: string;
-    static checkNow: boolean;
+    static readonly taskName = "ReviewDoubleSpends";
+    private static checkNowRequested;
+    static get checkNow(): boolean;
+    static set checkNow(value: boolean);
     triggerNextMsecs: number;
     constructor(monitor: Monitor, triggerMsecs?: number, reviewLimit?: number, minAgeMinutes?: number, triggerQuickMsecs?: number);
     trigger(nowMsecsSinceEpoch: 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;IAWlD,YAAY;IACZ,WAAW;IACX,aAAa;IACb,iBAAiB;IAb1B,MAAM,CAAC,QAAQ,CAAC,QAAQ,wBAAuB;IAE/C,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,MAAM,KAAK,QAAQ,IAAK,OAAO,CAAkC;IACjE,MAAM,KAAK,QAAQ,CAAE,KAAK,EAAE,OAAO,EAAoC;IAEvE,gBAAgB,EAAE,MAAM,CAAA;IAExB,YACE,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB,EACrC,WAAW,SAAM,EACjB,aAAa,SAAK,EAClB,iBAAiB,SAAwB,EAIjD;IAED,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAMrD;IAEK,yBAAyB,IAAK,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,qBAAqB,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC,CA0BhH;IAEK,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC,CAiDhC;YAEa,gBAAgB;CA0B/B"}

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

@@ -8,6 +8,15 @@ const WalletMonitorTask_1 = require("./WalletMonitorTask");
  * back to 'unfail' so existing recovery handling can re-process them.
  */
 class TaskReviewDoubleSpends extends WalletMonitorTask_1.WalletMonitorTask {
+    triggerMsecs;
+    reviewLimit;
+    minAgeMinutes;
+    triggerQuickMsecs;
+    static taskName = 'ReviewDoubleSpends';
+    static checkNowRequested = false;
+    static get checkNow() { return this.checkNowRequested; }
+    static set checkNow(value) { this.checkNowRequested = value; }
+    triggerNextMsecs;
     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;
@@ -43,14 +52,13 @@ class TaskReviewDoubleSpends extends WalletMonitorTask_1.WalletMonitorTask {
                     };
                 }
             }
-            catch (_a) {
+            catch {
                 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);
@@ -62,21 +70,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;
+            const status = gsr.results[0]?.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) => {
@@ -95,18 +103,17 @@ 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) {
+        let offset = checkpoint?.resumeOffset || 0;
+        if (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 (verify[0]?.provenTxReqId === checkpoint.expectedProvenTxReqId) {
+                offset += 1;
             }
             else {
-                offset += 1;
+                offset = 0;
             }
         }
         const batch = await this.storage.findProvenTxReqs({
@@ -119,6 +126,4 @@ class TaskReviewDoubleSpends extends WalletMonitorTask_1.WalletMonitorTask {
     }
 }
 exports.TaskReviewDoubleSpends = TaskReviewDoubleSpends;
-TaskReviewDoubleSpends.taskName = 'ReviewDoubleSpends';
-TaskReviewDoubleSpends.checkNow = false;
 //# sourceMappingURL=TaskReviewDoubleSpends.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"TaskReviewDoubleSpends.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReviewDoubleSpends.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TaskReviewDoubleSpends.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReviewDoubleSpends.ts"],"names":[],"mappings":";;;AACA,wCAAoC;AACpC,2DAAuD;AAavD;;;GAGG;AACH,4BAAoC,SAAQ,qCAAiB;IAWlD,YAAY;IACZ,WAAW;IACX,aAAa;IACb,iBAAiB;IAb1B,MAAM,CAAU,QAAQ,GAAG,oBAAoB,CAAA;IAEvC,MAAM,CAAC,iBAAiB,GAAG,KAAK,CAAA;IACxC,MAAM,KAAK,QAAQ,KAAe,OAAO,IAAI,CAAC,iBAAiB,CAAA,CAAC,CAAC;IACjE,MAAM,KAAK,QAAQ,CAAE,KAAc,IAAI,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAA,CAAC,CAAC;IAEvE,gBAAgB,CAAQ;IAExB,YACE,OAAgB,EACT,YAAY,GAAG,iBAAO,CAAC,SAAS,GAAG,EAAE,EACrC,WAAW,GAAG,GAAG,EACjB,aAAa,GAAG,EAAE,EAClB,iBAAiB,GAAG,iBAAO,CAAC,SAAS,GAAG,CAAC;QAEhD,KAAK,CAAC,OAAO,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CAAA;4BALxC,YAAY;2BACZ,WAAW;6BACX,aAAa;iCACb,iBAAiB;QAGxB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAA;IAChD,CAAC;IAED,OAAO,CAAE,kBAA0B;QACjC,OAAO;YACL,GAAG,EACD,sBAAsB,CAAC,QAAQ;gBAC/B,CAAC,IAAI,CAAC,gBAAgB,GAAG,CAAC,IAAI,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,gBAAgB,CAAC;SAC1G,CAAA;IACH,CAAC;IAED,KAAK,CAAC,yBAAyB;QAC7B,IAAI,MAAM,GAAgC,EAAE,CAAA;QAC5C,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YACjD,MAAM,GAAG,MAAM,EAAE,CAAC,iBAAiB,CAAC;gBAClC,OAAO,EAAE,EAAE,KAAK,EAAE,sBAAsB,CAAC,QAAQ,EAAE;gBACnD,eAAe,EAAE,IAAI;gBACrB,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;aACpB,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC,KAAK,CAAC,OAAO;gBAAE,SAAQ;YAC5B,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAA0C,CAAA;gBACjF,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;oBAC5C,OAAO;wBACL,YAAY,EAAE,MAAM,CAAC,YAAY;wBACjC,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;qBACpD,CAAA;gBACH,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,SAAQ;YACV,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,sBAAsB,CAAC,QAAQ,GAAG,KAAK,CAAA;QAEvC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAA;QACzD,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;QAC3E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAA;QACnE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAA;YACzC,OAAO,EAAE,CAAA;QACX,CAAC;QAED,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAA;QAEpG,MAAM,QAAQ,GAAuB,EAAE,CAAA;QACvC,MAAM,OAAO,GAAa,EAAE,CAAA;QAC5B,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,IAAI,4BAA4B,GAAG,CAAC,CAAC,CAAA;QACrC,IAAI,wBAAwB,GAAG,CAAC,CAAA;QAEhC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;YACrE,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAA;YACrC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAClB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,4BAA4B,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;gBAClD,wBAAwB,IAAI,CAAC,CAAA;YAC/B,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;gBAC/B,GAAG,IAAI,UAAU,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,IAAI,WAAW,MAAM,IAAI,CAAA;YACrE,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gBACjD,MAAM,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;YAC3D,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;YACpB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,QAAQ,EAAE,QAAQ,CAAC,MAAM;YACzB,OAAO,EAAE,OAAO,CAAC,MAAM;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,cAAc,EAAE,OAAO;YACvB,YAAY,EAAE,4BAA4B,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAa,GAAG,wBAAwB,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;YAC/G,qBAAqB,EACnB,4BAA4B,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;YACtG,SAAS,EAAE,GAAG,QAAQ,CAAC,MAAM,oCAAoC,GAAG,EAAE;SAChC,CAAC,CAAA;IAC3C,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,UAAgF,EAChF,aAAmB;QAEnB,IAAI,MAAM,GAAG,UAAU,EAAE,YAAY,IAAI,CAAC,CAAA;QAE1C,IAAI,UAAU,EAAE,qBAAqB,KAAK,SAAS,EAAE,CAAC;YACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBACjD,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE;gBAClC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,YAAY,EAAE;aACrD,CAAC,CAAA;YACF,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,aAAa,KAAK,UAAU,CAAC,qBAAqB,EAAE,CAAC;gBAClE,MAAM,IAAI,CAAC,CAAA;YACb,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC,CAAA;YACZ,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAChD,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE;YAClC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE;SAC3C,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,aAAa,CAAmD,CAAA;QACnH,IAAI,CAAC,YAAY,GAAG,MAAM,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}

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

@@ -20,8 +20,10 @@ export declare class TaskReviewProvenTxs extends WalletMonitorTask {
     maxHeightsPerRun: number;
     minBlockAge: number;
     triggerQuickMsecs: number;
-    static taskName: string;
-    static checkNow: boolean;
+    static readonly taskName = "ReviewProvenTxs";
+    private static checkNowRequested;
+    static get checkNow(): boolean;
+    static set checkNow(value: boolean);
     triggerNextMsecs: number;
     constructor(monitor: Monitor, triggerMsecs?: number, maxHeightsPerRun?: number, minBlockAge?: number, triggerQuickMsecs?: number);
     trigger(nowMsecsSinceEpoch: number): {

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

@@ -1 +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"}
+{"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;IAW/C,YAAY;IACZ,gBAAgB;IAChB,WAAW;IACX,iBAAiB;IAb1B,MAAM,CAAC,QAAQ,CAAC,QAAQ,qBAAoB;IAE5C,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,MAAM,KAAK,QAAQ,IAAK,OAAO,CAAkC;IACjE,MAAM,KAAK,QAAQ,CAAE,KAAK,EAAE,OAAO,EAAoC;IAEvE,gBAAgB,EAAE,MAAM,CAAA;IAExB,YACE,OAAO,EAAE,OAAO,EACT,YAAY,SAAyB,EACrC,gBAAgB,SAAM,EACtB,WAAW,SAAM,EACjB,iBAAiB,SAAwB,EAIjD;IAED,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAMrD;IAEK,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC,CA4BhC;IAEK,iBAAiB,CAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,uBAAuB,CAAC,CA+C7E;IAEK,qBAAqB,IAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgC1D;CACF"}

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

@@ -12,6 +12,15 @@ const WalletMonitorTask_1 = require("./WalletMonitorTask");
  * the currently canonical merkleRoot at a height no longer matches stored proven_txs roots.
  */
 class TaskReviewProvenTxs extends WalletMonitorTask_1.WalletMonitorTask {
+    triggerMsecs;
+    maxHeightsPerRun;
+    minBlockAge;
+    triggerQuickMsecs;
+    static taskName = 'ReviewProvenTxs';
+    static checkNowRequested = false;
+    static get checkNow() { return this.checkNowRequested; }
+    static set checkNow(value) { this.checkNowRequested = value; }
+    triggerNextMsecs;
     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;
@@ -71,7 +80,7 @@ class TaskReviewProvenTxs extends WalletMonitorTask_1.WalletMonitorTask {
         for (let height = range.minHeight; height <= range.maxHeight; height++) {
             result.reviewedHeights++;
             const header = await chaintracks.findHeaderForHeight(height);
-            if (!header) {
+            if (header == null) {
                 result.log += `  height ${height} canonical header unavailable\n`;
                 continue;
             }
@@ -110,11 +119,11 @@ class TaskReviewProvenTxs extends WalletMonitorTask_1.WalletMonitorTask {
                     return parsed.reviewedThroughHeight;
                 }
             }
-            catch (_a) {
+            catch {
                 continue;
             }
         }
-        let lastReviewedHeight = undefined;
+        let lastReviewedHeight;
         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 });
@@ -126,6 +135,4 @@ class TaskReviewProvenTxs extends WalletMonitorTask_1.WalletMonitorTask {
     }
 }
 exports.TaskReviewProvenTxs = TaskReviewProvenTxs;
-TaskReviewProvenTxs.taskName = 'ReviewProvenTxs';
-TaskReviewProvenTxs.checkNow = false;
 //# sourceMappingURL=TaskReviewProvenTxs.js.map

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

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

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

@@ -12,11 +12,13 @@ import { WalletMonitorTask } from './WalletMonitorTask';
 export declare class TaskReviewStatus extends WalletMonitorTask {
     triggerMsecs: number;
     agedMsecs: number;
-    static taskName: string;
+    static readonly taskName = "ReviewStatus";
     /**
      * Set to true to trigger running this task
      */
-    static checkNow: boolean;
+    private static checkNowRequested;
+    static get checkNow(): boolean;
+    static set checkNow(value: boolean);
     constructor(monitor: Monitor, triggerMsecs?: number, agedMsecs?: number);
     trigger(nowMsecsSinceEpoch: number): {
         run: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"TaskReviewStatus.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReviewStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;GAQG;AACH,qBAAa,gBAAiB,SAAQ,iBAAiB;IAU5C,YAAY;IACZ,SAAS;IAVlB,MAAM,CAAC,QAAQ,SAAiB;IAEhC;;OAEG;IACH,MAAM,CAAC,QAAQ,UAAQ;gBAGrB,OAAO,EAAE,OAAO,EACT,YAAY,SAAiB,EAC7B,SAAS,SAAgB;IAKlC,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAM/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAajC"}
+{"version":3,"file":"TaskReviewStatus.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReviewStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD;;;;;;;;GAQG;AACH,qBAAa,gBAAiB,SAAQ,iBAAiB;IAY5C,YAAY;IACZ,SAAS;IAZlB,MAAM,CAAC,QAAQ,CAAC,QAAQ,kBAAiB;IAEzC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,MAAM,KAAK,QAAQ,IAAK,OAAO,CAAkC;IACjE,MAAM,KAAK,QAAQ,CAAE,KAAK,EAAE,OAAO,EAAoC;IAEvE,YACE,OAAO,EAAE,OAAO,EACT,YAAY,SAAiB,EAC7B,SAAS,SAAgB,EAGjC;IAED,OAAO,CAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAIrD;IAEK,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC,CAiBhC;CACF"}

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

@@ -12,6 +12,15 @@ const WalletMonitorTask_1 = require("./WalletMonitorTask");
  * Looks for reqs with 'invalid' status that have corresonding transactions with status other than 'failed'.
  */
 class TaskReviewStatus extends WalletMonitorTask_1.WalletMonitorTask {
+    triggerMsecs;
+    agedMsecs;
+    static taskName = 'ReviewStatus';
+    /**
+     * Set to true to trigger running this task
+     */
+    static checkNowRequested = false;
+    static get checkNow() { return this.checkNowRequested; }
+    static set checkNow(value) { this.checkNowRequested = value; }
     constructor(monitor, triggerMsecs = 1000 * 60 * 15, agedMsecs = 1000 * 60 * 5) {
         super(monitor, TaskReviewStatus.taskName);
         this.triggerMsecs = triggerMsecs;
@@ -26,8 +35,13 @@ class TaskReviewStatus extends WalletMonitorTask_1.WalletMonitorTask {
         let log = '';
         const agedLimit = new Date(Date.now() - this.agedMsecs);
         const r = await this.storage.runAsStorageProvider(async (sp) => {
-            const r = await sp.reviewStatus({ agedLimit });
-            return r;
+            // Reconcile completed-but-unnotified proof requests first. This path
+            // restores failed transaction bookkeeping before completion; the generic
+            // reviewStatus SQL repair cannot reconstruct that state after changing a
+            // failed row directly to completed.
+            const reconciliation = await sp.reconcileCompletedProvenTxReqs();
+            const review = await sp.reviewStatus({ agedLimit });
+            return { log: reconciliation.log + review.log };
         });
         if (r.log.length > 0)
             log += `${r.log}`;
@@ -35,9 +49,4 @@ class TaskReviewStatus extends WalletMonitorTask_1.WalletMonitorTask {
     }
 }
 exports.TaskReviewStatus = TaskReviewStatus;
-TaskReviewStatus.taskName = 'ReviewStatus';
-/**
- * Set to true to trigger running this task
- */
-TaskReviewStatus.checkNow = false;
 //# sourceMappingURL=TaskReviewStatus.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"TaskReviewStatus.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReviewStatus.ts"],"names":[],"mappings":";;;AACA,2DAAuD;AAEvD;;;;;;;;GAQG;AACH,MAAa,gBAAiB,SAAQ,qCAAiB;IAQrD,YACE,OAAgB,EACT,eAAe,IAAI,GAAG,EAAE,GAAG,EAAE,EAC7B,YAAY,IAAI,GAAG,EAAE,GAAG,CAAC;QAEhC,KAAK,CAAC,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QAHlC,iBAAY,GAAZ,YAAY,CAAiB;QAC7B,cAAS,GAAT,SAAS,CAAgB;IAGlC,CAAC;IAED,OAAO,CAAC,kBAA0B;QAChC,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY;SACnG,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,GAAG,GAAG,EAAE,CAAA;QAEZ,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;QACvD,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3D,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;YAC9C,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC;YAAE,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;QAEvC,OAAO,GAAG,CAAA;IACZ,CAAC;;AAlCH,4CAmCC;AAlCQ,yBAAQ,GAAG,cAAc,CAAA;AAEhC;;GAEG;AACI,yBAAQ,GAAG,KAAK,CAAA"}
+{"version":3,"file":"TaskReviewStatus.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskReviewStatus.ts"],"names":[],"mappings":";;;AACA,2DAAuD;AAEvD;;;;;;;;GAQG;AACH,sBAA8B,SAAQ,qCAAiB;IAY5C,YAAY;IACZ,SAAS;IAZlB,MAAM,CAAU,QAAQ,GAAG,cAAc,CAAA;IAEzC;;OAEG;IACK,MAAM,CAAC,iBAAiB,GAAG,KAAK,CAAA;IACxC,MAAM,KAAK,QAAQ,KAAe,OAAO,IAAI,CAAC,iBAAiB,CAAA,CAAC,CAAC;IACjE,MAAM,KAAK,QAAQ,CAAE,KAAc,IAAI,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAA,CAAC,CAAC;IAEvE,YACE,OAAgB,EACT,YAAY,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,EAC7B,SAAS,GAAG,IAAI,GAAG,EAAE,GAAG,CAAC;QAEhC,KAAK,CAAC,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;4BAHlC,YAAY;yBACZ,SAAS;IAGlB,CAAC;IAED,OAAO,CAAE,kBAA0B;QACjC,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY;SACnG,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,GAAG,GAAG,EAAE,CAAA;QAEZ,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;QACvD,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3D,qEAAqE;YACrE,yEAAyE;YACzE,yEAAyE;YACzE,oCAAoC;YACpC,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,8BAA8B,EAAE,CAAA;YAChE,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;YACnD,OAAO,EAAE,GAAG,EAAE,cAAc,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,CAAA;QACjD,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC;YAAE,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;QAEvC,OAAO,GAAG,CAAA;IACZ,CAAC;CACF"}

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

@@ -10,8 +10,10 @@ export declare class TaskReviewUtxos extends WalletMonitorTask {
     userLimit: number;
     userOffset: number;
     tags: string[];
-    static taskName: string;
-    static checkNow: boolean;
+    static readonly taskName = "ReviewUtxos";
+    private static checkNowRequested;
+    static get checkNow(): boolean;
+    static set checkNow(value: boolean);
     constructor(monitor: Monitor, triggerMsecs?: number, userLimit?: number, userOffset?: number, tags?: string[]);
     trigger(_nowMsecsSinceEpoch: number): {
         run: boolean;

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

@@ -1 +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"}
+{"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;IAS3C,YAAY;IACZ,SAAS;IACT,UAAU;IACV,IAAI,EAAE,MAAM,EAAE;IAXvB,MAAM,CAAC,QAAQ,CAAC,QAAQ,iBAAgB;IAExC,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,EAChB,SAAS,SAAK,EACd,UAAU,SAAI,EACd,IAAI,GAAE,MAAM,EAAuB,EAG3C;IAED,OAAO,CAAE,mBAAmB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAItD;IAEK,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC,CAGhC;IAEK,mBAAmB,CAAE,WAAW,EAAE,MAAM,EAAE,IAAI,GAAE,KAAK,GAAG,QAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAgC/F;IAED,OAAO,CAAC,SAAS;CAelB"}

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

@@ -9,6 +9,14 @@ const WalletMonitorTask_1 = require("./WalletMonitorTask");
  * 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 {
+    triggerMsecs;
+    userLimit;
+    userOffset;
+    tags;
+    static taskName = 'ReviewUtxos';
+    static checkNowRequested = false;
+    static get checkNow() { return this.checkNowRequested; }
+    static set checkNow(value) { this.checkNowRequested = value; }
     constructor(monitor, triggerMsecs = 0, userLimit = 10, userOffset = 0, tags = ['release', 'all']) {
         super(monitor, TaskReviewUtxos.taskName);
         this.triggerMsecs = triggerMsecs;
@@ -66,6 +74,4 @@ class TaskReviewUtxos extends WalletMonitorTask_1.WalletMonitorTask {
     }
 }
 exports.TaskReviewUtxos = TaskReviewUtxos;
-TaskReviewUtxos.taskName = 'ReviewUtxos';
-TaskReviewUtxos.checkNow = false;
 //# sourceMappingURL=TaskReviewUtxos.js.map

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

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

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

@@ -7,7 +7,7 @@ export declare class TaskSendWaiting extends WalletMonitorTask {
     sendingMsecs: number;
     triggerQuickMsecs: number;
     chunkLimit: number;
-    static taskName: string;
+    static readonly taskName = "SendWaiting";
     lastSendingRunMsecsSinceEpoch: number | undefined;
     includeSending: boolean;
     triggerNextMsecs: number;
@@ -44,5 +44,8 @@ export declare class TaskSendWaiting extends WalletMonitorTask {
      * @param reqApis
      */
     processUnsent(reqApis: TableProvenTxReq[], indent?: number): Promise<string>;
+    private initializeRequestLogs;
+    private processUnsentRequest;
+    private expandRequestBatch;
 }
 //# sourceMappingURL=TaskSendWaiting.d.ts.map

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

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

@@ -8,6 +8,15 @@ 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 {
+    triggerMsecs;
+    agedMsecs;
+    sendingMsecs;
+    triggerQuickMsecs;
+    chunkLimit;
+    static taskName = 'SendWaiting';
+    lastSendingRunMsecsSinceEpoch;
+    includeSending = true;
+    triggerNextMsecs;
     /**
      * @param monitor Wallet monitor owning this task.
      * @param triggerMsecs Normal interval between SendWaiting runs when no backlog remains.
@@ -23,7 +32,6 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
         this.sendingMsecs = sendingMsecs;
         this.triggerQuickMsecs = triggerQuickMsecs;
         this.chunkLimit = chunkLimit;
-        this.includeSending = true;
         this.triggerNextMsecs = this.triggerQuickMsecs;
     }
     trigger(nowMsecsSinceEpoch) {
@@ -133,56 +141,11 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
      */
     async processUnsent(reqApis, indent = 0) {
         const txids = reqApis.map(r => r.txid);
-        const logs = {};
+        const logs = this.initializeRequestLogs(reqApis);
         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;
-            }
-            const req = new EntityProvenTxReq_1.EntityProvenTxReq(reqApi);
-            const reqs = [];
-            if (req.batch) {
-                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: this.includeSending ? ['unsent', 'sending'] : ['unsent']
-                });
-                for (const bra of batchReqApis) {
-                    if (reqApiIds.has(bra.provenTxReqId))
-                        groupedReqIds.add(bra.provenTxReqId);
-                    reqs.push(new EntityProvenTxReq_1.EntityProvenTxReq(bra));
-                }
-            }
-            else {
-                // Just a single non-batched req...
-                reqs.push(req);
-            }
-            const r = await this.storage.runAsStorageProvider(async (sp) => {
-                return (0, attemptToPostReqsToNetwork_1.attemptToPostReqsToNetwork)(sp, reqs);
-            });
-            for (const rd of r.details) {
-                logs[rd.txid] += ` req.status ${rd.req.status} post.status ${rd.status}`;
-            }
-            if (this.monitor.onTransactionBroadcasted) {
-                const rar = await this.storage.runAsStorageProvider(async (sp) => {
-                    const ars = [{ txid: req.txid, status: 'sending' }];
-                    const { rar } = await (0, aggregateResults_1.aggregateActionResults)(sp, ars, r);
-                    return rar;
-                });
-                this.monitor.callOnBroadcastedTransaction(rar[0]);
-            }
+        for (const reqApi of reqApis) {
+            await this.processUnsentRequest(reqApi, reqApiIds, groupedReqIds, logs);
         }
         let log = '';
         for (const txid of txids) {
@@ -190,7 +153,57 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
         }
         return log;
     }
+    initializeRequestLogs(reqApis) {
+        const logs = {};
+        for (let i = 0; i < reqApis.length; i++) {
+            const req = reqApis[i];
+            logs[req.txid] = `${i} reqId=${req.provenTxReqId} attempts=${req.attempts} txid=${req.txid}:`;
+        }
+        return logs;
+    }
+    async processUnsentRequest(reqApi, reqApiIds, groupedReqIds, logs) {
+        if (groupedReqIds.has(reqApi.provenTxReqId)) {
+            logs[reqApi.txid] += ' processed with batch';
+            return;
+        }
+        if (reqApi.status !== 'unsent' && reqApi.status !== 'sending') {
+            logs[reqApi.txid] += ` status now ${reqApi.status}`;
+            return;
+        }
+        const req = new EntityProvenTxReq_1.EntityProvenTxReq(reqApi);
+        const reqs = await this.expandRequestBatch(req, reqApiIds, groupedReqIds, logs);
+        const result = await this.storage.runAsStorageProvider(async (sp) => {
+            return await (0, attemptToPostReqsToNetwork_1.attemptToPostReqsToNetwork)(sp, reqs);
+        });
+        for (const detail of result.details) {
+            logs[detail.txid] += ` req.status ${detail.req.status} post.status ${detail.status}`;
+        }
+        if (this.monitor.onTransactionBroadcasted != null) {
+            const aggregateResults = await this.storage.runAsStorageProvider(async (sp) => {
+                const actions = [{ txid: req.txid, status: 'sending' }];
+                const { rar } = await (0, aggregateResults_1.aggregateActionResults)(sp, actions, result);
+                return rar;
+            });
+            this.monitor.callOnBroadcastedTransaction(aggregateResults[0]);
+        }
+    }
+    async expandRequestBatch(req, reqApiIds, groupedReqIds, logs) {
+        if (!req.batch)
+            return [req];
+        logs[req.txid] += ` batch ${req.batch}`;
+        // Process the entire batch together for efficient BEEF generation.
+        const batchReqApis = await this.storage.findProvenTxReqs({
+            partial: { batch: req.batch },
+            status: this.includeSending ? ['unsent', 'sending'] : ['unsent']
+        });
+        const reqs = [];
+        for (const batchReq of batchReqApis) {
+            if (reqApiIds.has(batchReq.provenTxReqId))
+                groupedReqIds.add(batchReq.provenTxReqId);
+            reqs.push(new EntityProvenTxReq_1.EntityProvenTxReq(batchReq));
+        }
+        return reqs;
+    }
 }
 exports.TaskSendWaiting = TaskSendWaiting;
-TaskSendWaiting.taskName = 'SendWaiting';
 //# sourceMappingURL=TaskSendWaiting.js.map