@bsv/wallet-toolbox 2.1.8 → 2.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,10 @@ This document captures the history of significant changes to the wallet-toolbox
|
|
|
4
4
|
The git commit history contains the details but is unable to draw
|
|
5
5
|
attention to changes that materially alter behavior or extend functionality.
|
|
6
6
|
|
|
7
|
+
## wallet-toolbox 2.1.9
|
|
8
|
+
|
|
9
|
+
- Fix batch sending bug in TaskSendWaiting
|
|
10
|
+
|
|
7
11
|
## wallet-toolbox 2.1.8
|
|
8
12
|
|
|
9
13
|
- Drop no longer required verifyAndRepairBeef method
|
|
@@ -1 +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;
|
|
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;CA4D9E"}
|
|
@@ -69,12 +69,18 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
|
|
|
69
69
|
async processUnsent(reqApis, indent = 0) {
|
|
70
70
|
const txids = reqApis.map(r => r.txid);
|
|
71
71
|
const logs = {};
|
|
72
|
+
const reqApiIds = new Set(reqApis.map(r => r.provenTxReqId));
|
|
73
|
+
const groupedReqIds = new Set();
|
|
72
74
|
for (let i = 0; i < reqApis.length; i++) {
|
|
73
75
|
const reqApi = reqApis[i];
|
|
74
76
|
logs[reqApi.txid] = `${i} reqId=${reqApi.provenTxReqId} attempts=${reqApi.attempts} txid=${reqApi.txid}:`;
|
|
75
77
|
}
|
|
76
78
|
for (let i = 0; i < reqApis.length; i++) {
|
|
77
79
|
const reqApi = reqApis[i];
|
|
80
|
+
if (groupedReqIds.has(reqApi.provenTxReqId)) {
|
|
81
|
+
logs[reqApi.txid] += ` processed with batch`;
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
78
84
|
if (reqApi.status !== 'unsent' && reqApi.status !== 'sending') {
|
|
79
85
|
logs[reqApi.txid] += ` status now ${reqApi.status}`;
|
|
80
86
|
continue;
|
|
@@ -88,11 +94,8 @@ class TaskSendWaiting extends WalletMonitorTask_1.WalletMonitorTask {
|
|
|
88
94
|
partial: { batch: req.batch, status: 'unsent' }
|
|
89
95
|
});
|
|
90
96
|
for (const bra of batchReqApis) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
if (index > -1)
|
|
94
|
-
reqApis.slice(index, index + 1);
|
|
95
|
-
// And add to reqs being processed now:
|
|
97
|
+
if (reqApiIds.has(bra.provenTxReqId))
|
|
98
|
+
groupedReqIds.add(bra.provenTxReqId);
|
|
96
99
|
reqs.push(new EntityProvenTxReq_1.EntityProvenTxReq(bra));
|
|
97
100
|
}
|
|
98
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskSendWaiting.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskSendWaiting.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TaskSendWaiting.js","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskSendWaiting.ts"],"names":[],"mappings":"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"}
|